eden-emu/opus
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some more hybrid tuning (mostly for CBR)

Browse source
This commit is contained in:
Jean-Marc Valin 2011-02-03 11:34:43 -05:00
parent 1c09febec7
commit 62b88c3b28
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/opus_encoder.c
View file

@ -113,18 +113,18 @@ int opus_encode(OpusEncoder *st, const short *pcm, int frame_size,
if( st->bandwidth == BANDWIDTH_SUPERWIDEBAND ) { if( st->bandwidth == BANDWIDTH_SUPERWIDEBAND ) {
if( st->Fs == 100 * frame_size ) { if( st->Fs == 100 * frame_size ) {
/* 24 kHz, 10 ms */ /* 24 kHz, 10 ms */
st->silk_mode.bitRate = ( ( st->silk_mode.bitRate + 14000 ) * 2 ) / 3; st->silk_mode.bitRate = ( ( st->silk_mode.bitRate + 14000 - ( 1 - st->use_vbr ) * 10000 ) * 2 ) / 3;
} else { } else {
/* 24 kHz, 20 ms */ /* 24 kHz, 20 ms */
st->silk_mode.bitRate = ( ( st->silk_mode.bitRate + 10000 ) * 2 ) / 3; st->silk_mode.bitRate = ( ( st->silk_mode.bitRate + 12000 - ( 1 - st->use_vbr ) * 10000 ) * 2 ) / 3;
} }
} else { } else {
if( st->Fs == 100 * frame_size ) { if( st->Fs == 100 * frame_size ) {
/* 48 kHz, 10 ms */ /* 48 kHz, 10 ms */
st->silk_mode.bitRate = ( st->silk_mode.bitRate + 18000 ) / 2; st->silk_mode.bitRate = ( st->silk_mode.bitRate + 16000 - ( 1 - st->use_vbr ) * 8000 ) / 2;
} else { } else {
/* 48 kHz, 20 ms */ /* 48 kHz, 20 ms */
st->silk_mode.bitRate = ( st->silk_mode.bitRate + 16000 ) / 2; st->silk_mode.bitRate = ( st->silk_mode.bitRate + 14000 - ( 1 - st->use_vbr ) * 5000 ) / 2;
} }
} }
} }