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

don't allow the user to override the bandwidth so that it's above what Fs allows

Browse source
This commit is contained in:
Jean-Marc Valin 2011-09-29 22:02:37 -04:00
parent b180a3feac
commit efe16c5d47
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/opus_encoder.c
View file

@ -555,6 +555,9 @@ int opus_encode_float(OpusEncoder *st, const opus_val16 *pcm, int frame_size,
st->bandwidth = OPUS_BANDWIDTH_WIDEBAND; st->bandwidth = OPUS_BANDWIDTH_WIDEBAND;
} }
if (st->user_bandwidth != OPUS_AUTO)
st->bandwidth = st->user_bandwidth;
/* Prevents Opus from wasting bits on frequencies that are above /* Prevents Opus from wasting bits on frequencies that are above
the Nyquist rate of the input signal */ the Nyquist rate of the input signal */
if (st->Fs <= 24000 && st->bandwidth > OPUS_BANDWIDTH_SUPERWIDEBAND) if (st->Fs <= 24000 && st->bandwidth > OPUS_BANDWIDTH_SUPERWIDEBAND)
@ -566,8 +569,6 @@ int opus_encode_float(OpusEncoder *st, const opus_val16 *pcm, int frame_size,
if (st->Fs <= 8000 && st->bandwidth > OPUS_BANDWIDTH_NARROWBAND) if (st->Fs <= 8000 && st->bandwidth > OPUS_BANDWIDTH_NARROWBAND)
st->bandwidth = OPUS_BANDWIDTH_NARROWBAND; st->bandwidth = OPUS_BANDWIDTH_NARROWBAND;
if (st->user_bandwidth != OPUS_AUTO)
st->bandwidth = st->user_bandwidth;
/* Can't support higher than wideband for >20 ms frames */ /* Can't support higher than wideband for >20 ms frames */
if (frame_size > st->Fs/50 && (st->mode == MODE_CELT_ONLY || st->bandwidth > OPUS_BANDWIDTH_WIDEBAND)) if (frame_size > st->Fs/50 && (st->mode == MODE_CELT_ONLY || st->bandwidth > OPUS_BANDWIDTH_WIDEBAND))