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

Fixes an issue when triggering PLC before receiving any packet

Browse source 
also s/BANDWIDTH/OPUS_BANDWIDTH/
This commit is contained in:
Jean-Marc Valin 2011-05-26 00:22:58 -04:00
parent 479e18bcb7
commit 541df0a97e
4 changed files with 77 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/opus.h
View file

@ -72,12 +72,12 @@ extern "C" {
#define MODE_HYBRID 1001 #define MODE_HYBRID 1001
#define MODE_CELT_ONLY 1002 #define MODE_CELT_ONLY 1002
#define BANDWIDTH_AUTO 1100 #define OPUS_BANDWIDTH_AUTO 1100
#define BANDWIDTH_NARROWBAND 1101 #define OPUS_BANDWIDTH_NARROWBAND 1101
#define BANDWIDTH_MEDIUMBAND 1102 #define OPUS_BANDWIDTH_MEDIUMBAND 1102
#define BANDWIDTH_WIDEBAND 1103 #define OPUS_BANDWIDTH_WIDEBAND 1103
#define BANDWIDTH_SUPERWIDEBAND 1104 #define OPUS_BANDWIDTH_SUPERWIDEBAND 1104
#define BANDWIDTH_FULLBAND 1105 #define OPUS_BANDWIDTH_FULLBAND 1105

34
src/opus_decoder.c
View file

@ -179,7 +179,15 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
mode = st->mode; mode = st->mode;
ec_dec_init(&dec,(unsigned char*)data,len); ec_dec_init(&dec,(unsigned char*)data,len);
} else { } else {
mode = st->prev_mode; if (st->prev_mode == 0)
{
/* If we haven't got any packet yet, all we can do is return zeros */
for (i=0;i<frame_size;i++)
pcm[i] = 0;
return audiosize;
} else {
mode = st->prev_mode;
}
} }
if (data!=NULL && !st->prev_redundancy && mode != st->prev_mode && st->prev_mode > 0 if (data!=NULL && !st->prev_redundancy && mode != st->prev_mode && st->prev_mode > 0
@ -212,11 +220,11 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
DecControl.nChannelsInternal = st->stream_channels; DecControl.nChannelsInternal = st->stream_channels;
DecControl.payloadSize_ms = 1000 * audiosize / st->Fs; DecControl.payloadSize_ms = 1000 * audiosize / st->Fs;
if( mode == MODE_SILK_ONLY ) { if( mode == MODE_SILK_ONLY ) {
if( st->bandwidth == BANDWIDTH_NARROWBAND ) { if( st->bandwidth == OPUS_BANDWIDTH_NARROWBAND ) {
DecControl.internalSampleRate = 8000; DecControl.internalSampleRate = 8000;
} else if( st->bandwidth == BANDWIDTH_MEDIUMBAND ) { } else if( st->bandwidth == OPUS_BANDWIDTH_MEDIUMBAND ) {
DecControl.internalSampleRate = 12000; DecControl.internalSampleRate = 12000;
} else if( st->bandwidth == BANDWIDTH_WIDEBAND ) { } else if( st->bandwidth == OPUS_BANDWIDTH_WIDEBAND ) {
DecControl.internalSampleRate = 16000; DecControl.internalSampleRate = 16000;
} else { } else {
DecControl.internalSampleRate = 16000; DecControl.internalSampleRate = 16000;
@ -274,16 +282,16 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
switch(st->bandwidth) switch(st->bandwidth)
{ {
case BANDWIDTH_NARROWBAND: case OPUS_BANDWIDTH_NARROWBAND:
endband = 13; endband = 13;
break; break;
case BANDWIDTH_WIDEBAND: case OPUS_BANDWIDTH_WIDEBAND:
endband = 17; endband = 17;
break; break;
case BANDWIDTH_SUPERWIDEBAND: case OPUS_BANDWIDTH_SUPERWIDEBAND:
endband = 19; endband = 19;
break; break;
case BANDWIDTH_FULLBAND: case OPUS_BANDWIDTH_FULLBAND:
endband = 21; endband = 21;
break; break;
} }
@ -551,15 +559,15 @@ int opus_packet_get_bandwidth(const unsigned char *data)
int bandwidth; int bandwidth;
if (data[0]&0x80) if (data[0]&0x80)
{ {
bandwidth = BANDWIDTH_MEDIUMBAND + ((data[0]>>5)&0x3); bandwidth = OPUS_BANDWIDTH_MEDIUMBAND + ((data[0]>>5)&0x3);
if (bandwidth == BANDWIDTH_MEDIUMBAND) if (bandwidth == OPUS_BANDWIDTH_MEDIUMBAND)
bandwidth = BANDWIDTH_NARROWBAND; bandwidth = OPUS_BANDWIDTH_NARROWBAND;
} else if ((data[0]&0x60) == 0x60) } else if ((data[0]&0x60) == 0x60)
{ {
bandwidth = (data[0]&0x10) ? BANDWIDTH_FULLBAND : BANDWIDTH_SUPERWIDEBAND; bandwidth = (data[0]&0x10) ? OPUS_BANDWIDTH_FULLBAND : OPUS_BANDWIDTH_SUPERWIDEBAND;
} else { } else {
bandwidth = BANDWIDTH_NARROWBAND + ((data[0]>>5)&0x3); bandwidth = OPUS_BANDWIDTH_NARROWBAND + ((data[0]>>5)&0x3);
} }
return bandwidth; return bandwidth;
} }

76
src/opus_encoder.c
View file

@ -127,12 +127,12 @@ OpusEncoder *opus_encoder_init(OpusEncoder* st, int Fs, int channels, int mode)
celt_encoder_ctl(celt_enc, CELT_SET_SIGNALLING(0)); celt_encoder_ctl(celt_enc, CELT_SET_SIGNALLING(0));
st->mode = MODE_HYBRID; st->mode = MODE_HYBRID;
st->bandwidth = BANDWIDTH_FULLBAND; st->bandwidth = OPUS_BANDWIDTH_FULLBAND;
st->use_vbr = 0; st->use_vbr = 0;
st->user_bitrate_bps = OPUS_BITRATE_AUTO; st->user_bitrate_bps = OPUS_BITRATE_AUTO;
st->bitrate_bps = 3000+Fs*channels; st->bitrate_bps = 3000+Fs*channels;
st->user_mode = mode; st->user_mode = mode;
st->user_bandwidth = BANDWIDTH_AUTO; st->user_bandwidth = OPUS_BANDWIDTH_AUTO;
st->voice_ratio = 90; st->voice_ratio = 90;
st->first = 1; st->first = 1;
@ -226,13 +226,13 @@ int opus_encode(OpusEncoder *st, const short *pcm, int frame_size,
if (st->mode == MODE_CELT_ONLY || st->first || st->silk_mode.allowBandwidthSwitch) if (st->mode == MODE_CELT_ONLY || st->first || st->silk_mode.allowBandwidthSwitch)
{ {
const int *bandwidth_thresholds; const int *bandwidth_thresholds;
int bandwidth = BANDWIDTH_FULLBAND; int bandwidth = OPUS_BANDWIDTH_FULLBAND;
bandwidth_thresholds = st->mode == MODE_CELT_ONLY ? audio_bandwidth_thresholds : voice_bandwidth_thresholds; bandwidth_thresholds = st->mode == MODE_CELT_ONLY ? audio_bandwidth_thresholds : voice_bandwidth_thresholds;
do { do {
int threshold, hysteresis; int threshold, hysteresis;
threshold = bandwidth_thresholds[2*(bandwidth-BANDWIDTH_MEDIUMBAND)]; threshold = bandwidth_thresholds[2*(bandwidth-OPUS_BANDWIDTH_MEDIUMBAND)];
hysteresis = bandwidth_thresholds[2*(bandwidth-BANDWIDTH_MEDIUMBAND)+1]; hysteresis = bandwidth_thresholds[2*(bandwidth-OPUS_BANDWIDTH_MEDIUMBAND)+1];
if (!st->first) if (!st->first)
{ {
if (st->bandwidth >= bandwidth) if (st->bandwidth >= bandwidth)
@ -242,26 +242,26 @@ int opus_encode(OpusEncoder *st, const short *pcm, int frame_size,
} }
if (mono_rate >= threshold) if (mono_rate >= threshold)
break; break;
} while (--bandwidth>BANDWIDTH_NARROWBAND); } while (--bandwidth>OPUS_BANDWIDTH_NARROWBAND);
st->bandwidth = bandwidth; st->bandwidth = bandwidth;
/* Prevents any transition to SWB/FB until the SILK layer has fully /* Prevents any transition to SWB/FB until the SILK layer has fully
switched to WB mode and turned the variable LP filter off */ switched to WB mode and turned the variable LP filter off */
if (st->mode != MODE_CELT_ONLY && !st->silk_mode.inWBmodeWithoutVariableLP && st->bandwidth > BANDWIDTH_WIDEBAND) if (st->mode != MODE_CELT_ONLY && !st->silk_mode.inWBmodeWithoutVariableLP && st->bandwidth > OPUS_BANDWIDTH_WIDEBAND)
st->bandwidth = BANDWIDTH_WIDEBAND; st->bandwidth = OPUS_BANDWIDTH_WIDEBAND;
} }
/* 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 > BANDWIDTH_SUPERWIDEBAND) if (st->Fs <= 24000 && st->bandwidth > OPUS_BANDWIDTH_SUPERWIDEBAND)
st->bandwidth = BANDWIDTH_SUPERWIDEBAND; st->bandwidth = OPUS_BANDWIDTH_SUPERWIDEBAND;
if (st->Fs <= 16000 && st->bandwidth > BANDWIDTH_WIDEBAND) if (st->Fs <= 16000 && st->bandwidth > OPUS_BANDWIDTH_WIDEBAND)
st->bandwidth = BANDWIDTH_WIDEBAND; st->bandwidth = OPUS_BANDWIDTH_WIDEBAND;
if (st->Fs <= 12000 && st->bandwidth > BANDWIDTH_MEDIUMBAND) if (st->Fs <= 12000 && st->bandwidth > OPUS_BANDWIDTH_MEDIUMBAND)
st->bandwidth = BANDWIDTH_MEDIUMBAND; st->bandwidth = OPUS_BANDWIDTH_MEDIUMBAND;
if (st->Fs <= 8000 && st->bandwidth > BANDWIDTH_NARROWBAND) if (st->Fs <= 8000 && st->bandwidth > OPUS_BANDWIDTH_NARROWBAND)
st->bandwidth = BANDWIDTH_NARROWBAND; st->bandwidth = OPUS_BANDWIDTH_NARROWBAND;
if (st->user_bandwidth != BANDWIDTH_AUTO) if (st->user_bandwidth != OPUS_BANDWIDTH_AUTO)
st->bandwidth = st->user_bandwidth; st->bandwidth = st->user_bandwidth;
/* Prevents nonsensical configurations, i.e. modes that don't exist */ /* Prevents nonsensical configurations, i.e. modes that don't exist */
@ -269,11 +269,11 @@ int opus_encode(OpusEncoder *st, const short *pcm, int frame_size,
st->mode = MODE_CELT_ONLY; st->mode = MODE_CELT_ONLY;
if (frame_size > st->Fs/50 && st->mode != MODE_SILK_ONLY) if (frame_size > st->Fs/50 && st->mode != MODE_SILK_ONLY)
st->mode = MODE_SILK_ONLY; st->mode = MODE_SILK_ONLY;
if (st->mode == MODE_CELT_ONLY && st->bandwidth == BANDWIDTH_MEDIUMBAND) if (st->mode == MODE_CELT_ONLY && st->bandwidth == OPUS_BANDWIDTH_MEDIUMBAND)
st->bandwidth = BANDWIDTH_WIDEBAND; st->bandwidth = OPUS_BANDWIDTH_WIDEBAND;
if (st->mode == MODE_SILK_ONLY && st->bandwidth > BANDWIDTH_WIDEBAND) if (st->mode == MODE_SILK_ONLY && st->bandwidth > OPUS_BANDWIDTH_WIDEBAND)
st->mode = MODE_HYBRID; st->mode = MODE_HYBRID;
if (st->mode == MODE_HYBRID && st->bandwidth <= BANDWIDTH_WIDEBAND) if (st->mode == MODE_HYBRID && st->bandwidth <= OPUS_BANDWIDTH_WIDEBAND)
st->mode = MODE_SILK_ONLY; st->mode = MODE_SILK_ONLY;
bytes_target = st->bitrate_bps * frame_size / (st->Fs * 8) - 1; bytes_target = st->bitrate_bps * frame_size / (st->Fs * 8) - 1;
@ -312,7 +312,7 @@ int opus_encode(OpusEncoder *st, const short *pcm, int frame_size,
st->silk_mode.bitRate = st->bitrate_bps - 8*st->Fs/frame_size; st->silk_mode.bitRate = st->bitrate_bps - 8*st->Fs/frame_size;
if( st->mode == MODE_HYBRID ) { if( st->mode == MODE_HYBRID ) {
st->silk_mode.bitRate /= st->stream_channels; st->silk_mode.bitRate /= st->stream_channels;
if( st->bandwidth == BANDWIDTH_SUPERWIDEBAND ) { if( st->bandwidth == OPUS_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 + 2000 + st->use_vbr * 1000 ) * 2 ) / 3; st->silk_mode.bitRate = ( ( st->silk_mode.bitRate + 2000 + st->use_vbr * 1000 ) * 2 ) / 3;
@ -339,12 +339,12 @@ int opus_encode(OpusEncoder *st, const short *pcm, int frame_size,
st->silk_mode.payloadSize_ms = 1000 * frame_size / st->Fs; st->silk_mode.payloadSize_ms = 1000 * frame_size / st->Fs;
st->silk_mode.nChannelsAPI = st->channels; st->silk_mode.nChannelsAPI = st->channels;
st->silk_mode.nChannelsInternal = st->stream_channels; st->silk_mode.nChannelsInternal = st->stream_channels;
if (st->bandwidth == BANDWIDTH_NARROWBAND) { if (st->bandwidth == OPUS_BANDWIDTH_NARROWBAND) {
st->silk_mode.desiredInternalSampleRate = 8000; st->silk_mode.desiredInternalSampleRate = 8000;
} else if (st->bandwidth == BANDWIDTH_MEDIUMBAND) { } else if (st->bandwidth == OPUS_BANDWIDTH_MEDIUMBAND) {
st->silk_mode.desiredInternalSampleRate = 12000; st->silk_mode.desiredInternalSampleRate = 12000;
} else { } else {
SKP_assert( st->mode == MODE_HYBRID || st->bandwidth == BANDWIDTH_WIDEBAND ); SKP_assert( st->mode == MODE_HYBRID || st->bandwidth == OPUS_BANDWIDTH_WIDEBAND );
st->silk_mode.desiredInternalSampleRate = 16000; st->silk_mode.desiredInternalSampleRate = 16000;
} }
if( st->mode == MODE_HYBRID ) { if( st->mode == MODE_HYBRID ) {
@ -373,11 +373,11 @@ int opus_encode(OpusEncoder *st, const short *pcm, int frame_size,
/* Extract SILK internal bandwidth for signaling in first byte */ /* Extract SILK internal bandwidth for signaling in first byte */
if( st->mode == MODE_SILK_ONLY ) { if( st->mode == MODE_SILK_ONLY ) {
if( st->silk_mode.internalSampleRate == 8000 ) { if( st->silk_mode.internalSampleRate == 8000 ) {
silk_internal_bandwidth = BANDWIDTH_NARROWBAND; silk_internal_bandwidth = OPUS_BANDWIDTH_NARROWBAND;
} else if( st->silk_mode.internalSampleRate == 12000 ) { } else if( st->silk_mode.internalSampleRate == 12000 ) {
silk_internal_bandwidth = BANDWIDTH_MEDIUMBAND; silk_internal_bandwidth = OPUS_BANDWIDTH_MEDIUMBAND;
} else if( st->silk_mode.internalSampleRate == 16000 ) { } else if( st->silk_mode.internalSampleRate == 16000 ) {
silk_internal_bandwidth = BANDWIDTH_WIDEBAND; silk_internal_bandwidth = OPUS_BANDWIDTH_WIDEBAND;
} }
} else { } else {
SKP_assert( st->silk_mode.internalSampleRate == 16000 ); SKP_assert( st->silk_mode.internalSampleRate == 16000 );
@ -390,16 +390,16 @@ int opus_encode(OpusEncoder *st, const short *pcm, int frame_size,
switch(st->bandwidth) switch(st->bandwidth)
{ {
case BANDWIDTH_NARROWBAND: case OPUS_BANDWIDTH_NARROWBAND:
endband = 13; endband = 13;
break; break;
case BANDWIDTH_WIDEBAND: case OPUS_BANDWIDTH_WIDEBAND:
endband = 17; endband = 17;
break; break;
case BANDWIDTH_SUPERWIDEBAND: case OPUS_BANDWIDTH_SUPERWIDEBAND:
endband = 19; endband = 19;
break; break;
case BANDWIDTH_FULLBAND: case OPUS_BANDWIDTH_FULLBAND:
endband = 21; endband = 21;
break; break;
} }
@ -557,11 +557,11 @@ int opus_encode(OpusEncoder *st, const short *pcm, int frame_size,
} }
if (st->mode == MODE_SILK_ONLY) if (st->mode == MODE_SILK_ONLY)
{ {
data[0] = (silk_internal_bandwidth-BANDWIDTH_NARROWBAND)<<5; data[0] = (silk_internal_bandwidth-OPUS_BANDWIDTH_NARROWBAND)<<5;
data[0] |= (period-2)<<3; data[0] |= (period-2)<<3;
} else if (st->mode == MODE_CELT_ONLY) } else if (st->mode == MODE_CELT_ONLY)
{ {
int tmp = st->bandwidth-BANDWIDTH_MEDIUMBAND; int tmp = st->bandwidth-OPUS_BANDWIDTH_MEDIUMBAND;
if (tmp < 0) if (tmp < 0)
tmp = 0; tmp = 0;
data[0] = 0x80; data[0] = 0x80;
@ -570,7 +570,7 @@ int opus_encode(OpusEncoder *st, const short *pcm, int frame_size,
} else /* Hybrid */ } else /* Hybrid */
{ {
data[0] = 0x60; data[0] = 0x60;
data[0] |= (st->bandwidth-BANDWIDTH_SUPERWIDEBAND)<<4; data[0] |= (st->bandwidth-OPUS_BANDWIDTH_SUPERWIDEBAND)<<4;
data[0] |= (period-2)<<3; data[0] |= (period-2)<<3;
} }
data[0] |= (st->stream_channels==2)<<2; data[0] |= (st->stream_channels==2)<<2;
@ -644,12 +644,12 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...)
case OPUS_SET_BANDWIDTH_REQUEST: case OPUS_SET_BANDWIDTH_REQUEST:
{ {
int value = va_arg(ap, int); int value = va_arg(ap, int);
if (value < BANDWIDTH_AUTO || value > BANDWIDTH_FULLBAND) if (value < OPUS_BANDWIDTH_AUTO || value > OPUS_BANDWIDTH_FULLBAND)
return OPUS_BAD_ARG; return OPUS_BAD_ARG;
st->user_bandwidth = value; st->user_bandwidth = value;
if (st->user_bandwidth == BANDWIDTH_NARROWBAND) { if (st->user_bandwidth == OPUS_BANDWIDTH_NARROWBAND) {
st->silk_mode.maxInternalSampleRate = 8000; st->silk_mode.maxInternalSampleRate = 8000;
} else if (st->bandwidth == BANDWIDTH_MEDIUMBAND) { } else if (st->bandwidth == OPUS_BANDWIDTH_MEDIUMBAND) {
st->silk_mode.maxInternalSampleRate = 12000; st->silk_mode.maxInternalSampleRate = 12000;
} else { } else {
st->silk_mode.maxInternalSampleRate = 16000; st->silk_mode.maxInternalSampleRate = 16000;

24
src/test_opus.c
View file

@ -123,7 +123,7 @@ int main(int argc, char *argv[])
/* defaults: */ /* defaults: */
use_vbr = 1; use_vbr = 1;
bandwidth=BANDWIDTH_AUTO; bandwidth=OPUS_BANDWIDTH_AUTO;
internal_sampling_rate_Hz = sampling_rate; internal_sampling_rate_Hz = sampling_rate;
max_payload_bytes = MAX_PACKET; max_payload_bytes = MAX_PACKET;
complexity = 10; complexity = 10;
@ -140,15 +140,15 @@ int main(int argc, char *argv[])
args++; args++;
} else if( STR_CASEINSENSITIVE_COMPARE( argv[ args ], "-bandwidth" ) == 0 ) { } else if( STR_CASEINSENSITIVE_COMPARE( argv[ args ], "-bandwidth" ) == 0 ) {
if (strcmp(argv[ args + 1 ], "NB")==0) if (strcmp(argv[ args + 1 ], "NB")==0)
bandwidth = BANDWIDTH_NARROWBAND; bandwidth = OPUS_BANDWIDTH_NARROWBAND;
else if (strcmp(argv[ args + 1 ], "MB")==0) else if (strcmp(argv[ args + 1 ], "MB")==0)
bandwidth = BANDWIDTH_MEDIUMBAND; bandwidth = OPUS_BANDWIDTH_MEDIUMBAND;
else if (strcmp(argv[ args + 1 ], "WB")==0) else if (strcmp(argv[ args + 1 ], "WB")==0)
bandwidth = BANDWIDTH_WIDEBAND; bandwidth = OPUS_BANDWIDTH_WIDEBAND;
else if (strcmp(argv[ args + 1 ], "SWB")==0) else if (strcmp(argv[ args + 1 ], "SWB")==0)
bandwidth = BANDWIDTH_SUPERWIDEBAND; bandwidth = OPUS_BANDWIDTH_SUPERWIDEBAND;
else if (strcmp(argv[ args + 1 ], "FB")==0) else if (strcmp(argv[ args + 1 ], "FB")==0)
bandwidth = BANDWIDTH_FULLBAND; bandwidth = OPUS_BANDWIDTH_FULLBAND;
else { else {
fprintf(stderr, "Unknown bandwidth %s. Supported are NB, MB, WB, SWB, FB.\n", argv[ args + 1 ]); fprintf(stderr, "Unknown bandwidth %s. Supported are NB, MB, WB, SWB, FB.\n", argv[ args + 1 ]);
return 1; return 1;
@ -264,22 +264,22 @@ int main(int argc, char *argv[])
switch(bandwidth) switch(bandwidth)
{ {
case BANDWIDTH_NARROWBAND: case OPUS_BANDWIDTH_NARROWBAND:
bandwidth_string = "narrowband"; bandwidth_string = "narrowband";
break; break;
case BANDWIDTH_MEDIUMBAND: case OPUS_BANDWIDTH_MEDIUMBAND:
bandwidth_string = "mediumband"; bandwidth_string = "mediumband";
break; break;
case BANDWIDTH_WIDEBAND: case OPUS_BANDWIDTH_WIDEBAND:
bandwidth_string = "wideband"; bandwidth_string = "wideband";
break; break;
case BANDWIDTH_SUPERWIDEBAND: case OPUS_BANDWIDTH_SUPERWIDEBAND:
bandwidth_string = "superwideband"; bandwidth_string = "superwideband";
break; break;
case BANDWIDTH_FULLBAND: case OPUS_BANDWIDTH_FULLBAND:
bandwidth_string = "fullband"; bandwidth_string = "fullband";
break; break;
case BANDWIDTH_AUTO: case OPUS_BANDWIDTH_AUTO:
bandwidth_string = "auto"; bandwidth_string = "auto";
break; break;
default: default: