Browse Source

libspeexdec: simplify setting of frame_size

tags/n1.1
Justin Ruggles 13 years ago
parent
commit
892695c851
1 changed files with 1 additions and 5 deletions
  1. +1
    -5
      libavcodec/libspeexdec.c

+ 1
- 5
libavcodec/libspeexdec.c View File

@@ -49,7 +49,6 @@ static av_cold int libspeex_decode_init(AVCodecContext *avctx)
avctx->sample_fmt = AV_SAMPLE_FMT_S16;
if (s->header) {
avctx->channels = s->header->nb_channels;
s->frame_size = s->header->frame_size;
spx_mode = s->header->mode;
} else {
switch (avctx->sample_rate) {
@@ -71,6 +70,7 @@ static av_cold int libspeex_decode_init(AVCodecContext *avctx)
return AVERROR_INVALIDDATA;
}
avctx->sample_rate = 8000 << spx_mode;
s->frame_size = 160 << spx_mode;

if (avctx->channels < 1 || avctx->channels > 2) {
/* libspeex can handle mono or stereo if initialized as stereo */
@@ -88,10 +88,6 @@ static av_cold int libspeex_decode_init(AVCodecContext *avctx)
return -1;
}

if (!s->header) {
speex_decoder_ctl(s->dec_state, SPEEX_GET_FRAME_SIZE, &s->frame_size);
}

if (avctx->channels == 2) {
SpeexCallback callback;
callback.callback_id = SPEEX_INBAND_STEREO;


Loading…
Cancel
Save