SpeexStereoState stereo;
void *dec_state;
SpeexHeader *header;
+ int frame_size;
} LibSpeexContext;
if (avctx->extradata_size >= 80)
s->header = speex_packet_to_header(avctx->extradata, avctx->extradata_size);
- avctx->sample_fmt = SAMPLE_FMT_S16;
+ avctx->sample_fmt = AV_SAMPLE_FMT_S16;
if (s->header) {
avctx->sample_rate = s->header->rate;
avctx->channels = s->header->nb_channels;
- avctx->frame_size = s->header->frame_size;
+ avctx->frame_size = s->frame_size = s->header->frame_size;
if (s->header->frames_per_packet)
avctx->frame_size *= s->header->frames_per_packet;
return -1;
}
- if (!s->header)
- speex_decoder_ctl(s->dec_state, SPEEX_GET_FRAME_SIZE, &avctx->frame_size);
+ if (!s->header) {
+ speex_decoder_ctl(s->dec_state, SPEEX_GET_FRAME_SIZE, &s->frame_size);
+ }
if (avctx->channels == 2) {
SpeexCallback callback;
int16_t *output = data, *end;
int i, num_samples;
- num_samples = s->header->frame_size * avctx->channels;
- end = output + *data_size/2;
+ num_samples = s->frame_size * avctx->channels;
+ end = output + *data_size / sizeof(*output);
speex_bits_read_from(&s->bits, buf, buf_size);
break;
if (avctx->channels == 2)
- speex_decode_stereo_int(output, s->header->frame_size, &s->stereo);
+ speex_decode_stereo_int(output, s->frame_size, &s->stereo);
output += num_samples;
}
- avctx->frame_size = s->header->frame_size * i;
+ avctx->frame_size = s->frame_size * i;
*data_size = avctx->channels * avctx->frame_size * sizeof(*output);
return buf_size;
}
return 0;
}
-AVCodec libspeex_decoder = {
+AVCodec ff_libspeex_decoder = {
"libspeex",
- CODEC_TYPE_AUDIO,
+ AVMEDIA_TYPE_AUDIO,
CODEC_ID_SPEEX,
sizeof(LibSpeexContext),
libspeex_decode_init,