virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avcodec/ac3dec: only export matrix encoding and downmix info side data when necessary

Browse Source 
Don't export a matrix encoding side data when there's none signaled.
And if downmixing was handled by the decoder itself, then the downmix info does
not apply to the frame.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2025-01-15 22:19:54 -03:00
parent 4563cf95ca
commit bb033e6910
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/ac3dec.c
View File

@ -1500,7 +1500,6 @@ static int ac3_decode_frame(AVCodecContext *avctx, AVFrame *frame,
uint8_t extended_channel_map[EAC3_MAX_CHANNELS]; uint8_t extended_channel_map[EAC3_MAX_CHANNELS];
const SHORTFLOAT *output[AC3_MAX_CHANNELS]; const SHORTFLOAT *output[AC3_MAX_CHANNELS];
enum AVMatrixEncoding matrix_encoding; enum AVMatrixEncoding matrix_encoding;
AVDownmixInfo *downmix_info;
uint64_t mask; uint64_t mask;
s->superframe_size = 0; s->superframe_size = 0;
@ -1827,11 +1826,16 @@ skip:
break; break;
} }
} }
if ((ret = ff_side_data_update_matrix_encoding(frame, matrix_encoding)) < 0) if (matrix_encoding != AV_MATRIX_ENCODING_NONE &&
(ret = ff_side_data_update_matrix_encoding(frame, matrix_encoding)) < 0)
return ret; return ret;
/* AVDownmixInfo */ /* AVDownmixInfo */
if ((downmix_info = av_downmix_info_update_side_data(frame))) { if ( (s->channel_mode > AC3_CHMODE_STEREO) &&
((s->output_mode & ~AC3_OUTPUT_LFEON) > AC3_CHMODE_STEREO)) {
AVDownmixInfo *downmix_info = av_downmix_info_update_side_data(frame);
if (!downmix_info)
return AVERROR(ENOMEM);
switch (s->preferred_downmix) { switch (s->preferred_downmix) {
case AC3_DMIXMOD_LTRT: case AC3_DMIXMOD_LTRT:
downmix_info->preferred_downmix_type = AV_DOWNMIX_TYPE_LTRT; downmix_info->preferred_downmix_type = AV_DOWNMIX_TYPE_LTRT;
@ -1854,8 +1858,7 @@ skip:
downmix_info->lfe_mix_level = gain_levels_lfe[s->lfe_mix_level]; downmix_info->lfe_mix_level = gain_levels_lfe[s->lfe_mix_level];
else else
downmix_info->lfe_mix_level = 0.0; // -inf dB downmix_info->lfe_mix_level = 0.0; // -inf dB
} else }
return AVERROR(ENOMEM);
*got_frame_ptr = 1; *got_frame_ptr = 1;