diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 12:21:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 12:22:35 +0100 |
| commit | 65da7007043cf4fb99b72c7f823cfc15e429b45f (patch) | |
| tree | baf5a652e66f919f462cc80c6d8fe0d247788475 /libavcodec/pcm-mpeg.c | |
| parent | afe30fe0600824b0dcda8318f09a5a4e376b99c3 (diff) | |
| parent | 1b9b6d6e5ea556b6d307f9d473f54f6406fdc3c8 (diff) | |
| download | ffmpeg-65da7007043cf4fb99b72c7f823cfc15e429b45f.tar.gz | |
Merge commit '1b9b6d6e5ea556b6d307f9d473f54f6406fdc3c8'
* commit '1b9b6d6e5ea556b6d307f9d473f54f6406fdc3c8':
qcelp: decode directly to the user-provided AVFrame
pcm-bluray: decode directly to the user-provided AVFrame
nellymoser: decode directly to the user-provided AVFrame
mpc7/8: decode directly to the user-provided AVFrame
mpegaudio: decode directly to the user-provided AVFrame
mlp/truehd: decode directly to the user-provided AVFrame
Conflicts:
libavcodec/mpc7.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pcm-mpeg.c')
| -rw-r--r-- | libavcodec/pcm-mpeg.c | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/libavcodec/pcm-mpeg.c b/libavcodec/pcm-mpeg.c index fe7c4a71d2..08aad95fba 100644 --- a/libavcodec/pcm-mpeg.c +++ b/libavcodec/pcm-mpeg.c @@ -122,26 +122,12 @@ static int pcm_bluray_parse_header(AVCodecContext *avctx, return 0; } -typedef struct PCMBRDecode { - AVFrame frame; -} PCMBRDecode; - -static av_cold int pcm_bluray_decode_init(AVCodecContext * avctx) -{ - PCMBRDecode *s = avctx->priv_data; - - avcodec_get_frame_defaults(&s->frame); - avctx->coded_frame = &s->frame; - - return 0; -} - static int pcm_bluray_decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr, AVPacket *avpkt) { + AVFrame *frame = data; const uint8_t *src = avpkt->data; int buf_size = avpkt->size; - PCMBRDecode *s = avctx->priv_data; GetByteContext gb; int num_source_channels, channel, retval; int sample_size, samples; @@ -166,13 +152,13 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, void *data, samples = buf_size / sample_size; /* get output buffer */ - s->frame.nb_samples = samples; - if ((retval = ff_get_buffer(avctx, &s->frame)) < 0) { + frame->nb_samples = samples; + if ((retval = ff_get_buffer(avctx, frame)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return retval; } - dst16 = (int16_t *)s->frame.data[0]; - dst32 = (int32_t *)s->frame.data[0]; + dst16 = (int16_t *)frame->data[0]; + dst32 = (int32_t *)frame->data[0]; if (samples) { switch (avctx->channel_layout) { @@ -306,8 +292,7 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, void *data, } } - *got_frame_ptr = 1; - *(AVFrame *)data = s->frame; + *got_frame_ptr = 1; retval = bytestream2_tell(&gb); if (avctx->debug & FF_DEBUG_BITSTREAM) @@ -320,8 +305,6 @@ AVCodec ff_pcm_bluray_decoder = { .name = "pcm_bluray", .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_PCM_BLURAY, - .priv_data_size = sizeof(PCMBRDecode), - .init = pcm_bluray_decode_init, .decode = pcm_bluray_decode_frame, .capabilities = CODEC_CAP_DR1, .sample_fmts = (const enum AVSampleFormat[]){ |