Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavc/aacdec_template: Only warn once about unusual 7.1 encoding.

Browse Source
pull/336/head
Carl Eugen Hoyos 5 years ago
parent 84abd1012c
commit 4d9b9c5e46
2 changed files with 11 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      libavcodec/aac.h
  2. 20
      libavcodec/aacdec_template.c

2
libavcodec/aac.h
Unescape View File

@ -356,7 +356,7 @@ struct AACContext {
OutputConfiguration oc[2]; OutputConfiguration oc[2];
int warned_num_aac_frames; int warned_num_aac_frames;
int warned_960_sbr; int warned_960_sbr;
unsigned warned_71_wide;
int warned_gain_control; int warned_gain_control;
/* aacdec functions pointers */ /* aacdec functions pointers */

20
libavcodec/aacdec_template.c
Unescape View File

@ -520,14 +520,14 @@ static void flush(AVCodecContext *avctx)
* *
* @return Returns error status. 0 - OK, !0 - error * @return Returns error status. 0 - OK, !0 - error
*/ */
static int set_default_channel_config(AVCodecContext *avctx, static int set_default_channel_config(AACContext *ac,
uint8_t (*layout_map)[3], uint8_t (*layout_map)[3],
int *tags, int *tags,
int channel_config) int channel_config)
{ {
if (channel_config < 1 || (channel_config > 7 && channel_config < 11) || if (channel_config < 1 || (channel_config > 7 && channel_config < 11) ||
channel_config > 12) { channel_config > 12) {
av_log(avctx, AV_LOG_ERROR, av_log(ac->avctx, AV_LOG_ERROR,
"invalid default channel configuration (%d)\n", "invalid default channel configuration (%d)\n",
channel_config); channel_config);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -547,8 +547,8 @@ static int set_default_channel_config(AVCodecContext *avctx,
* As actual intended 7.1(wide) streams are very rare, default to assuming a * As actual intended 7.1(wide) streams are very rare, default to assuming a
* 7.1 layout was intended. * 7.1 layout was intended.
*/ */
if (channel_config == 7 && avctx->strict_std_compliance < FF_COMPLIANCE_STRICT) { if (channel_config == 7 && ac->avctx->strict_std_compliance < FF_COMPLIANCE_STRICT && !ac->warned_71_wide++) {
av_log(avctx, AV_LOG_INFO, "Assuming an incorrectly encoded 7.1 channel layout" av_log(ac->avctx, AV_LOG_INFO, "Assuming an incorrectly encoded 7.1 channel layout"
" instead of a spec-compliant 7.1(wide) layout, use -strict %d to decode" " instead of a spec-compliant 7.1(wide) layout, use -strict %d to decode"
" according to the specification instead.\n", FF_COMPLIANCE_STRICT); " according to the specification instead.\n", FF_COMPLIANCE_STRICT);
layout_map[2][2] = AAC_CHANNEL_SIDE; layout_map[2][2] = AAC_CHANNEL_SIDE;
@ -573,7 +573,7 @@ static ChannelElement *get_che(AACContext *ac, int type, int elem_id)
av_log(ac->avctx, AV_LOG_DEBUG, "mono with CPE\n"); av_log(ac->avctx, AV_LOG_DEBUG, "mono with CPE\n");
if (set_default_channel_config(ac->avctx, layout_map, if (set_default_channel_config(ac, layout_map,
&layout_map_tags, 2) < 0) &layout_map_tags, 2) < 0)
return NULL; return NULL;
if (output_configure(ac, layout_map, layout_map_tags, if (output_configure(ac, layout_map, layout_map_tags,
@ -592,7 +592,7 @@ static ChannelElement *get_che(AACContext *ac, int type, int elem_id)
av_log(ac->avctx, AV_LOG_DEBUG, "stereo with SCE\n"); av_log(ac->avctx, AV_LOG_DEBUG, "stereo with SCE\n");
if (set_default_channel_config(ac->avctx, layout_map, if (set_default_channel_config(ac, layout_map,
&layout_map_tags, 1) < 0) &layout_map_tags, 1) < 0)
return NULL; return NULL;
if (output_configure(ac, layout_map, layout_map_tags, if (output_configure(ac, layout_map, layout_map_tags,
@ -841,7 +841,7 @@ static int decode_ga_specific_config(AACContext *ac, AVCodecContext *avctx,
if (tags < 0) if (tags < 0)
return tags; return tags;
} else { } else {
if ((ret = set_default_channel_config(avctx, layout_map, if ((ret = set_default_channel_config(ac, layout_map,
&tags, channel_config))) &tags, channel_config)))
return ret; return ret;
} }
@ -937,7 +937,7 @@ static int decode_eld_specific_config(AACContext *ac, AVCodecContext *avctx,
skip_bits_long(gb, 8 * len); skip_bits_long(gb, 8 * len);
} }
if ((ret = set_default_channel_config(avctx, layout_map, if ((ret = set_default_channel_config(ac, layout_map,
&tags, channel_config))) &tags, channel_config)))
return ret; return ret;
@ -1200,7 +1200,7 @@ static av_cold int aac_decode_init(AVCodecContext *avctx)
ac->oc[1].m4ac.chan_config = i; ac->oc[1].m4ac.chan_config = i;
if (ac->oc[1].m4ac.chan_config) { if (ac->oc[1].m4ac.chan_config) {
int ret = set_default_channel_config(avctx, layout_map, int ret = set_default_channel_config(ac, layout_map,
&layout_map_tags, ac->oc[1].m4ac.chan_config); &layout_map_tags, ac->oc[1].m4ac.chan_config);
if (!ret) if (!ret)
output_configure(ac, layout_map, layout_map_tags, output_configure(ac, layout_map, layout_map_tags,
@ -3002,7 +3002,7 @@ static int parse_adts_frame_header(AACContext *ac, GetBitContext *gb)
push_output_configuration(ac); push_output_configuration(ac);
if (hdr_info.chan_config) { if (hdr_info.chan_config) {
ac->oc[1].m4ac.chan_config = hdr_info.chan_config; ac->oc[1].m4ac.chan_config = hdr_info.chan_config;
if ((ret = set_default_channel_config(ac->avctx, if ((ret = set_default_channel_config(ac,
layout_map, layout_map,
&layout_map_tags, &layout_map_tags,
hdr_info.chan_config)) < 0) hdr_info.chan_config)) < 0)

Write Preview
Loading…
Cancel
Save