eden-emu/opus
15
0
Fork 0
mirror of https://github.com/xiph/opus.git synced 2025-06-06 15:30:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Makes SILK surround masking a bit more aggressive in both directions

Browse source 
This also splits the rate adjustment between SILK and CELT (previous
code only changed SILK)
This commit is contained in:
Jean-Marc Valin 2013-11-25 01:52:08 -05:00
parent a47d6f308f
commit 93e1096093
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/opus_encoder.c
View file

@ -1513,17 +1513,21 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_
{ {
opus_val16 mask; opus_val16 mask;
mask = MAX16(MIN16(st->energy_masking[21*c+i], mask = MAX16(MIN16(st->energy_masking[21*c+i],
QCONST16(.25f, DB_SHIFT)), -QCONST16(2.0f, DB_SHIFT)); QCONST16(.5f, DB_SHIFT)), -QCONST16(2.0f, DB_SHIFT));
if (mask > 0) if (mask > 0)
mask = HALF16(mask); mask = HALF16(mask);
mask_sum += mask; mask_sum += mask;
} }
} }
/* Conservative rate reduction, we cut the masking in half */ /* Conservative rate reduction, we cut the masking in half */
masking_depth = HALF16(mask_sum / end*st->channels); masking_depth = mask_sum / end*st->channels;
masking_depth += QCONST16(.1f, DB_SHIFT); masking_depth += QCONST16(.2f, DB_SHIFT);
rate_offset = (opus_int32)PSHR32(MULT16_16(srate, masking_depth), DB_SHIFT); rate_offset = (opus_int32)PSHR32(MULT16_16(srate, masking_depth), DB_SHIFT);
rate_offset = MAX32(rate_offset, -2*st->silk_mode.bitRate/3); rate_offset = MAX32(rate_offset, -2*st->silk_mode.bitRate/3);
/* Split the rate change between the SILK and CELT part for hybrid. */
if (st->bandwidth==OPUS_BANDWIDTH_SUPERWIDEBAND || st->bandwidth==OPUS_BANDWIDTH_FULLBAND)
st->silk_mode.bitRate += 3*rate_offset/5;
else
st->silk_mode.bitRate += rate_offset; st->silk_mode.bitRate += rate_offset;
bytes_target += rate_offset * frame_size / (8 * st->Fs); bytes_target += rate_offset * frame_size / (8 * st->Fs);
} }