diff options
| author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2013-11-13 11:57:31 -0500 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2013-11-13 11:57:31 -0500 |
| commit | 8848171b2fd695ae1db362286db40b5588005c37 (patch) | |
| tree | 620b4e29c0488cd71763e9cec8982c40cd045306 /src/opus_private.h | |
| parent | 8ea01eed109b3621f3b9e0186ac017119509a5dc (diff) | |
| download | libopus-8848171b2fd695ae1db362286db40b5588005c37.tar.gz | |
Variable frame size fixes (still not exposed in the API)
This fixes an actual error in the downmix (using the float version even
for the int API), as well as a bunch of conversion warnings.
Diffstat (limited to 'src/opus_private.h')
| -rw-r--r-- | src/opus_private.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opus_private.h b/src/opus_private.h index 17a5003b..76564fcc 100644 --- a/src/opus_private.h +++ b/src/opus_private.h @@ -87,7 +87,7 @@ void downmix_float(const void *_x, opus_val32 *sub, int subframe, int offset, in void downmix_int(const void *_x, opus_val32 *sub, int subframe, int offset, int c1, int c2, int C); int optimize_framesize(const opus_val16 *x, int len, int C, opus_int32 Fs, - int bitrate, opus_val16 tonality, opus_val32 *mem, int buffering, + int bitrate, opus_val16 tonality, float *mem, int buffering, downmix_func downmix); int encode_size(int size, unsigned char *data); @@ -98,7 +98,7 @@ opus_int32 compute_frame_size(const void *analysis_pcm, int frame_size, int variable_duration, int C, opus_int32 Fs, int bitrate_bps, int delay_compensation, downmix_func downmix #ifndef DISABLE_FLOAT_API - , opus_val32 *subframe_mem + , float *subframe_mem #endif ); |