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

Fixes a bug introduced in 8fe8b8e0b

Browse source 
The SILK bandwidth was incorrectly encoded in the ToC when SILK wasn't
using the "desired bandwidth"
This commit is contained in:
Jean-Marc Valin 2011-08-29 21:46:17 -04:00
parent 0abd1b0dea
commit 69bfc67109
1 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/opus_encoder.c
View file

@ -198,7 +198,7 @@ failure:
return OPUS_INTERNAL_ERROR; return OPUS_INTERNAL_ERROR;
} }
static unsigned char gen_toc(int mode, int framerate, int bandwidth, int channels) static unsigned char gen_toc(int mode, int framerate, int bandwidth, int silk_bandwidth, int channels)
{ {
int period; int period;
unsigned char toc; unsigned char toc;
@ -210,7 +210,7 @@ static unsigned char gen_toc(int mode, int framerate, int bandwidth, int channel
} }
if (mode == MODE_SILK_ONLY) if (mode == MODE_SILK_ONLY)
{ {
toc = (bandwidth-OPUS_BANDWIDTH_NARROWBAND)<<5; toc = (silk_bandwidth-OPUS_BANDWIDTH_NARROWBAND)<<5;
toc |= (period-2)<<3; toc |= (period-2)<<3;
} else if (mode == MODE_CELT_ONLY) } else if (mode == MODE_CELT_ONLY)
{ {
@ -263,6 +263,7 @@ int opus_encode_float(OpusEncoder *st, const opus_val16 *pcm, int frame_size,
int ret=0; int ret=0;
int nBytes; int nBytes;
ec_enc enc; ec_enc enc;
int silk_internal_bandwidth=-1;
int bytes_target; int bytes_target;
int prefill=0; int prefill=0;
int start_band = 0; int start_band = 0;
@ -553,9 +554,21 @@ int opus_encode_float(OpusEncoder *st, const opus_val16 *pcm, int frame_size,
} }
if (nBytes==0) if (nBytes==0)
{ {
data[-1] = gen_toc(st->mode, st->Fs/frame_size, st->bandwidth, st->stream_channels); data[-1] = gen_toc(st->mode, st->Fs/frame_size, st->bandwidth, silk_internal_bandwidth, st->stream_channels);
return 1; return 1;
} }
/* Extract SILK internal bandwidth for signaling in first byte */
if( st->mode == MODE_SILK_ONLY ) {
if( st->silk_mode.internalSampleRate == 8000 ) {
silk_internal_bandwidth = OPUS_BANDWIDTH_NARROWBAND;
} else if( st->silk_mode.internalSampleRate == 12000 ) {
silk_internal_bandwidth = OPUS_BANDWIDTH_MEDIUMBAND;
} else if( st->silk_mode.internalSampleRate == 16000 ) {
silk_internal_bandwidth = OPUS_BANDWIDTH_WIDEBAND;
}
} else {
SKP_assert( st->silk_mode.internalSampleRate == 16000 );
}
} }
/* CELT processing */ /* CELT processing */
@ -739,7 +752,7 @@ int opus_encode_float(OpusEncoder *st, const opus_val16 *pcm, int frame_size,
/* Signalling the mode in the first byte */ /* Signalling the mode in the first byte */
data--; data--;
data[0] = gen_toc(st->mode, st->Fs/frame_size, st->bandwidth, st->stream_channels); data[0] = gen_toc(st->mode, st->Fs/frame_size, st->bandwidth, silk_internal_bandwidth, st->stream_channels);
st->rangeFinal = enc.rng ^ redundant_rng; st->rangeFinal = enc.rng ^ redundant_rng;