generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nellymoser: decode directly to the user-provided AVFrame

Browse Source
This commit is contained in:
Justin Ruggles 2012-12-23 19:39:44 -05:00
parent 3a23752c5a
commit 0fe4056f95
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/nellymoserdec.c
View File

@ -49,7 +49,6 @@
typedef struct NellyMoserDecodeContext { typedef struct NellyMoserDecodeContext {
AVCodecContext* avctx; AVCodecContext* avctx;
AVFrame frame;
AVLFG random_state; AVLFG random_state;
GetBitContext gb; GetBitContext gb;
float scale_bias; float scale_bias;
@ -136,15 +135,13 @@ static av_cold int decode_init(AVCodecContext * avctx) {
avctx->channels = 1; avctx->channels = 1;
avctx->channel_layout = AV_CH_LAYOUT_MONO; avctx->channel_layout = AV_CH_LAYOUT_MONO;
avcodec_get_frame_defaults(&s->frame);
avctx->coded_frame = &s->frame;
return 0; return 0;
} }
static int decode_tag(AVCodecContext *avctx, void *data, static int decode_tag(AVCodecContext *avctx, void *data,
int *got_frame_ptr, AVPacket *avpkt) int *got_frame_ptr, AVPacket *avpkt)
{ {
AVFrame *frame = data;
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int buf_size = avpkt->size;
NellyMoserDecodeContext *s = avctx->priv_data; NellyMoserDecodeContext *s = avctx->priv_data;
@ -169,12 +166,12 @@ static int decode_tag(AVCodecContext *avctx, void *data,
*/ */
/* get output buffer */ /* get output buffer */
s->frame.nb_samples = NELLY_SAMPLES * blocks; frame->nb_samples = NELLY_SAMPLES * blocks;
if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) { if ((ret = ff_get_buffer(avctx, frame)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret; return ret;
} }
samples_flt = (float *)s->frame.data[0]; samples_flt = (float *)frame->data[0];
for (i=0 ; i<blocks ; i++) { for (i=0 ; i<blocks ; i++) {
nelly_decode_block(s, buf, samples_flt); nelly_decode_block(s, buf, samples_flt);
@ -182,8 +179,7 @@ static int decode_tag(AVCodecContext *avctx, void *data,
buf += NELLY_BLOCK_LEN; buf += NELLY_BLOCK_LEN;
} }
*got_frame_ptr = 1; *got_frame_ptr = 1;
*(AVFrame *)data = s->frame;
return buf_size; return buf_size;
} }