From patchwork Sun May 19 19:52:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 49039 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp4059223pzb; Sun, 19 May 2024 12:53:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUdwybswlt8MyKj01lFMX4waovz+WfYpiWKUeqNX/95zufpX2Dfd7TnB5FaZSafiLIPCUdlzCFbwHPZqI/Y+ZWTjvCBlMEZIm9EoA== X-Google-Smtp-Source: AGHT+IGM4dw5UdVaCZIG6PquoEcwAYcCudhoNb0XsqXPpRd2Y2UcFmkZS0JtxGOcOm7IH6fSv89R X-Received: by 2002:a17:907:9490:b0:a59:b8e2:a0cd with SMTP id a640c23a62f3a-a5a2d6669c1mr2128200466b.59.1716148400869; Sun, 19 May 2024 12:53:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716148400; cv=none; d=google.com; s=arc-20160816; b=AhcKpf1y62xFpBaPNSkMgjhafsoVEEUU/xG07Qin+XhhqHxXoZvt55cFPs8zbzerG7 v+lr5zMHd4l+m34Ziwuqo4rJ3zp5nDmcH/PdLf+LhfwzmruuK9XMihMTZDoExqH4aN7T GOxWAW6BArP4Rcqyxev9VVjhAYoDmJCWbdn9ErOK/m8nmPD+YWnfpUB6feY5y8jlgmm7 LAxvB9o1JUj7QMG8jpc9LCj9imGIpk/Enk5bLEjXuIqhBuLGyLUf3Fn9rA1uRBsvlUq2 5YbzJ8sJ/owXGC3IaEVYQRCJoxbwNcyX45yRsnVSD7Omm8wKV9PYiywPYfCXjPzzN7ff nwfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:delivered-to; bh=HAZ0UuNcOPizc6LWWn0Sz0aSo6/HCEQe3LrChvhQn3w=; fh=s+G8Ss4JbeMFkWPSp2LmIH/LXFyBlALRiww1j3FPjHY=; b=hnEGog1lXkDNaIImq4lVP2VJOd9ePzjDNAORRCYdZygxfWRHuD7pqX5nRjlgEnu6aq /js8YM7HSTol4Z0YegUIX04h7SjKvZbiyQVl5JW8R7/M9KiMj5xdro29jygHwKgg6a1E zwoqcLr5rR88fhKZC247KrnhNQrECRf/uUa9SEA3UIbbK5zFCZuBJ/Nek5kxZGEQSxQ8 XGAXYU3wj0avnPwxl4MqzLUP5ZB0XzjCYwxkhK2hSSusAPPDcPdJPyKqLKlO9sVK2LTJ g1PyaGR444kVLQIKlzRI/9vnSNupqNI3Rouj2uTojbMCTbXmC05BT4FtVdbBH2NNXCcV YwYQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a5a1b59f2fdsi1195951866b.909.2024.05.19.12.53.20; Sun, 19 May 2024 12:53:20 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1F11668D04F; Sun, 19 May 2024 22:53:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 13A8068B8FD for ; Sun, 19 May 2024 22:53:11 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id DD5EAEA6B0; Sun, 19 May 2024 21:53:10 +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 RFch6E2bF-qO; Sun, 19 May 2024 21:53:09 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 478A1EA66A; Sun, 19 May 2024 21:53:09 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 May 2024 21:52:57 +0200 Message-Id: <20240519195258.13627-1-cus@passwd.hu> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240518212048.GF2821752@pb2> References: <20240518212048.GF2821752@pb2> MIME-Version: 1.0 Subject: [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 Cc: Marton Balint Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: v0jjMDTjy/Dq 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. 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: From patchwork Sun May 19 19:52:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 49040 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp4059278pzb; Sun, 19 May 2024 12:53:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUoiF0lj6o3Zq3sToXt2nZYvGjUWHwSOAVhNy8ZCKVgVK6VNpSMxCx/gBijOy/DGhnr2VUMZDJCzRBPsxhsGs329cG60fZ4RKaYaQ== X-Google-Smtp-Source: AGHT+IEqgOXzwVumPUCu2ug4xQSgg00gtff49ImNczlCBIhunoYia95xHCeMlXPANIzgYcN3/m7F X-Received: by 2002:a17:906:4ecb:b0:a59:cdf4:f939 with SMTP id a640c23a62f3a-a5a2d54c60cmr1905907566b.3.1716148408989; Sun, 19 May 2024 12:53:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716148408; cv=none; d=google.com; s=arc-20160816; b=f8xR+aDh9GOk7dIZnRTaE8hoprF+bPd4+Z3xCz/Kya8rh0bh+x6myzdopA9UqsWJki ysQy10u5RS8iH9btAwjOkhm9rppHNBu28Khb00YutAY0RCSIHDwrCkE89Wx2I3h9TEg5 +DzAzRgWmr4h+agUDvuVaoqdhrLiBmz6v/KNIz4Vtm99pblRgoy/LSWwI/sIn8m4M5z5 8sgyK8Xon3LZa2s15OKJ9McCSz5wwBtY1Vu3oEIPXr6qs6zqVmxLxW2QQ9yzO/gi+1dx QOiE+etp/c3tVt3tGzCywWL2R2BHrZ3o0retVfmbI8UKDw2hUou5WdmUZTcPBhiw2NQY Dh4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:delivered-to; bh=C+PLrwzNkLREKIlUqVW8r0ipWaDsPvZNmAqZvzH8He0=; fh=s+G8Ss4JbeMFkWPSp2LmIH/LXFyBlALRiww1j3FPjHY=; b=BmiaGEpKSsVcnEsOyyI78/hcEV7C4hGMCDxmi/eF6wW3cltifZbFw/hOewYdggxrig djxFefyysjQA6HUHKzaw9eGDrbS2Nld82pcNv03ER+3kG4hthp/Sys0DTT0LNK8yLeYz GwoWtUtitgNHAFnxX0+nbl8zHknZGiY6Yp/PhOIpclfuaKly8lkYex4tDSUuUEW8KP5G ihZqKpVPaniR6bkWIopUG1JvC0GLg+E5WNzjfPx1u7jLfqzvd6ENy2E/7TiThIOOIh+/ +3wBqIeZWRUpiU0yZfZegyt6VoeAQkriHodhPCKAmoS5V/rXdkYACw29ycjD5YnGPF1I vV4w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a5a3e26bdecsi1049510066b.508.2024.05.19.12.53.28; Sun, 19 May 2024 12:53:28 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 49D5B68D056; Sun, 19 May 2024 22:53:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4A26268D066 for ; Sun, 19 May 2024 22:53:17 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 804E7EA6B0; Sun, 19 May 2024 21:53:16 +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 Joksddt-VWER; Sun, 19 May 2024 21:53:15 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 12212EA66A; Sun, 19 May 2024 21:53:15 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 May 2024 21:52:58 +0200 Message-Id: <20240519195258.13627-2-cus@passwd.hu> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240519195258.13627-1-cus@passwd.hu> References: <20240518212048.GF2821752@pb2> <20240519195258.13627-1-cus@passwd.hu> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/5] doc/ffmpeg: document -channel_layout/ch_layout options 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 Cc: Marton Balint Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: pV6tiyfI1Mw3 Signed-off-by: Marton Balint --- doc/ffmpeg.texi | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index da37e3ad37..f25f6192eb 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -1719,12 +1719,21 @@ This is an alias for @code{-filter:a}, see the @ref{filter_option,,-filter optio @table @option @item -atag @var{fourcc/tag} (@emph{output}) Force audio tag/fourcc. This is an alias for @code{-tag:a}. +@item -ch_layout[:@var{stream_specifier}] @var{layout} (@emph{input/output,per-stream}) +Alias for @code{-channel_layout}. +@item -channel_layout[:@var{stream_specifier}] @var{layout} (@emph{input/output,per-stream}) +Set the audio channel layout. For output streams it is set by default to the +input channel layout. For input streams it overrides the channel layout of the +input. Not all decoders respect the overridden channel layout. This option +also sets the channel layout for audio grabbing devices and raw demuxers +and is mapped to the corresponding demuxer option. @item -guess_layout_max @var{channels} (@emph{input,per-stream}) If some input channel layout is not known, try to guess only if it corresponds to at most the specified number of channels. For example, 2 tells to @command{ffmpeg} to recognize 1 channel as mono and 2 channels as stereo but not 6 channels as 5.1. The default is to always try to guess. Use -0 to disable all guessing. +0 to disable all guessing. Using the @code{-channel_layout} option to +explicitly specify an input layout also disables guessing. @end table @section Subtitle options