From patchwork Sun Sep 18 20:27:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38025 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp858667pzh; Sun, 18 Sep 2022 13:28:50 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4TlaRWIkY2oHIsNX1apoVtymPyQmWw4OQ450uqtui8TnWuey2SrT9M5VIbIKIm8pRRG5It X-Received: by 2002:a17:906:8477:b0:77d:185a:b443 with SMTP id hx23-20020a170906847700b0077d185ab443mr10448827ejc.311.1663532929491; Sun, 18 Sep 2022 13:28:49 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dy8-20020a05640231e800b0044efcaeec2asi7352712edb.167.2022.09.18.13.28.49; Sun, 18 Sep 2022 13:28:49 -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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=XymBBPm6; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2124A68BC13; Sun, 18 Sep 2022 23:28:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2081.outbound.protection.outlook.com [40.92.91.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8827468BBE7 for ; Sun, 18 Sep 2022 23:28:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MTkL19Tb4HaEsZ5SxlBr4zFT3aaXD+d6idr2/mYDtXpnmgJRe2LVPSE3K2/GjlaMrhK8fngaLzzcPFVGpO2oKoi1ZzZ4Azpb8PnGk6U5bgZiY4330RJDe2sdzuzXLCP9DBxAg1IvDLMDGiMIlumqkpvjBvGhPhzk7KNyM2FmtA8aPB9uequx/tu3VK26tkU4siO9RYFGMpLqt62YudjQPnuUxUbFVIADbgLhPe/5prRKdQa0jP25zRuICUcWgM6lyz+UeGG1ub3EJlKpcIXraVTYM/H4AZaxeUik/tADC9VhUkvIt0SLKyEHs3GrbyeBRXx5R1UQvlCJRXcXZdSeLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=WOhoRJqQ4bwB7/EF3r/61v5Z/ckp2Mfd/QiKCaJIzFw=; b=aYKuMjpm+wVIh8cf5hy2+SgTUu/WqkvKGU9/GDgZ3e0gvLLyHcruJHYi5csL5g64UYY7uiDcgNU1jOnouybGpeoPUPTbETc3x9IuRtMWHQoKdFvYYWMr3RYg+ZanNuYtMl68+PV1+bfzdxLaexU1OiZ3lq5G/V3o1I4RGxXtljAyFLuqoS3DcFnWFV3Ykl7SZjyYo3Hlh8Jj6s6G/gvW/aU9iCe9daEEJKhqgaM//KBuWF1TsfqJe1ga91lWD4L+xb4FkjswaasXME1lm4gPRrxh1KxCy4m96qYt+kFKeTQayNnIlKml6hKPyKZ1pWofpXf4JZ7h73xj6RJNprTRxg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WOhoRJqQ4bwB7/EF3r/61v5Z/ckp2Mfd/QiKCaJIzFw=; b=XymBBPm6p9f0zUtxuyvEYWWGAKiENovwG3vcczQNQ/v65P6Txiaq7JiOay8uBpUYPFqkteDBHUfN+unp5phTK0Tf9tGrhR75Ixque5NfSOuF3zfMRAnlSSuLn51Xj8ep1bmOO7siIfSKy0OJWhYxJ+p25nrblKYIwg6U225cUeLBHWzz2/nU52WrZ6j0hmO4coiQZgoy3dF1xXq5ZFvy8MfNe6sNwSJVRtfUMmsT2LdqAUxkxiOFdJAaSQ9DWXlnrEvSCG8d8OLQhv1bhilUKxkzg3Fsf2xNIXHRyzkWmYaaUX64pdRN3WYfpHpKOFPAPL5Urtn0fHLbUUKYyw4yng== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU0P250MB0484.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:34c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.19; Sun, 18 Sep 2022 20:28:12 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785%7]) with mapi id 15.20.5632.019; Sun, 18 Sep 2022 20:28:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Sep 2022 22:27:47 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [laj04nEXHxufQD6z0Ryu5lOYFWw+Y0LAXox3Eyz4dnM=] X-ClientProxiedBy: ZR0P278CA0109.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220918202757.2345415-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU0P250MB0484:EE_ X-MS-Office365-Filtering-Correlation-Id: d39fc9b1-604f-4b20-16a5-08da99b44f0b X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmo7HDJh1DrTtIyfVHMwSN51Hv4pIqAxB5EfRGPEU+x3swCBC7LexFnG2WvC8gwYqqySgH+RCPhXkVmgGm7v4eCNlF6J1ENA0L5dSEAn1DKQgliXJjAcED8/5m4/newX+E7/jAWGFGWUMLr8TnnTu2F9KZH0O8MGuX0vUiFjpnsQu2XFgp78RI9atiGxXPJVkUCgqVBMi9KmPtEv7AwxOG7Z0YRb8aEc6CFeUWJHulV1u5Yd3ux/YfQ+dKfiBhXngvg57PwxUcwGYrhCzP0fMAfSEaagZHGrV801PClrn3a3tCTB032qqK84+uE81JcRkxv9m21by2DjBryE0deSolQrrUpNLHLedGnbr+XG4GUu0EYXLoafjAJMnAgiWxxvggklt4Exg1vp5ryPPBcXxWqZhVrygzdJDOSeMdv9spH9uUkSl0cg8dGqhXMAyOnk+OzuqJU8XIKV1/l/SmS/ICukPpGhjDmRmK9YcVteL9mCNaWRwI5BlhE1kv/CnWRrR5l3kpS0RPI+ZlSrOot4IXk6+qEGdQY/P5/VblErbS2TAkipG53XB5hkb1R5P5wQsKUKSjoW5zbQ1yVpb/4QVtxpEBE/qnQfbtHaZR3Zqf93IADhI74lcHVKazwejHedhWUgX0x0ZZ0Jl+l30bmJr5qmMet/DRAUjDKknxeb7syKoGqgvVQg+LY7lde9ueHrqmPQNZoc9EQClZEsCUytoqq6hDXIieGVk8Y4wWcjmsI2XQuzQDy/61W710+CgtyjHEY= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hsm7Hg4gx+qx41teTBvukyeqVLzq/9jTpk/mUqX2NGqEZZUiFaVb4tAh3yiP2/p9ox/uSJNWqPZFTjqHpH1Rz1sJ3jf8etcKffi1nnFOSJUODNUP8782ScQZnQ4BRZJLM5BDng3meuZ1z7BHgveX9DGdpSKGeBksn/pL19/Rjxjxn1vmZ+MijeWPCr70ANPbF4vEscsQzaiCKVYJjjg9yDR4RXG84uCwFuD8cNKx59mjiFQ/zwu3RUqzeFGa0E1l5AaBjJ+meB2n801rFJLvoTpJ0hsXPrYVSwHp3vaT9noA34jAYBm1Jsa9+HbE7TK6yja7djvPw5hJAwbjCjOaM5qi1BiY2d6CeojA4f+zO73/Mu6guDhD/SWNZbUBHzoorePLlGvKHVfInWIL1/VvT6u14z0SDemE4u/EAFuWWiTSbx2O56qubi8i8NvPFP5cK92fMr9rW98JvXUoYzXITp3w70T1a9YlmahhvcxIqkxoD6zIdk289kYbw3MxkXPurC8oHARuAVzm2kxMBWI9EirZuAo4wx4dV1OCIc8f7IpCmzQNZSIvopaX9wDGcgjyW4EhYDtpTBydr5hiDOxZI701Jw7c2hWsT1WtV4nQdSf0zdpY7KAW2wiZJ0bia/CisD9KIsEW0Hyqy6LC4OjDpA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: h5pwBJFXOWqP8q2M8Cn35Y/pxd2d2CBTDj5w0DzZ+L7dSDCuXV6pwr97xFQSy7KSOB6ZTPTnrbjG4A0/kh+dl1TnPkeNGhnitE3q1N4/duFaogh+WWpaW7a7nXHBlz0k78OmLXylLfTONK2yjmPmTvAOyt0kitoVo+x1czyJX9j7CiGaZ+tIfXBTM8wwl7BTlhqM2MswshvKnXjvOWdixZDsLXwlx07LutFfHwO3LpPKtDyFnlV8hrEi5/7tsKZuOelFhSHP3w2NtC6IagCgpBh1Cn8gZ63SagIxqFhSOmWvxCaDCPspR7mCGAo0PFeWel9t6e8n1+r+cirSmmRJcER6LNX24bDYAfc6r1hrAhIhUtQgDqYCPDHE5PCkp9gXRb0iBruusv3G1DGz6StSgFANz1XfvjleYYF9tvGl2/6NAJ9dG5hMla1QfbrBwo1I4xq3Z11MZou5Dldewm1kgBPz2qTHVtVaYesakt5O1hDUGczLpT1Vyu8UokhhvJL2CG24FZAjGS2hq/VBDi0schuX7SXVEMUJTRHY2fBkY/l/IhY7WOQ9VpRvB4828y+2Dx34qwd6bvY+oUNBRppRXTWXgAQlPnfawLl+CZJwRrLmsCp8eF26cyYC3vm5h/WyOCnnrgjhtuDHnb/ASLYc0I83k9Ko312+ZPWjHrvHChmxaKWpyFyWSHbBe6k1QociUCPTioVjk5TNTPDEDbukmXkiTIMKBxVple1+XbJVrMUpO71EIwmho/VfGFrCh2iXE0CXG+iY37i9XoFf1GsQsn4d/jmlnbiKAAm+sluTNGSERALsedy+OjiWjfxOzG0OxX+WknOdPZDQ+I8ICFX+7oc4C71Eo1r3fD+78l60drQUJexgRvOJ5zLjBP3j0FbcR9BZ3x+Jl2KUkgiN38rFi10FnUkp+N/QcxOIXaznXC0zyxlHmGko5ojDy7r2mY1Olp2ocoOhS0I7/XTgSyPG5yX/sDlfpI9mb0ElnUICQ0MNZhebGqGDk2IjtjuInTzrRQYrsoMqBt8OYaFU8unSk2M+zQbgfVRREqt3CYGD1sJVWBP/haQUmXn3WgwGVla6cgz6Rxp2suvQPPVVLOlHnAIERZTRdbJpXSYTZ/n8alOLBq6E/WXAfwaAH/GxkdIcAJWB+DUF+3l4XqtcIpptGtZsJxOG1c2kW0tMnquszX53K3JyK+ie5TMQ6MPZob06CICrIocdOCg1RZOnSaQE/ni4hm4Pl7Jm4cB7HDuKvv0xQSmtA+4UdsaJ8FFxFGnva/98oD/WCO1zO+ohI6XIwcJOAWwuRj4g6IXMbetrzXQ= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d39fc9b1-604f-4b20-16a5-08da99b44f0b X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2022 20:28:12.7823 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0P250MB0484 Subject: [FFmpeg-devel] [PATCH 07/17] avcodec/pcm-blurayenc: Don't presume every channel layout to be native 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: PTB1JuPZ94vf The pcm_bluray encoder has AVCodec.ch_layouts set, so that ff_encode_preinit() checks that the channel layout in use is equivalent to one of the layouts from AVCodec.ch_layouts. Yet equivalent is not the same as identical; in particular, custom layouts equivalent to native layouts are possible (and necessary if one wants to use the name/opaque fields with an ordinary channel layout), so one must not simply use AVChannelLayout.u.mask. Use av_channel_layout_subset() instead. Signed-off-by: Andreas Rheinhardt --- libavcodec/pcm-blurayenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/pcm-blurayenc.c b/libavcodec/pcm-blurayenc.c index 1f1a3a27d8..03ed88b8ae 100644 --- a/libavcodec/pcm-blurayenc.c +++ b/libavcodec/pcm-blurayenc.c @@ -63,7 +63,7 @@ static av_cold int pcm_bluray_encode_init(AVCodecContext *avctx) return AVERROR_BUG; } - switch (avctx->ch_layout.u.mask) { + switch (av_channel_layout_subset(&avctx->ch_layout, ~(uint64_t)0)) { case AV_CH_LAYOUT_MONO: ch_layout = 1; break;