videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-07-11 23:27:55 +02:00
Code Releases Activity

Merge commit '7840c40445c9f52aeccba96de3d27613398bfbf2'

Browse Source 
* commit '7840c40445c9f52aeccba96de3d27613398bfbf2':
  (e)ac3dec: set AV_FRAME_DATA_MATRIXENCODING side data.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-01-05 23:14:20 +01:00
commit d18234f319
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libavcodec/ac3dec.c
View File

@ -1300,6 +1300,7 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data,
int blk, ch, err, ret;
const uint8_t *channel_map;
const float *output[AC3_MAX_CHANNELS];
enum AVMatrixEncoding matrix_encoding;
/* copy input buffer to decoder context to avoid reading past the end
of the buffer, which can be caused by a damaged input stream. */
@ -1448,6 +1449,35 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data,
for (ch = 0; ch < s->out_channels; ch++)
memcpy(s->output[ch], output[ch], sizeof(**output) * AC3_BLOCK_SIZE);
/*
* AVMatrixEncoding
*
* Check whether the input layout is compatible, and make sure we're not
* downmixing (else the matrix encoding is no longer applicable).
*/
matrix_encoding = AV_MATRIX_ENCODING_NONE;
if (s->channel_mode == AC3_CHMODE_STEREO &&
s->channel_mode == (s->output_mode & ~AC3_OUTPUT_LFEON)) {
if (s->dolby_surround_mode == AC3_DSURMOD_ON)
matrix_encoding = AV_MATRIX_ENCODING_DOLBY;
else if (s->dolby_headphone_mode == AC3_DHEADPHONMOD_ON)
matrix_encoding = AV_MATRIX_ENCODING_DOLBYHEADPHONE;
} else if (s->channel_mode >= AC3_CHMODE_2F2R &&
s->channel_mode == (s->output_mode & ~AC3_OUTPUT_LFEON)) {
switch (s->dolby_surround_ex_mode) {
case AC3_DSUREXMOD_ON: // EX or PLIIx
matrix_encoding = AV_MATRIX_ENCODING_DOLBYEX;
break;
case AC3_DSUREXMOD_PLIIZ:
matrix_encoding = AV_MATRIX_ENCODING_DPLIIZ;
break;
default: // not indicated or off
break;
}
}
if ((ret = ff_side_data_update_matrix_encoding(frame, matrix_encoding)) < 0)
return ret;
*got_frame_ptr = 1;
return FFMIN(buf_size, s->frame_size);