videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

avcodec/liblc3enc: don't force unspec channel layouts 

We only care about channel count. Layout details will be ignored either way.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2024-04-04 13:26:49 -03:00
parent 45d2110fc7
commit 3db674614d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/liblc3enc.c
View File

@ -61,6 +61,12 @@ static av_cold int liblc3_encode_init(AVCodecContext *avctx)
"Unsupported frame duration %.1f ms.\n", frame_us / 1000.f);
return AVERROR(EINVAL);
}
if (channels < 0 || channels > ENCODER_MAX_CHANNELS) {
av_log(avctx, AV_LOG_ERROR,
"Invalid number of channels %d. Max %d channels are accepted\n",
channels, ENCODER_MAX_CHANNELS);
return AVERROR(EINVAL);
}
hr_mode |= srate_hz > 48000;
hr_mode &= srate_hz >= 48000;
@ -195,9 +201,6 @@ const FFCodec ff_liblc3_encoder = {
.p.type = AVMEDIA_TYPE_AUDIO,
.p.id = AV_CODEC_ID_LC3,
.p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY,
.p.ch_layouts = (const AVChannelLayout[])
{ { AV_CHANNEL_ORDER_UNSPEC, 1 },
{ AV_CHANNEL_ORDER_UNSPEC, 2 }, { 0 } },
.p.supported_samplerates = (const int [])
{ 96000, 48000, 32000, 24000, 16000, 8000, 0 },
.p.sample_fmts = (const enum AVSampleFormat[])