From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 8B5DB4AFBF for ; Sat, 25 May 2024 16:57:47 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 84BD968D52A; Sat, 25 May 2024 19:57:44 +0300 (EEST) Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C996868D307 for ; Sat, 25 May 2024 19:57:37 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 3AE69EA726 for ; Sat, 25 May 2024 18:57:37 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QqBHwgMkxoEa for ; Sat, 25 May 2024 18:57:32 +0200 (CEST) Received: from iq (iq [217.27.212.140]) by iq.passwd.hu (Postfix) with ESMTPS id B841BEA673 for ; Sat, 25 May 2024 18:57:32 +0200 (CEST) Date: Sat, 25 May 2024 18:57:32 +0200 (CEST) From: Marton Balint To: FFmpeg development discussions and patches In-Reply-To: <20240519195258.13627-1-cus@passwd.hu> Message-ID: <3ac2f52f-397b-e77b-dd99-0d3205cad12a@passwd.hu> References: <20240518212048.GF2821752@pb2> <20240519195258.13627-1-cus@passwd.hu> MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH v2 1/5] fftools/ffmpeg_demux: honor -ch_layout options for overriding input stream channel layout X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Sun, 19 May 2024, Marton Balint wrote: > The code only set the channel layout of the AVFormatContext, so the user could > not override the channel layout if the demuxer did not have such parameter. > > This used to work via the respective AVCodecContext option, but since > 639c2f00497257cb60ecaeeac1aacfa80df3be06 it no longer gets passed to the > decoders. It is actually better if we set it manually, instead of using the > codec option because that way we can also override it on the stream level, so > it will also work for stream copy or bitstream filtering. > > We don't allow changing the number of channels, because that can cause > unexpected results. We disable layout guessing, if a channel layout is > specified. > > Fixes ticket #11016. Will apply the series. Regards, Marton > > Signed-off-by: Marton Balint > --- > fftools/ffmpeg_demux.c | 27 ++++++++++++++++++++++++--- > 1 file changed, 24 insertions(+), 3 deletions(-) > > diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c > index cba63dab5f..1ca8d804ae 100644 > --- a/fftools/ffmpeg_demux.c > +++ b/fftools/ffmpeg_demux.c > @@ -1386,9 +1386,30 @@ static int ist_add(const OptionsContext *o, Demuxer *d, AVStream *st) > > break; > case AVMEDIA_TYPE_AUDIO: { > - int guess_layout_max = INT_MAX; > - MATCH_PER_STREAM_OPT(guess_layout_max, i, guess_layout_max, ic, st); > - guess_input_channel_layout(ist, par, guess_layout_max); > + char *ch_layout_str = NULL; > + MATCH_PER_STREAM_OPT(audio_ch_layouts, str, ch_layout_str, ic, st); > + if (ch_layout_str) { > + AVChannelLayout ch_layout; > + ret = av_channel_layout_from_string(&ch_layout, ch_layout_str); > + if (ret < 0) { > + av_log(ist, AV_LOG_ERROR, "Error parsing channel layout %s.\n", ch_layout_str); > + return ret; > + } > + if (par->ch_layout.nb_channels <= 0 || par->ch_layout.nb_channels == ch_layout.nb_channels) { > + av_channel_layout_uninit(&par->ch_layout); > + par->ch_layout = ch_layout; > + } else { > + av_log(ist, AV_LOG_ERROR, > + "Specified channel layout '%s' has %d channels, but input has %d channels.\n", > + ch_layout_str, ch_layout.nb_channels, par->ch_layout.nb_channels); > + av_channel_layout_uninit(&ch_layout); > + return AVERROR(EINVAL); > + } > + } else { > + int guess_layout_max = INT_MAX; > + MATCH_PER_STREAM_OPT(guess_layout_max, i, guess_layout_max, ic, st); > + guess_input_channel_layout(ist, par, guess_layout_max); > + } > break; > } > case AVMEDIA_TYPE_DATA: > -- > 2.35.3 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". > _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".