From f85bc8a293af86165979f35db4e1073b19cca354 Mon Sep 17 00:00:00 2001 From: Jean-Marc Valin Date: Thu, 3 Feb 2011 12:08:38 -0500 Subject: Oops, had inverted some tuning lines --- src/opus_decoder.h | 2 +- src/opus_encoder.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/opus_decoder.h b/src/opus_decoder.h index e6f05344..82d9be2f 100644 --- a/src/opus_decoder.h +++ b/src/opus_decoder.h @@ -51,7 +51,7 @@ struct OpusDecoder { #endif }; -inline short ADD_SAT16(a, b) { +inline short ADD_SAT16(short a, short b) { int sum = a + b; return sum > 32767 ? 32767 : sum < -32768 ? -32768 : (short)sum; }; diff --git a/src/opus_encoder.c b/src/opus_encoder.c index b0e445f8..3a1cdc4b 100644 --- a/src/opus_encoder.c +++ b/src/opus_encoder.c @@ -113,10 +113,10 @@ int opus_encode(OpusEncoder *st, const short *pcm, int frame_size, if( st->bandwidth == BANDWIDTH_SUPERWIDEBAND ) { if( st->Fs == 100 * frame_size ) { /* 24 kHz, 10 ms */ - st->silk_mode.bitRate = ( ( st->silk_mode.bitRate + 8000 - ( 1 - st->use_vbr ) * 7000 ) * 2 ) / 3; + st->silk_mode.bitRate = ( ( st->silk_mode.bitRate + 12000 - ( 1 - st->use_vbr ) * 10000 ) * 2 ) / 3; } else { /* 24 kHz, 20 ms */ - st->silk_mode.bitRate = ( ( st->silk_mode.bitRate + 12000 - ( 1 - st->use_vbr ) * 10000 ) * 2 ) / 3; + st->silk_mode.bitRate = ( ( st->silk_mode.bitRate + 8000 - ( 1 - st->use_vbr ) * 7000 ) * 2 ) / 3; } } else { if( st->Fs == 100 * frame_size ) { -- cgit v1.2.3