From patchwork Sat Feb 4 20:48:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 40282 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp2175816pzk; Sat, 4 Feb 2023 12:48:51 -0800 (PST) X-Google-Smtp-Source: AK7set/7IZWz9Wf79NRe76Za+GmvmQ+aerpGxrBPCfUxozdWiWQHRSwLIoewIhMmMJoykd9j6ryX X-Received: by 2002:a17:907:c78a:b0:878:7349:5ce6 with SMTP id tz10-20020a170907c78a00b0087873495ce6mr16052176ejc.71.1675543731554; Sat, 04 Feb 2023 12:48:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675543731; cv=none; d=google.com; s=arc-20160816; b=tdbi1hcMyGr38kqKHTC1Tj0CgJPbzuB3E8Q5STyF6IcLuaX7DKxuMKd5qiwBsxMNKV nzn5ls9Zkljx6UXKOoc6uV2lcateoWev19QunbYdokLgNnahQ+sJfQUIyKJLLZ8vfPP2 WU3pui3TSZjV8W9myVS+D5A13/x3w4KaaGpsuPw+SdAFmr2TIy/LRx7tKznHBLlNrT3U W8WYyA5sXl6+/y9N2oQMAzjIGgKQCYAfA5V7Ja303wp3yojkKcfJTALsFlZwNf7jdTPl ainziHzGCV2lLs7dhIbX6GYk4iZ2HNLV1ROmyPt1rTNfT721z+31QOOS7/6DngtU91Dm 0OjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=O1vDipoNBI+9p8Hi2STigI7U6BxmGjqYX9g8iqHS3sw=; b=n4dwzoRdYZQBX1C9RB3K1ifG9qambM4ZKKd6VYyNuaJmnsjslWkD209j4JXg0jhwsR wRWQVwi9ZeP86bKBDFuek+IfOqWZ2Lt5/au9KqlNIuK/vEJJ6E+LqcHJG6V6luteDw2Z kUoaeTNMiK6ptNUVy8XstH4kQgTFs5WW4outmI2XrqqllIRmX8+tUsk9SYcOpRVyhloE HUuLYITWoUPT0auyIRuOOB3Y8ZyJNBuycTav/LkaLh9J1LJAA6R1XCvyaUu3lf4l2xks +EMqr67Gmi372GCM3Q4+D/okr0pKuUQSpTH1WZv197n87w0QZPVH9qgoJMQuGnqXXUu9 /I4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=l3mZe2o4; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ew6-20020a170907950600b0089bcd4cbd15si184103ejc.952.2023.02.04.12.48.50; Sat, 04 Feb 2023 12:48:51 -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=@gmail.com header.s=20210112 header.b=l3mZe2o4; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A774468BD85; Sat, 4 Feb 2023 22:48:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vk1-f178.google.com (mail-vk1-f178.google.com [209.85.221.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E92C968B58B for ; Sat, 4 Feb 2023 22:48:40 +0200 (EET) Received: by mail-vk1-f178.google.com with SMTP id 6so4290013vko.7 for ; Sat, 04 Feb 2023 12:48:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=XB30nnJ8C2Q1THYE81HeHGxCRWsgM2FwhqWnQLXeDG8=; b=l3mZe2o420FoqsgLkRQmDhXKInKefUWOD1qclEelJiV+9qZyYtzEJ9dXPTBkUy7B4i P625wIlNyyk/UUeXO8TKV1NGw0dKhbQjw1iIh7vHyl2Kv+UNbX9LJPIkiQeVa/WZdSaj OzOWJJFT92o+aYCROy/FhTLPgDkhpz6b5ur3n4JHvEEFezfRf2gNWwjkYkTfPzvCnWuQ 3RruKZIV1llrKenxaFbHwmSkC9WWxkrTQN0OVUzwiofdpUdsLcfH5N2BXIz3ii9sQoIF ZxAWezKX2Jx0ekwnSj40DTV+97EZB4RgfhtNaqnAENxEfuS+BWhPfYh4Jr6RmZlLj7wP Jdiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=XB30nnJ8C2Q1THYE81HeHGxCRWsgM2FwhqWnQLXeDG8=; b=ZHU7CVqayTAb7BcfvxjdeMLZzC4uq2kRkT+7KSUEJ2aopwJk0TOoFjCtTtB1q7n+AV COf9SCf9ekWM1kDXVIurUz24ahTVhMsz/9eXehK2cUsLTgoIVrKNRpYd47v9QJ/RBtqb SdS86iFj9IRMjfVYVL/sgOeiIUPdl8reetyxKBuQd6O1CPh5xxfmPxRt7cplwYjskB6c LjHvvN/jVQUidzXzejzw1b65qKSoKbigA4bAzc+xAALzo67KfJiilFeiPSzr9gZJ7kas 14ZBMVzTW6fFMiws3k6Jjycggkv1HKmwwWBkwOjlbTy5rjACphV2zDbAM6Brgb9s357R m7GA== X-Gm-Message-State: AO0yUKUyNa6Afv7bJ8U3zDURcKdHwVGp89fPTPTFCjp+ZLmRIGoqEjOa oVPb++eiA6tBIao6kX3C3rhxuO81C2e1AzR8GwSfoehh X-Received: by 2002:a05:6122:4ed:b0:3ea:78fc:6dd8 with SMTP id s13-20020a05612204ed00b003ea78fc6dd8mr2005188vkf.21.1675543719410; Sat, 04 Feb 2023 12:48:39 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a05:612c:2428:b0:32a:5eaa:92e4 with HTTP; Sat, 4 Feb 2023 12:48:38 -0800 (PST) From: Paul B Mahol Date: Sat, 4 Feb 2023 21:48:38 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avfilter: fix af_pan regression 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /r13CYkaxrvj Patch attached. From b53fa290876af0f540a99f733193f270103bf8ad Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Sat, 4 Feb 2023 21:46:15 +0100 Subject: [PATCH] avfilter/af_pan: fix regression introduced with switch to new channel layout API Fixes #10168 Signed-off-by: Paul B Mahol --- libavfilter/af_pan.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c index 067f646805..504e0fb5d3 100644 --- a/libavfilter/af_pan.c +++ b/libavfilter/af_pan.c @@ -313,6 +313,7 @@ static int config_props(AVFilterLink *link) pan->channel_map[i] = ch_id; } + av_opt_set_chlayout(pan->swr, "ichl", &pan->out_channel_layout, 0); av_opt_set_int(pan->swr, "uch", pan->nb_output_channels, 0); swr_set_channel_mapping(pan->swr, pan->channel_map); } else { @@ -333,6 +334,8 @@ static int config_props(AVFilterLink *link) for (j = 0; j < link->ch_layout.nb_channels; j++) pan->gain[i][j] /= t; } + av_opt_set_chlayout(pan->swr, "ichl", &link->ch_layout, 0); + av_opt_set_chlayout(pan->swr, "ochl", &pan->out_channel_layout, 0); swr_set_matrix(pan->swr, pan->gain[0], pan->gain[1] - pan->gain[0]); } -- 2.39.1