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 A047447D89 for ; Sun, 26 Nov 2023 13:19:26 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5953668CC4B; Sun, 26 Nov 2023 15:19:24 +0200 (EET) Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B9F5D68CC14 for ; Sun, 26 Nov 2023 15:19:17 +0200 (EET) Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-6b1d1099a84so3153234b3a.1 for ; Sun, 26 Nov 2023 05:19:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701004756; x=1701609556; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:autocrypt:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=fB4mzEFQAY54qaTj/2gvqxivNUHuHuNv8mljfSVklbc=; b=K6NPIzECn4wOhERXBRpK3TxNfSzMAca2PcDB+ITGH7KlYhfwAFUZ+Yqzk0FKef2qkn RYdwldHbfh2x4rYWZi9dexstRtI3APmFU2pHlv61j7dfCuEdXNhLry1hhihCklPMUzCx efnfn8d0tSo39+kOIGhq5v+l0ssY5p1LGqGK0O4Kzo4XwzCo9FBgHvm/eMF30Wm+f1t3 2mdtbW6EVxjTopbo/VMigkzd2oEFbR124d831Z+tIWxofrhoWMK6dsa1vMQ3WVkOnziA mXp5omEsT7t1TPUxQl1LySuVsn+HCIEy8/Va6Ya1RGp5SPEeN1aSBm7nKVXYccfn8XVt mBww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701004756; x=1701609556; h=content-transfer-encoding:in-reply-to:autocrypt:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=fB4mzEFQAY54qaTj/2gvqxivNUHuHuNv8mljfSVklbc=; b=wNjgTx8RKc6XHMYf6U4y604wGuwSxuuDZn3myZ7uZrHWpQYTZ1nQuSlRd89MU/JHyh Smf0G06SsFJKWF7bj/YA/dFYLJDoAofrTO51q/pqmiYFnONOuE2hFnlJ5qw9IleLXkdK ouEyue4cGdvm2DPkKtYaBuyZa8rrMCgUzb3AIVOp1IhwbPeVfh0k4+P7LctTB5mZ9zFZ X1nPWe6leefHpVmmYU6LLXvLhZIFL2OMArh3swXTipzlrepy6kK/NE1CvXG8LashMfwK 0pBOBk6QlEfrbk9n+4TM2UUatF2sFRzPrVZq5H13/Uf2h7lKwBmQBbwe2wkyXBm7UsUB 2kNg== X-Gm-Message-State: AOJu0YxBaUPjMBzAYWWh66Uqp61+FsEUeIAq9AQxVPiFK+LSdY8mKpw+ RIWydJVFxv/MgkKyK2hyRmF75cnz9zk= X-Google-Smtp-Source: AGHT+IHClxEJOkvY8DaVNZs7mTEbvrKr29dpjC93aHKCYcQJCTlK3jjvbWF2Lkt6QTftKiAZqP3UjQ== X-Received: by 2002:a05:6a00:1952:b0:6cb:65e6:3e49 with SMTP id s18-20020a056a00195200b006cb65e63e49mr11715423pfk.27.1701004755733; Sun, 26 Nov 2023 05:19:15 -0800 (PST) Received: from [192.168.0.14] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id j26-20020a62b61a000000b006cbb7e27091sm5806670pff.175.2023.11.26.05.19.14 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 26 Nov 2023 05:19:15 -0800 (PST) Message-ID: Date: Sun, 26 Nov 2023 10:19:36 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20231126050100.1686194-1-geoff@hostfission.com> From: James Almer Autocrypt: addr=jamrial@gmail.com; keydata= xsBNBFjZtqABCADLW+vdEoZaJZDsIO6geYFTOcn1unsEHefj9zn+3oTHlDFFzO47mzHsSfbK 9JE2xpOJEVnC8FAF5Sayi/pVwV+mtQUV3n5dgVeVBYF9GUQwOGFCpK8X54RRqhkgknbunOEE 0CtgAJgmpFmmmHgq02GvEspx1h/rh4apqwQR6QX4Favb+x9+i9ytVpwVcBX94vo2toyP7h/K BWfadQmb8ltgE1kshfg+SQs/H5bTV5Z1DuEASf02ZL/1qYB/sdTgWPLv9XMUHHsRFmMY8TMx wJSkP+Af3AiYQPJYz1B1D4tt98T/NoiVdin10zATakPjV8hXaobuRmxgakkUASXudydDABEB AAHNH0phbWVzIEFsbWVyIDxqYW1yaWFsQGdtYWlsLmNvbT7CwJIEEwEIADwCGwMGCwkIBwMC BhUIAgkKCwQWAgMBAh4BAheAFiEEd1EujP2UoWlX5pp6FGMBrXN2WeAFAmJoLUUCGQEACgkQ FGMBrXN2WeAFVQf9GtGhniRs1PzNUOgJktCnv6j4BbLieaIPYPEFXKDHOgjqQE2zVMYXnoXl Jam928ii902a8OY06r9ywn/R8ApD1/3NY/v64O71CY9scz5XyH2au8wIZ6HwFy3/f7sqjdGD uctY8Qs7rjT7NkoC5lmgMu2v2k03dGtM9AAf5AK5gU+H0EUw7vmKKiXzUqt5kvBuf4CEwXvH AQT1SMJ52rIlDWB7FQFyZeUbOAK2IgY/KNedfK6nsgd/eQVnlofPd2XoddE7kP6iys7jJefw DD3g3rZyDTq7in5dyk5glaNpWZpbHGBs+9SCYLnfQ8XvWqPFOD+gj0plamKANgOvavKTxM7A TQRY2bagAQgA69YtILj8kYxmqPr/M8+MXT7wVoOWVW9lvSmPquCELaDy/NIS7D06VC5EuE/6 JlJXZMTn37NLlyWhzwOgXuXw5w2tyoQQBuvqGiXJijuXwXH7HKdzrc6rpYtAqt5w05hzNrFS KrS0izG64VpWrfproy3BsL+8TBm9brLhhNPynVRqVukbbGzlATTzNQGZ14TTi2/dL6DkMQnM qn4jX9UEe4GdGQBP50bUJSSmeiIkyNLWA+znuN2PZEz930ZwNrF9GtDVw7mzcmpCZ7spldE2 tutbpy9D1bIqxyqBrYDSezyzL2adR1qgHyOTMCHg2AYNkrIQHrSyJxKTpZ1/hqOp8wARAQAB wsBfBBgBAgAJBQJY2bagAhsMAAoJEBRjAa1zdlnghekH/0Yb0iYJ74oID2f/Fj+AJKS2ekQF P2xOr8lpGzgp/+yWUvPtqbX0A33anBJdYwxaAC0NataX3tfZ+oJkzXqfmqhIHMPYHdZesJA2 Bk9hU/33mDl5s5U66/z0uelWzwKVHoQ2O6or4+qF3HJFSJLCe9uvWJ3zXf9F342Ftj73sfx+ 3xkw/IXsN1RqbYqDlzpoEQ99SIEfY/8Jjwnd3sIPfqkuyeaYfe6GJDqKawdCEP1oRRlbXEAp TJgYz8r3nPhGv9cdHNDCk44ISbsqVuxIEnLqi4fTPZaGupiQhT+srl268TTAp2TQW7+6Ce/b NPQorMquzS/LZoyALpmsYi/miMc= In-Reply-To: <20231126050100.1686194-1-geoff@hostfission.com> Subject: Re: [FFmpeg-devel] [PATCH] libavcodec/mlpdec: add missing correction to ch_layout when downmixing 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 11/26/2023 2:01 AM, Geoffrey McRae via ffmpeg-devel wrote: > This fixes corrupted audio for applications relying on ch_layout when > codec downmixing is active. > > Signed-off-by: Geoffrey McRae > --- > libavcodec/mlpdec.c | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) > > diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c > index f1524b95a6..18e0f47864 100644 > --- a/libavcodec/mlpdec.c > +++ b/libavcodec/mlpdec.c > @@ -306,6 +306,23 @@ FF_DISABLE_DEPRECATION_WARNINGS > } > FF_ENABLE_DEPRECATION_WARNINGS > #endif > + > + if (m->downmix_layout.nb_channels) { > + if (!av_channel_layout_compare(&m->downmix_layout, &(AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO) || > + !av_channel_layout_compare(&m->downmix_layout, &(AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO_DOWNMIX)) { > + av_channel_layout_uninit(&avctx->ch_layout); > + avctx->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO; > + } else if (!av_channel_layout_compare(&m->downmix_layout, &(AVChannelLayout)AV_CHANNEL_LAYOUT_5POINT0)) { > + av_channel_layout_uninit(&avctx->ch_layout); > + avctx->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_5POINT0; > + } else if (!av_channel_layout_compare(&m->downmix_layout, &(AVChannelLayout)AV_CHANNEL_LAYOUT_5POINT1)) { > + av_channel_layout_uninit(&avctx->ch_layout); > + avctx->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_5POINT1; > + } > + else > + av_log(avctx, AV_LOG_WARNING, "Invalid downmix layout\n"); > + } > + > ff_thread_once(&init_static_once, init_static); > > return 0; Applied, thanks. _______________________________________________ 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".