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 31912478BD for ; Sun, 26 Nov 2023 13:19:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2A7A868CA61; Sun, 26 Nov 2023 15:19:16 +0200 (EET) Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DE79B68C8D8 for ; Sun, 26 Nov 2023 15:19:09 +0200 (EET) Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-6cbbfdf72ecso3313520b3a.2 for ; Sun, 26 Nov 2023 05:19:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701004747; x=1701609547; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:to:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=6BFGjLdNOWRcoLb38uTB3fck5Ujgmwa3NJf1Zw598Vs=; b=Vi1xgr6nq78MccDSICf4UGMvhWE50gfCGdn5UJAs/4ky74ncCIMrqPs25SfVZhwJO9 YFU5CQ376QRXtYAkeNfiWUCrG5ExQvqhxAUdYAyqJylfZruVCcGGv/SWcmyh3uA0sPfm Y8Iu9Go+hovpvkdtmJW/aL7cYnEQVRPhcs8rJrsxe5aEYGb79mcFM4838H1cpOSgGjsq +7b0D3eL4LW9M0UA7EsaRov70DIzP+GIIjZz5bHymZ1cY2mmgyQncBR4YPgL9FZ+iyi+ 4huVy9VMqFG7La1BW3OfJ0BIJqVcpx8HzZ1gLB4x45sXwAn5pKMIaEBafLYpLhvbunZZ ejsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701004747; x=1701609547; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:to:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=6BFGjLdNOWRcoLb38uTB3fck5Ujgmwa3NJf1Zw598Vs=; b=ANEsKokcONGUJBbYNnXIGzDGFRFI9eKjtjZRVjoCIdYViRZxqw3+ZvMNY4auO2fQ8F k1JxgQW4O6L9AEx881y/G9JLRWrspeeP8y6lNEOu1HNx0Gp5cIUt7Uc3qGI+EXFKtiSw yLlhymisc+PhO13xvOObUFDnwN+DTceELPx/4vIZwhhgiImCtVaFboYCCXOsGT/EuBqa FOzXFnQEJ941al6/VuBlHkfDPHo3h3uv8y89szZwzVxhv3q0Bh9M8CkklB9bCGukrn0s bHkIJpUymADfahV+8+8/Ebr+KckAHanXLhqlEjnduu4M7BhtpOBmMIAnYMSi+ovI5qQ+ DMJQ== X-Gm-Message-State: AOJu0YzdBjcXbEaexn2Ndwr1iclF549xpM6QrMNDZv2WuXsam0+X9vQp peVuRFfKWDn+/HaIFF5pN02km6zzwTs= X-Google-Smtp-Source: AGHT+IHmZa9CR+RE9Gt0KhyPWk74G7DA8S1qZQDjEWQmFLu4QFZitYSYydhP/jfY5d04YjydUHDK+A== X-Received: by 2002:a05:6a00:234f:b0:6cb:8dba:ce6a with SMTP id j15-20020a056a00234f00b006cb8dbace6amr10621167pfj.27.1701004747255; Sun, 26 Nov 2023 05:19:07 -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.05 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 26 Nov 2023 05:19:06 -0800 (PST) Message-ID: Date: Sun, 26 Nov 2023 10:19:25 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20231126043322.1681663-1-geoff@hostfission.com> Content-Language: en-US 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: <20231126043322.1681663-1-geoff@hostfission.com> Subject: Re: [FFmpeg-devel] [PATCH] libavcodec/dcadec: adjust the `ch_layout` when downmix is active 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 1:33 AM, Geoffrey McRae via ffmpeg-devel wrote: > Applications making use of this codec with the `downmix` option are > segfaulting unless the `ch_layout` is overridden after `avcodec_open2` > as can be seen in projects like MythTV[1] > > This patch fixes this by overriding the ch_layout as done in other > decoders such as AC3. > > 1: https://github.com/MythTV/mythtv/blob/af6f362a140cd59b9ed784a8c639fd456b5f6967/mythtv/libs/libmythtv/decoders/avformatdecoder.cpp#L4607 > > Signed-off-by: Geoffrey McRae > --- > libavcodec/dcadec.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) > > diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c > index 1fee49cf4d..cc23731b90 100644 > --- a/libavcodec/dcadec.c > +++ b/libavcodec/dcadec.c > @@ -366,12 +366,19 @@ FF_ENABLE_DEPRECATION_WARNINGS > > if (s->downmix_layout.nb_channels) { > if (!av_channel_layout_compare(&s->downmix_layout, &(AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO) || > - !av_channel_layout_compare(&s->downmix_layout, &(AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO_DOWNMIX)) > + !av_channel_layout_compare(&s->downmix_layout, &(AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO_DOWNMIX)) { > s->request_channel_layout = DCA_SPEAKER_LAYOUT_STEREO; > - else if (!av_channel_layout_compare(&s->downmix_layout, &(AVChannelLayout)AV_CHANNEL_LAYOUT_5POINT0)) > + av_channel_layout_uninit(&avctx->ch_layout); > + avctx->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO; > + } else if (!av_channel_layout_compare(&s->downmix_layout, &(AVChannelLayout)AV_CHANNEL_LAYOUT_5POINT0)) { > s->request_channel_layout = DCA_SPEAKER_LAYOUT_5POINT0; > - else if (!av_channel_layout_compare(&s->downmix_layout, &(AVChannelLayout)AV_CHANNEL_LAYOUT_5POINT1)) > + av_channel_layout_uninit(&avctx->ch_layout); > + avctx->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_5POINT0; > + } else if (!av_channel_layout_compare(&s->downmix_layout, &(AVChannelLayout)AV_CHANNEL_LAYOUT_5POINT1)) { > s->request_channel_layout = DCA_SPEAKER_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"); > } 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".