diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-12-23 17:03:36 -0500 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2013-02-12 12:21:21 -0500 |
| commit | da28bb3f4a7c650de7e2b767c69a64433c347fe7 (patch) | |
| tree | 49be326736799671241538722d2c23b7f4b85399 | |
| parent | e3db34291f4401a16f6ac92721617a9f33cd4c31 (diff) | |
| download | ffmpeg-da28bb3f4a7c650de7e2b767c69a64433c347fe7.tar.gz | |
amrwb: decode directly to the user-provided AVFrame
| -rw-r--r-- | libavcodec/amrwbdec.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c index 553ec3dfa2..cf137e046a 100644 --- a/libavcodec/amrwbdec.c +++ b/libavcodec/amrwbdec.c @@ -43,7 +43,6 @@ #include "amrwbdata.h" typedef struct { - AVFrame avframe; ///< AVFrame for decoded samples AMRWBFrame frame; ///< AMRWB parameters decoded from bitstream enum Mode fr_cur_mode; ///< mode index of current frame uint8_t fr_quality; ///< frame quality index (FQI) @@ -113,9 +112,6 @@ static av_cold int amrwb_decode_init(AVCodecContext *avctx) for (i = 0; i < 4; i++) ctx->prediction_error[i] = MIN_ENERGY; - avcodec_get_frame_defaults(&ctx->avframe); - avctx->coded_frame = &ctx->avframe; - return 0; } @@ -1077,6 +1073,7 @@ static int amrwb_decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr, AVPacket *avpkt) { AMRWBContext *ctx = avctx->priv_data; + AVFrame *frame = data; AMRWBFrame *cf = &ctx->frame; const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; @@ -1094,12 +1091,12 @@ static int amrwb_decode_frame(AVCodecContext *avctx, void *data, int sub, i, ret; /* get output buffer */ - ctx->avframe.nb_samples = 4 * AMRWB_SFR_SIZE_16k; - if ((ret = ff_get_buffer(avctx, &ctx->avframe)) < 0) { + frame->nb_samples = 4 * AMRWB_SFR_SIZE_16k; + if ((ret = ff_get_buffer(avctx, frame)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; } - buf_out = (float *)ctx->avframe.data[0]; + buf_out = (float *)frame->data[0]; header_size = decode_mime_header(ctx, buf); if (ctx->fr_cur_mode > MODE_SID) { @@ -1244,8 +1241,7 @@ static int amrwb_decode_frame(AVCodecContext *avctx, void *data, memcpy(ctx->isp_sub4_past, ctx->isp[3], LP_ORDER * sizeof(ctx->isp[3][0])); memcpy(ctx->isf_past_final, ctx->isf_cur, LP_ORDER * sizeof(float)); - *got_frame_ptr = 1; - *(AVFrame *)data = ctx->avframe; + *got_frame_ptr = 1; return expected_fr_size; } |