diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-12-23 19:52:00 -0500 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2013-02-12 12:22:38 -0500 |
| commit | 79fb2a1f1725d7b74355eb1ed79f080b3d7e3cd7 (patch) | |
| tree | e19e78efc75588e705fa691bb157d80bc4234fc0 /libavcodec | |
| parent | f7e8c87c02dc9b94857b0652fd15981c2b856841 (diff) | |
| download | ffmpeg-79fb2a1f1725d7b74355eb1ed79f080b3d7e3cd7.tar.gz | |
ra288: decode directly to the user-provided AVFrame
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/ra288.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/libavcodec/ra288.c b/libavcodec/ra288.c index a85d58a05a..744824ba6b 100644 --- a/libavcodec/ra288.c +++ b/libavcodec/ra288.c @@ -38,7 +38,6 @@ #define RA288_BLOCKS_PER_FRAME 32 typedef struct { - AVFrame frame; AVFloatDSPContext fdsp; DECLARE_ALIGNED(32, float, sp_lpc)[FFALIGN(36, 16)]; ///< LPC coefficients for speech data (spec: A) DECLARE_ALIGNED(32, float, gain_lpc)[FFALIGN(10, 16)]; ///< LPC coefficients for gain (spec: GB) @@ -70,9 +69,6 @@ static av_cold int ra288_decode_init(AVCodecContext *avctx) avpriv_float_dsp_init(&ractx->fdsp, avctx->flags & CODEC_FLAG_BITEXACT); - avcodec_get_frame_defaults(&ractx->frame); - avctx->coded_frame = &ractx->frame; - return 0; } @@ -178,6 +174,7 @@ static void backward_filter(RA288Context *ractx, static int ra288_decode_frame(AVCodecContext * avctx, void *data, int *got_frame_ptr, AVPacket *avpkt) { + AVFrame *frame = data; const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; float *out; @@ -193,12 +190,12 @@ static int ra288_decode_frame(AVCodecContext * avctx, void *data, } /* get output buffer */ - ractx->frame.nb_samples = RA288_BLOCK_SIZE * RA288_BLOCKS_PER_FRAME; - if ((ret = ff_get_buffer(avctx, &ractx->frame)) < 0) { + frame->nb_samples = RA288_BLOCK_SIZE * RA288_BLOCKS_PER_FRAME; + if ((ret = ff_get_buffer(avctx, frame)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; } - out = (float *)ractx->frame.data[0]; + out = (float *)frame->data[0]; init_get_bits(&gb, buf, avctx->block_align * 8); @@ -220,8 +217,7 @@ static int ra288_decode_frame(AVCodecContext * avctx, void *data, } } - *got_frame_ptr = 1; - *(AVFrame *)data = ractx->frame; + *got_frame_ptr = 1; return avctx->block_align; } |