highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/ac3enc: Remove redundant channel layout checks

Browse Source 
These are all checked generically via AVCodec.ch_layouts
in encode_preinit_audio().

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2024-04-07 13:14:14 +02:00
parent 13daafd5c0
commit b3d12fe200
1 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavcodec/ac3enc.c
View File

@ -2189,17 +2189,12 @@ av_cold int ff_ac3_encode_close(AVCodecContext *avctx)
/* /*
* Set channel information during initialization. * Set channel information during initialization.
*/ */
static av_cold int set_channel_info(AVCodecContext *avctx) static av_cold void set_channel_info(AVCodecContext *avctx)
{ {
AC3EncodeContext *s = avctx->priv_data; AC3EncodeContext *s = avctx->priv_data;
uint64_t mask = av_channel_layout_subset(&avctx->ch_layout, ~(uint64_t)0); uint64_t mask = av_channel_layout_subset(&avctx->ch_layout, ~(uint64_t)0);
int channels = avctx->ch_layout.nb_channels; int channels = avctx->ch_layout.nb_channels;
if (channels < 1 || channels > AC3_MAX_CHANNELS)
return AVERROR(EINVAL);
if (mask > 0x7FF)
return AVERROR(EINVAL);
s->lfe_on = !!(mask & AV_CH_LOW_FREQUENCY); s->lfe_on = !!(mask & AV_CH_LOW_FREQUENCY);
s->channels = channels; s->channels = channels;
s->fbw_channels = channels - s->lfe_on; s->fbw_channels = channels - s->lfe_on;
@ -2217,15 +2212,11 @@ static av_cold int set_channel_info(AVCodecContext *avctx)
case AV_CH_LAYOUT_2_2: s->channel_mode = AC3_CHMODE_2F2R; break; case AV_CH_LAYOUT_2_2: s->channel_mode = AC3_CHMODE_2F2R; break;
case AV_CH_LAYOUT_5POINT0: case AV_CH_LAYOUT_5POINT0:
case AV_CH_LAYOUT_5POINT0_BACK: s->channel_mode = AC3_CHMODE_3F2R; break; case AV_CH_LAYOUT_5POINT0_BACK: s->channel_mode = AC3_CHMODE_3F2R; break;
default:
return AVERROR(EINVAL);
} }
s->has_center = (s->channel_mode & 0x01) && s->channel_mode != AC3_CHMODE_MONO; s->has_center = (s->channel_mode & 0x01) && s->channel_mode != AC3_CHMODE_MONO;
s->has_surround = s->channel_mode & 0x04; s->has_surround = s->channel_mode & 0x04;
s->channel_map = ac3_enc_channel_map[s->channel_mode][s->lfe_on]; s->channel_map = ac3_enc_channel_map[s->channel_mode][s->lfe_on];
return 0;
} }
@ -2234,17 +2225,7 @@ static av_cold int validate_options(AC3EncodeContext *s)
AVCodecContext *avctx = s->avctx; AVCodecContext *avctx = s->avctx;
int i, ret, max_sr; int i, ret, max_sr;
/* validate channel layout */ set_channel_info(avctx);
if (!avctx->ch_layout.nb_channels) {
av_log(avctx, AV_LOG_WARNING, "No channel layout specified. The "
"encoder will guess the layout, but it "
"might be incorrect.\n");
}
ret = set_channel_info(avctx);
if (ret) {
av_log(avctx, AV_LOG_ERROR, "invalid channel layout\n");
return ret;
}
/* validate sample rate */ /* validate sample rate */
/* note: max_sr could be changed from 2 to 5 for E-AC-3 once we find a /* note: max_sr could be changed from 2 to 5 for E-AC-3 once we find a