SILK update

This commit is contained in:
Koen Vos 2011-04-26 23:21:27 -04:00 committed by Jean-Marc Valin
parent d2124cdf0d
commit d8765e54ea
8 changed files with 11 additions and 42 deletions

View file

@ -66,6 +66,7 @@ OpusEncoder *opus_encoder_create(int Fs, int channels)
/* default SILK parameters */
st->silk_mode.API_sampleRate = st->Fs;
st->silk_mode.nChannels = channels;
st->silk_mode.maxInternalSampleRate = 16000;
st->silk_mode.minInternalSampleRate = 8000;
st->silk_mode.payloadSize_ms = 20;
@ -154,10 +155,6 @@ int opus_encode(OpusEncoder *st, const short *pcm, int frame_size,
st->mode = MODE_CELT_ONLY;
}
/* FIXME: Remove this once SILK supports stereo */
if (st->channels == 2)
st->mode = MODE_CELT_ONLY;
/* Bandwidth selection */
if (st->mode == MODE_CELT_ONLY)
{
@ -371,7 +368,6 @@ int opus_encode(OpusEncoder *st, const short *pcm, int frame_size,
}
}
ec_enc_shrink(&enc, nb_compr_bytes);
} else {
nb_compr_bytes = 0;