diff options
| author | Gregory Maxwell <greg@xiph.org> | 2011-11-20 08:58:09 +0400 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2012-03-06 02:59:50 +0400 |
| commit | e7028175af1661abaa3447a6a84750662ab8dfe6 (patch) | |
| tree | 8a3f924bfb34f1f95393a253aba34805a8ed5223 /src/opus_multistream.c | |
| parent | 8365b5d00df0d1129a30550f451fb62a24e1bc00 (diff) | |
40/60ms MDCT/Hybrid were not able to reach maximum bitrate. Now they can.
Also change the packet length in the API from int to opus_int32
because repacketized frames are able to go beyond 32767 bytes
in size.
Diffstat (limited to 'src/opus_multistream.c')
| -rw-r--r-- | src/opus_multistream.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/opus_multistream.c b/src/opus_multistream.c index a2a48b9a..7e8c4d58 100644 --- a/src/opus_multistream.c +++ b/src/opus_multistream.c @@ -227,7 +227,7 @@ int opus_multistream_encode_float( const opus_val16 *pcm, int frame_size, unsigned char *data, - int max_data_bytes + opus_int32 max_data_bytes ) { int coupled_size; @@ -309,7 +309,7 @@ int opus_multistream_encode_float( const float *pcm, int frame_size, unsigned char *data, - int max_data_bytes + opus_int32 max_data_bytes ) { int i, ret; @@ -333,7 +333,7 @@ int opus_multistream_encode( const opus_int16 *pcm, int frame_size, unsigned char *data, - int max_data_bytes + opus_int32 max_data_bytes ) { int i, ret; @@ -587,7 +587,7 @@ OpusMSDecoder *opus_multistream_decoder_create( static int opus_multistream_decode_native( OpusMSDecoder *st, const unsigned char *data, - int len, + opus_int32 len, opus_val16 *pcm, int frame_size, int decode_fec @@ -693,7 +693,7 @@ static int opus_multistream_decode_native( int opus_multistream_decode( OpusMSDecoder *st, const unsigned char *data, - int len, + opus_int32 len, opus_int16 *pcm, int frame_size, int decode_fec @@ -704,7 +704,7 @@ int opus_multistream_decode( #ifndef DISABLE_FLOAT_API int opus_multistream_decode_float(OpusMSDecoder *st, const unsigned char *data, - int len, float *pcm, int frame_size, int decode_fec) + opus_int32 len, float *pcm, int frame_size, int decode_fec) { VARDECL(opus_int16, out); int ret, i; @@ -726,7 +726,7 @@ int opus_multistream_decode_float(OpusMSDecoder *st, const unsigned char *data, #else int opus_multistream_decode(OpusMSDecoder *st, const unsigned char *data, - int len, opus_int16 *pcm, int frame_size, int decode_fec) + opus_int32 len, opus_int16 *pcm, int frame_size, int decode_fec) { VARDECL(float, out); int ret, i; @@ -747,7 +747,7 @@ int opus_multistream_decode(OpusMSDecoder *st, const unsigned char *data, int opus_multistream_decode_float( OpusMSDecoder *st, const unsigned char *data, - int len, + opus_int32 len, float *pcm, int frame_size, int decode_fec |