* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "avcodec.h"
#include <speex/speex.h>
#include <speex/speex_header.h>
#include <speex/speex_stereo.h>
#include <speex/speex_callbacks.h>
+#include "avcodec.h"
typedef struct {
+ AVFrame frame;
SpeexBits bits;
SpeexStereoState stereo;
void *dec_state;
mode = speex_lib_get_mode(s->header->mode);
if (!mode) {
av_log(avctx, AV_LOG_ERROR, "Unknown Speex mode %d", s->header->mode);
- return -1;
+ return AVERROR_INVALIDDATA;
}
} else
av_log(avctx, AV_LOG_INFO, "Missing Speex header, assuming defaults.\n");
if (avctx->channels > 2) {
av_log(avctx, AV_LOG_ERROR, "Only stereo and mono are supported.\n");
- return -1;
+ return AVERROR(EINVAL);
}
speex_bits_init(&s->bits);
s->stereo = (SpeexStereoState)SPEEX_STEREO_STATE_INIT;
speex_decoder_ctl(s->dec_state, SPEEX_SET_HANDLER, &callback);
}
+
+ avcodec_get_frame_defaults(&s->frame);
+ avctx->coded_frame = &s->frame;
+
return 0;
}
-static int libspeex_decode_frame(AVCodecContext *avctx,
- void *data, int *data_size,
- AVPacket *avpkt)
+static int libspeex_decode_frame(AVCodecContext *avctx, void *data,
+ int *got_frame_ptr, AVPacket *avpkt)
{
uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
LibSpeexContext *s = avctx->priv_data;
- int16_t *output = data, *end;
- int i, num_samples;
-
- num_samples = s->frame_size * avctx->channels;
- end = output + *data_size / sizeof(*output);
-
- speex_bits_read_from(&s->bits, buf, buf_size);
-
- for (i = 0; speex_bits_remaining(&s->bits) && output + num_samples < end; i++) {
- int ret = speex_decode_int(s->dec_state, &s->bits, output);
- if (ret <= -2) {
- av_log(avctx, AV_LOG_ERROR, "Error decoding Speex frame.\n");
- return -1;
- } else if (ret == -1)
- // end of stream
- break;
-
- if (avctx->channels == 2)
- speex_decode_stereo_int(output, s->frame_size, &s->stereo);
+ int16_t *output;
+ int ret, consumed = 0;
+
+ /* get output buffer */
+ s->frame.nb_samples = s->frame_size;
+ if ((ret = avctx->get_buffer(avctx, &s->frame)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ return ret;
+ }
+ output = (int16_t *)s->frame.data[0];
+
+ /* if there is not enough data left for the smallest possible frame,
+ reset the libspeex buffer using the current packet, otherwise ignore
+ the current packet and keep decoding frames from the libspeex buffer. */
+ if (speex_bits_remaining(&s->bits) < 43) {
+ /* check for flush packet */
+ if (!buf || !buf_size) {
+ *got_frame_ptr = 0;
+ return buf_size;
+ }
+ /* set new buffer */
+ speex_bits_read_from(&s->bits, buf, buf_size);
+ consumed = buf_size;
+ }
- output += num_samples;
+ /* decode a single frame */
+ ret = speex_decode_int(s->dec_state, &s->bits, output);
+ if (ret <= -2) {
+ av_log(avctx, AV_LOG_ERROR, "Error decoding Speex frame.\n");
+ return AVERROR_INVALIDDATA;
}
+ if (avctx->channels == 2)
+ speex_decode_stereo_int(output, s->frame_size, &s->stereo);
+
+ *got_frame_ptr = 1;
+ *(AVFrame *)data = s->frame;
- avctx->frame_size = s->frame_size * i;
- *data_size = avctx->channels * avctx->frame_size * sizeof(*output);
- return buf_size;
+ return consumed;
}
static av_cold int libspeex_decode_close(AVCodecContext *avctx)
return 0;
}
+static av_cold void libspeex_decode_flush(AVCodecContext *avctx)
+{
+ LibSpeexContext *s = avctx->priv_data;
+ speex_bits_reset(&s->bits);
+}
+
AVCodec ff_libspeex_decoder = {
.name = "libspeex",
.type = AVMEDIA_TYPE_AUDIO,
.init = libspeex_decode_init,
.close = libspeex_decode_close,
.decode = libspeex_decode_frame,
+ .flush = libspeex_decode_flush,
+ .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DELAY | CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("libspeex Speex"),
};