From patchwork Sat Mar 9 18:27:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marth64 X-Patchwork-Id: 46912 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dc95:b0:1a1:738b:6bc0 with SMTP id ky21csp379623pzb; Sat, 9 Mar 2024 10:28:24 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUJCuw9sFK5JCOpdROP30rKpCqGRXGsxUBwo0ARmHA7kZzbfoicVTiqpgTwVSGLD5SISrDqzZns65zIBPut5zJ4aB1ZFTStsV2Bvg== X-Google-Smtp-Source: AGHT+IHXjDLftI6LAG1OcJZ0auqStwzd+3etu2eQC1ZaW2wwlrceq05/CM5buTSWG9oF+ka64J1U X-Received: by 2002:a50:951b:0:b0:566:14e3:2262 with SMTP id u27-20020a50951b000000b0056614e32262mr1544337eda.36.1710008904002; Sat, 09 Mar 2024 10:28:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1710008903; cv=none; d=google.com; s=arc-20160816; b=PFxbgdGsCBpQnIcPw+akVd+15cjKEzV59CSPSo1W+aGTs5/Qk2LUwY0Mx9t3XEurQb g2rPBdQBHbZ4OCchz5LCQuvKXvaisA0OghFrgH/m+BbwBX8zgu3qxAMsqS9W75XDFbGl O0qEuaA0DNSfQVVW8vxYaS3kou4VYpBJBSKE817VIX8aHB4ZFqXrnEEOHpVkZRLR8A4S UnIjpNPtIsBRol82zOe3dttaEpXk07p+D5C0EqNOLgQIQTbsbcwtuxR6kOZB9ErEkPIu TJBXBs/scxrEIOdgfICwwZwuOVpG7sdem6DFogDyHcNmOf9kDUQHtdMhX5BjPhoySnV2 Pt5Q== 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:dkim-signature:delivered-to; bh=uKONrN/V6FtGqTZs05GBQ1GPFqFCyy/HmYu97YsIpO4=; fh=PlWMzmI9LD2qGS7ipLrQl8z0iaQTLQLHzoGuXcBzpCg=; b=nEdKgIbAxCU3U95++SIaj0yg9kjc6moPJEmlmyrVse9iIBzTEXaXGl3bGOVkjNQMhM Gt9OPr9X8OcLx/gS8mBawWzkVLd4GqundqbZO/50UzWzsIjH1IVgKG80kUBzYSzkRPrY 9VMM6vwdIKwju4W3q8j8TD8YT+F9fcLFM1nxj1kw3CUVz/8wn0OaA9C050tgA6dZLyBm Cyz9ascmaCQOKZjcy5jfsP7hpjX3WsNA7uVQox+DRN2MYY8r7xkzXhID5O2yYJw62PZS NBEdAjw015kQDw9k+eZMguvGO67RW3zZdvWn2ylOhyjQy7JMZgfA+2iwu0fsdV0yduzL yY1g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@proxyid.net header.s=google header.b=Ad1uCwge; 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 z2-20020a05640235c200b00568432b869fsi396789edc.406.2024.03.09.10.28.23; Sat, 09 Mar 2024 10:28:23 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@proxyid.net header.s=google header.b=Ad1uCwge; 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 216FD68CD43; Sat, 9 Mar 2024 20:28:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ua1-f99.google.com (mail-ua1-f99.google.com [209.85.222.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 17C9368CCD4 for ; Sat, 9 Mar 2024 20:28:13 +0200 (EET) Received: by mail-ua1-f99.google.com with SMTP id a1e0cc1a2514c-7dba73cab13so992061241.3 for ; Sat, 09 Mar 2024 10:28:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proxyid.net; s=google; t=1710008892; x=1710613692; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Oj4VEXiyuuOrEtKk/tlCUxczIWIdrGFU9fUNKnV8AXk=; b=Ad1uCwgeah0URLDsA29dG+MnXw8GTJOUbyyZbXFLeFvvkskcNNWppIxsJ6BeuCHm1I r5LsGxMNV11sGb+CIBHXoUVmSdOIXvLza/f5jkphYKbCK0L6UlN/4VM/4UYAUapYczqA sK240vV2zQgFKFeCPehl9LTPsug5UsnKuWiuB3nbKrChXVaWMF79zVmEwfDHiBcjY6yU UrDODtEgFcOBA4zUnBPQje0ZQEQVhdRtkm/lypjZuJA2/v1nypkuTXOz5aqyxug+lO3/ 9JUFoD/P+oBRBmuAw5kg0hFbf+64a8B6pPSPU0rfwczuoPR5csfX50cXZy8WAS3EZPsO Cbvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710008892; x=1710613692; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Oj4VEXiyuuOrEtKk/tlCUxczIWIdrGFU9fUNKnV8AXk=; b=L40i8gH4QopR5z+cJVHSdjsfV+vNKKUP3mohckKkZ+AWumcfZlEwDkvA7wu5I7IL/N lxBCsbf2eBLPffi5QJfeYCS19yC/+Ay+yu+dGif+VO3ZbDP0lcIFk9/1rLgDkDuZiahk PCJsHG//FLberVmsKGBKFvU1IQb4e4wV493fcL3czXXYrn+g13YvGrp+ORbQL6ZaQqm1 FOMu8/5YJMbOU+Op0/io4kytze6oCz60vXF7u3cxZJ7L0Iwu1E4GkFRv61p5OagOUsiO kgYmdFKZ4mIuu7D9+3sQYvMwvefNRKlNDXzMYouBuN3c760mgNKIA16cVLfa52BephfH e1Mw== X-Gm-Message-State: AOJu0Yxumk7mKRljty5BLGyEMmq2TGHRABjUgLwJMK0r+hc1DTvETbhf DbpLG8ZumkA9GEUzfXWO4v4XGrcZfxlmCPPKhOvMW15rG8cEwtWDZptNaJLuADmlqnf5GGoNoX9 Dxj6l9iNX6nGifdQgrOKWqdyZJ9t26LtdCghBojJn X-Received: by 2002:a05:6102:3957:b0:470:4514:506b with SMTP id f23-20020a056102395700b004704514506bmr1309449vsu.3.1710008891861; Sat, 09 Mar 2024 10:28:11 -0800 (PST) Received: from wsx-cc1-001.. (c-76-141-249-38.hsd1.il.comcast.net. [76.141.249.38]) by smtp-relay.gmail.com with ESMTPS id bl39-20020a05610250a700b0047309fc6020sm95893vsb.1.2024.03.09.10.28.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Mar 2024 10:28:11 -0800 (PST) X-Relaying-Domain: proxyid.net From: Marth64 To: ffmpeg-devel@ffmpeg.org Date: Sat, 9 Mar 2024 12:27:50 -0600 Message-Id: <20240309182752.3204466-2-marth64@proxyid.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240309182752.3204466-1-marth64@proxyid.net> References: <20240309182752.3204466-1-marth64@proxyid.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/3] avformat/dvdvideodec: assign mono channel layout explicitly 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: Marth64 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gpQqnPjTTIPb Signed-off-by: Marth64 --- libavformat/dvdvideodec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/dvdvideodec.c b/libavformat/dvdvideodec.c index b3cc32b864..ca85aa8d3d 100644 --- a/libavformat/dvdvideodec.c +++ b/libavformat/dvdvideodec.c @@ -932,7 +932,9 @@ static int dvdvideo_audio_stream_analyze(AVFormatContext *s, audio_attr_t audio_ return AVERROR_INVALIDDATA; } - if (nb_channels == 2) + if (nb_channels == 1) + ch_layout = (AVChannelLayout) AV_CHANNEL_LAYOUT_MONO; + else if (nb_channels == 2) ch_layout = (AVChannelLayout) AV_CHANNEL_LAYOUT_STEREO; else if (nb_channels == 6) ch_layout = (AVChannelLayout) AV_CHANNEL_LAYOUT_5POINT1;