virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-14 22:22:59 +02:00
Code Issues Releases Activity

libcelt: decode directly to the user-provided AVFrame.

Browse Source
This commit is contained in:
Nicolas George 2013-02-13 14:32:27 +01:00
parent b68dd8a161
commit a17ececcc7
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/libcelt_dec.c
View File

@ -28,7 +28,6 @@
struct libcelt_context { struct libcelt_context {
CELTMode *mode; CELTMode *mode;
CELTDecoder *dec; CELTDecoder *dec;
AVFrame frame;
int discard; int discard;
}; };
@ -91,8 +90,6 @@ static av_cold int libcelt_dec_init(AVCodecContext *c)
version, lib_version); version, lib_version);
} }
c->sample_fmt = AV_SAMPLE_FMT_S16; c->sample_fmt = AV_SAMPLE_FMT_S16;
avcodec_get_frame_defaults(&celt->frame);
c->coded_frame = &celt->frame;
return 0; return 0;
} }
@ -105,31 +102,31 @@ static av_cold int libcelt_dec_close(AVCodecContext *c)
return 0; return 0;
} }
static int libcelt_dec_decode(AVCodecContext *c, void *frame, static int libcelt_dec_decode(AVCodecContext *c, void *data,
int *got_frame_ptr, AVPacket *pkt) int *got_frame_ptr, AVPacket *pkt)
{ {
struct libcelt_context *celt = c->priv_data; struct libcelt_context *celt = c->priv_data;
AVFrame *frame = data;
int err; int err;
int16_t *pcm; int16_t *pcm;
celt->frame.nb_samples = c->frame_size; frame->nb_samples = c->frame_size;
err = ff_get_buffer(c, &celt->frame); err = ff_get_buffer(c, frame);
if (err < 0) { if (err < 0) {
av_log(c, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(c, AV_LOG_ERROR, "get_buffer() failed\n");
return err; return err;
} }
pcm = (int16_t *)celt->frame.data[0]; pcm = (int16_t *)frame->data[0];
err = celt_decode(celt->dec, pkt->data, pkt->size, pcm, c->frame_size); err = celt_decode(celt->dec, pkt->data, pkt->size, pcm, c->frame_size);
if (err < 0) if (err < 0)
return ff_celt_error_to_averror(err); return ff_celt_error_to_averror(err);
if (celt->discard) { if (celt->discard) {
celt->frame.nb_samples -= celt->discard; frame->nb_samples -= celt->discard;
memmove(pcm, pcm + celt->discard * c->channels, memmove(pcm, pcm + celt->discard * c->channels,
celt->frame.nb_samples * c->channels * sizeof(int16_t)); frame->nb_samples * c->channels * sizeof(int16_t));
celt->discard = 0; celt->discard = 0;
} }
*got_frame_ptr = 1; *got_frame_ptr = 1;
*(AVFrame *)frame = celt->frame;
return pkt->size; return pkt->size;
} }