From 5a7288822f24b31e18d5fbe2c4086af6507878a7 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Sun, 23 Dec 2012 20:29:44 -0500 Subject: wmavoice: decode directly to the user-provided AVFrame --- libavcodec/wmavoice.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c index ba778cda31..f81e8e9403 100644 --- a/libavcodec/wmavoice.c +++ b/libavcodec/wmavoice.c @@ -136,7 +136,6 @@ typedef struct { * @name Global values specified in the stream header / extradata or used all over. * @{ */ - AVFrame frame; GetBitContext gb; ///< packet bitreader. During decoder init, ///< it contains the extradata from the ///< demuxer. During decoding, it contains @@ -445,9 +444,6 @@ static av_cold int wmavoice_decode_init(AVCodecContext *ctx) ctx->channel_layout = AV_CH_LAYOUT_MONO; ctx->sample_fmt = AV_SAMPLE_FMT_FLT; - avcodec_get_frame_defaults(&s->frame); - ctx->coded_frame = &s->frame; - return 0; } @@ -1735,7 +1731,8 @@ static int check_bits_for_superframe(GetBitContext *orig_gb, * @return 0 on success, <0 on error or 1 if there was not enough data to * fully parse the superframe */ -static int synth_superframe(AVCodecContext *ctx, int *got_frame_ptr) +static int synth_superframe(AVCodecContext *ctx, AVFrame *frame, + int *got_frame_ptr) { WMAVoiceContext *s = ctx->priv_data; GetBitContext *gb = &s->gb, s_gb; @@ -1803,13 +1800,13 @@ static int synth_superframe(AVCodecContext *ctx, int *got_frame_ptr) } /* get output buffer */ - s->frame.nb_samples = 480; - if ((res = ff_get_buffer(ctx, &s->frame)) < 0) { + frame->nb_samples = 480; + if ((res = ff_get_buffer(ctx, frame)) < 0) { av_log(ctx, AV_LOG_ERROR, "get_buffer() failed\n"); return res; } - s->frame.nb_samples = n_samples; - samples = (float *)s->frame.data[0]; + frame->nb_samples = n_samples; + samples = (float *)frame->data[0]; /* Parse frames, optionally preceded by per-frame (independent) LSPs. */ for (n = 0; n < 3; n++) { @@ -1966,11 +1963,10 @@ static int wmavoice_decode_packet(AVCodecContext *ctx, void *data, copy_bits(&s->pb, avpkt->data, size, gb, s->spillover_nbits); flush_put_bits(&s->pb); s->sframe_cache_size += s->spillover_nbits; - if ((res = synth_superframe(ctx, got_frame_ptr)) == 0 && + if ((res = synth_superframe(ctx, data, got_frame_ptr)) == 0 && *got_frame_ptr) { cnt += s->spillover_nbits; s->skip_bits_next = cnt & 7; - *(AVFrame *)data = s->frame; return cnt >> 3; } else skip_bits_long (gb, s->spillover_nbits - cnt + @@ -1985,12 +1981,11 @@ static int wmavoice_decode_packet(AVCodecContext *ctx, void *data, s->sframe_cache_size = 0; s->skip_bits_next = 0; pos = get_bits_left(gb); - if ((res = synth_superframe(ctx, got_frame_ptr)) < 0) { + if ((res = synth_superframe(ctx, data, got_frame_ptr)) < 0) { return res; } else if (*got_frame_ptr) { int cnt = get_bits_count(gb); s->skip_bits_next = cnt & 7; - *(AVFrame *)data = s->frame; return cnt >> 3; } else if ((s->sframe_cache_size = pos) > 0) { /* rewind bit reader to start of last (incomplete) superframe... */ -- cgit v1.2.3 From 8ae50d87e7712959ac705f7cdf7cff1bfb5b9ee3 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Sun, 23 Dec 2012 20:31:24 -0500 Subject: ws-snd1: decode directly to the user-provided AVFrame --- libavcodec/ws-snd1.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/ws-snd1.c b/libavcodec/ws-snd1.c index 62e0c6f656..62340c3bc5 100644 --- a/libavcodec/ws-snd1.c +++ b/libavcodec/ws-snd1.c @@ -41,28 +41,19 @@ static const int8_t ws_adpcm_4bit[] = { 0, 1, 2, 3, 4, 5, 6, 8 }; -typedef struct WSSndContext { - AVFrame frame; -} WSSndContext; - static av_cold int ws_snd_decode_init(AVCodecContext *avctx) { - WSSndContext *s = avctx->priv_data; - avctx->channels = 1; avctx->channel_layout = AV_CH_LAYOUT_MONO; avctx->sample_fmt = AV_SAMPLE_FMT_U8; - avcodec_get_frame_defaults(&s->frame); - avctx->coded_frame = &s->frame; - return 0; } static int ws_snd_decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr, AVPacket *avpkt) { - WSSndContext *s = avctx->priv_data; + AVFrame *frame = data; const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; @@ -89,18 +80,17 @@ static int ws_snd_decode_frame(AVCodecContext *avctx, void *data, } /* get output buffer */ - s->frame.nb_samples = out_size; - if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) { + frame->nb_samples = out_size; + if ((ret = ff_get_buffer(avctx, frame)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; } - samples = s->frame.data[0]; + samples = frame->data[0]; samples_end = samples + out_size; if (in_size == out_size) { memcpy(samples, buf, out_size); - *got_frame_ptr = 1; - *(AVFrame *)data = s->frame; + *got_frame_ptr = 1; return buf_size; } @@ -176,9 +166,8 @@ static int ws_snd_decode_frame(AVCodecContext *avctx, void *data, } } - s->frame.nb_samples = samples - s->frame.data[0]; - *got_frame_ptr = 1; - *(AVFrame *)data = s->frame; + frame->nb_samples = samples - frame->data[0]; + *got_frame_ptr = 1; return buf_size; } @@ -187,7 +176,6 @@ AVCodec ff_ws_snd1_decoder = { .name = "ws_snd1", .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_WESTWOOD_SND1, - .priv_data_size = sizeof(WSSndContext), .init = ws_snd_decode_init, .decode = ws_snd_decode_frame, .capabilities = CODEC_CAP_DR1, -- cgit v1.2.3