Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: CyanogenMod/android_external_tinycompress
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cm-13.0
Choose a base ref
...
head repository: AFLB/cm_external_tinycompress
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cm-13.0
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Dec 19, 2016

  1. tinycompress: remove some code causing error w/ stock hayabusa kernel 

    Change-Id: I3f73515d3469bc534509816569cdb2c578a78237
    @droidfivex
    droidfivex committed Dec 19, 2016
    Copy the full SHA
    a49e7e3 View commit details
Showing with 0 additions and 15 deletions.
  1. +0 −15 compress.c
15 changes: 0 additions & 15 deletions compress.c
View file
Original file line number Diff line number Diff line change
@@ -523,8 +523,6 @@ int compress_partial_drain(struct compress *compress)

if (!compress->next_track)
return oops(compress, EPERM, "next track not signalled");
if (ioctl(compress->fd, SNDRV_COMPRESS_PARTIAL_DRAIN))
return oops(compress, errno, "cannot drain the stream\n");
compress->next_track = 0;
return 0;
}
@@ -536,8 +534,6 @@ int compress_next_track(struct compress *compress)

if (!compress->gapless_metadata)
return oops(compress, EPERM, "metadata not set");
if (ioctl(compress->fd, SNDRV_COMPRESS_NEXT_TRACK))
return oops(compress, errno, "cannot set next track\n");
compress->next_track = 1;
compress->gapless_metadata = 0;
return 0;
@@ -546,7 +542,6 @@ int compress_next_track(struct compress *compress)
int compress_set_gapless_metadata(struct compress *compress,
struct compr_gapless_mdata *mdata)
{
struct snd_compr_metadata metadata;
int version;

if (!is_compress_ready(compress))
@@ -559,16 +554,6 @@ int compress_set_gapless_metadata(struct compress *compress,
if (version < SNDRV_PROTOCOL_VERSION(0, 1, 1))
return oops(compress, ENXIO, "gapless apis not supported in kernel");

metadata.key = SNDRV_COMPRESS_ENCODER_PADDING;
metadata.value[0] = mdata->encoder_padding;
if (ioctl(compress->fd, SNDRV_COMPRESS_SET_METADATA, &metadata))
return oops(compress, errno, "can't set metadata for stream\n");

metadata.key = SNDRV_COMPRESS_ENCODER_DELAY;
metadata.value[0] = mdata->encoder_delay;
if (ioctl(compress->fd, SNDRV_COMPRESS_SET_METADATA, &metadata))
return oops(compress, errno, "can't set metadata for stream\n");

compress->gapless_metadata = 1;
return 0;
}