virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

mlp/truehd: decode directly to the user-provided AVFrame

Browse Source
This commit is contained in:
Justin Ruggles 2012-12-23 19:24:24 -05:00
parent 86bfcfcf23
commit dc33fbbfd0
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/mlpdec.c
View File

@ -118,7 +118,6 @@ typedef struct SubStream {
typedef struct MLPDecodeContext {
AVCodecContext *avctx;
AVFrame frame;
/// Current access unit being read has a major sync.
int is_major_sync_unit;
@ -268,9 +267,6 @@ static av_cold int mlp_decode_init(AVCodecContext *avctx)
m->substream[substr].lossless_check_data = 0xffffffff;
ff_mlpdsp_init(&m->dsp);
avcodec_get_frame_defaults(&m->frame);
avctx->coded_frame = &m->frame;
return 0;
}
@ -973,7 +969,7 @@ static void rematrix_channels(MLPDecodeContext *m, unsigned int substr)
/** Write the audio data into the output buffer. */
static int output_data(MLPDecodeContext *m, unsigned int substr,
void *data, int *got_frame_ptr)
AVFrame *frame, int *got_frame_ptr)
{
AVCodecContext *avctx = m->avctx;
SubStream *s = &m->substream[substr];
@ -989,13 +985,13 @@ static int output_data(MLPDecodeContext *m, unsigned int substr,
}
/* get output buffer */
m->frame.nb_samples = s->blockpos;
if ((ret = ff_get_buffer(avctx, &m->frame)) < 0) {
frame->nb_samples = s->blockpos;
if ((ret = ff_get_buffer(avctx, frame)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret;
}
data_32 = (int32_t *)m->frame.data[0];
data_16 = (int16_t *)m->frame.data[0];
data_32 = (int32_t *)frame->data[0];
data_16 = (int16_t *)frame->data[0];
for (i = 0; i < s->blockpos; i++) {
for (out_ch = 0; out_ch <= s->max_matrix_channel; out_ch++) {
@ -1008,8 +1004,7 @@ static int output_data(MLPDecodeContext *m, unsigned int substr,
}
}
*got_frame_ptr = 1;
*(AVFrame *)data = m->frame;
*got_frame_ptr = 1;
return 0;
}