diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 12:54:03 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 12:54:08 +0100 |
commit | 91043de8256fa87a0a20cc3a139f668110257dbe (patch) | |
tree | c08d67dfa52db597b9b87bd74b304e6c03b8ade9 /libavcodec | |
parent | 0dff771f31cffffec0e16944d3890564c2da16eb (diff) | |
parent | 1647da89dd8ac09a55c111589f7a30d7e6b87d90 (diff) | |
download | ffmpeg-streaming-91043de8256fa87a0a20cc3a139f668110257dbe.zip ffmpeg-streaming-91043de8256fa87a0a20cc3a139f668110257dbe.tar.gz |
Merge commit '1647da89dd8ac09a55c111589f7a30d7e6b87d90'
* commit '1647da89dd8ac09a55c111589f7a30d7e6b87d90':
lavr: make sure that the mix function is reset even if no mixing will be done
lavr: print out the mix matrix in ff_audio_mix_set_matrix()
ws-snd1: decode directly to the user-provided AVFrame
wmavoice: decode directly to the user-provided AVFrame
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/wmavoice.c | 21 | ||||
-rw-r--r-- | libavcodec/ws-snd1.c | 26 |
2 files changed, 15 insertions, 32 deletions
diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c index 7ddc434..a82ee94 100644 --- a/libavcodec/wmavoice.c +++ b/libavcodec/wmavoice.c @@ -134,7 +134,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 @@ -443,9 +442,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; } @@ -1733,7 +1729,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; @@ -1801,13 +1798,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++) { @@ -1964,11 +1961,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 + @@ -1983,12 +1979,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... */ diff --git a/libavcodec/ws-snd1.c b/libavcodec/ws-snd1.c index 1c347e8..24ebceb 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, |