From patchwork Fri Dec 24 03:23:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32896 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7811997iog; Thu, 23 Dec 2021 19:24:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJylbVV6gtQ36D9uSOV0pa11BoHCzc4YGW5dS31mdhp0oK1wiUafentMqllxkw9lTEulplBW X-Received: by 2002:a05:6402:280c:: with SMTP id h12mr4438198ede.120.1640316295218; Thu, 23 Dec 2021 19:24:55 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dn18si2898304ejc.364.2021.12.23.19.24.54; Thu, 23 Dec 2021 19:24:55 -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=@outlook.com header.s=selector1 header.b=FE6OaxAD; 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 75BF168B275; Fri, 24 Dec 2021 05:24:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064023.outbound.protection.outlook.com [40.92.64.23]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C3C0768B266 for ; Fri, 24 Dec 2021 05:24:31 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M8phvGwUjaB1WBtcT2816oGi2eyWQqk33UAIX7ktQz8lhv3nKPBeptD9RyG4TS/roCV9/Cch4Merj5lckKgK2uPwwJ4tKE9tCpQmmN65ZdhKf44dXghMPe3+vVfs6mEuFNQJAz0arHjkv597Ey7sRCsiaFzd9gX/lqUoWwl8du9D32VnjN9SizfTY6eyHn/KwFopKW9NTcFoRo658Yo+GN08ZaM3pYiJNGRkQEwbeSfc2c+cuYjzp6pw2bfEkvBwqlpGbry4C9L7bmF4EtpbCJCq7R9HDNdn5OvQKKIDjC5ZUd525U/ytelUhHaaRGhM+CipPTTR9BFkLybnzYBIOQ== 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=CWACitaE5qPPGygoaAAKD3hJfX7V0BzNjzaMZHrDC/g=; b=SJuu/Wrr78DoAn7c0KauCoW9qGa0BRVRasRs2xBiWf5PntutyWvGQ+Zvmzj7L7lZUfEjxGtGBCmOQ/UTdjrHWFP13pvRwi8otRhrjIzyO3t9zOEDu6A9bzmHrG3GmmRqvNEpK4vfX0KTKWXD3rbcE/xWCESzLrEGZ+RBckzsk5RGu/yY/vDNgTTkPKVSmLHLKeAeUW5q2wvje2qXaV9s3bIRMgnSENuaLg4Vhsz84bHn2x15jR//aI6JgY2zfXF9rEceSOdWHG2+j18fmD2b4OUtSiKm/dYJztdChBUL86j+KNKyM1xGiY7cY1dJS27Omta6fs9nwLewIqF1pgzO5g== 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=CWACitaE5qPPGygoaAAKD3hJfX7V0BzNjzaMZHrDC/g=; b=FE6OaxAD/KjxfhL+dodvpDgRvr9y8V8pdA5D1e99uohWhBYeCQSFDmt8p8LREC07L1P7Iv2KkgJ5t5tZjlvIcvLctBzU6PSDvoxrm5J237i7iaDj9eeN41Y1fdRftPRpBY7pdP266n/xkIPRqIYxlsR1fMZpH94OOrPrAi8JZMhb7wWhrIwIb0Wzrj2SqePabxCMJV4/+hfB21CGNxZiCRa9RjoPLE8BAxZTzTrnXgFFWDxxAEOeKTrbK4BD+Ec1MzxvC4+rD4h3PfDzuYJNgjh45ehtu45aGuN6q9tQu1tcEy0ugaI9+PTiylZ01+oO8Q9ulM6yvKJPg38gmYb50w== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5249.eurprd03.prod.outlook.com (2603:10a6:20b:c9::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4823.18; Fri, 24 Dec 2021 03:24:30 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%5]) with mapi id 15.20.4823.019; Fri, 24 Dec 2021 03:24:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Dec 2021 04:23:32 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [JJR8Iy+175Bo/JjdqLJLG3eo58RrfJXu] X-ClientProxiedBy: AS9PR0301CA0032.eurprd03.prod.outlook.com (2603:10a6:20b:469::30) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211224032332.2104747-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0470b4a5-88fb-42ff-7714-08d9c68ce5c9 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1JWcnJQnOnRCyJLEhpml9UN7xXF5xqxMikK1tkCXAbnaG4DqD5bk496bmN8TzdUsGV1w0mRSzPxOwAbnY7o89wlMaXRcGt4OJGWRzXB0/lI/iyhT5183RXeffkrZHejg51UYbGZrrEHXFD0EotgFX3J7CygeN5o4hyv+RmZrCMOczs0NyDNeI9DclH/O3xGl8ib1nb166YLnGSm8oPkxXdoQu4oVQTqwuLRICSPBn97v5e2ZdUq+E7vrvDeiJoAOeuPiX39kRyRWBfJajGfV/xJ1j3uUEb9+al97KAuh5AgcvqFEsCOsNpf6SH9kudwr9WRfC+E215t1uYrf5Xf3X3+tKuDVumA03mGHXn7RPQ/S+TR6e2+0uo7v5qtE+WzM7mPyfQJM9mz6eJoP1WdOautMZq/34VNxfA6NXs/y5Ch9N+QyzGkG7X1zwLbTFyxPzms/V9pgggS3IaG/d6X3TcaHaL5ytVKKViN88Xc3XY5iJyPRHVnRbfLrr0E53yyXW0mxGnhEC7+KYKZxW8TKDPTa7fCHy0xLbwJAZ9SV/1xx/FEyV4Nj1f8lB14S4sOcrSWZeiEdAy1nA2DDqA/7+myrSCopgLBbGu6pl8Nr0Z1wNJHDORmAov7XcIRd4GFkik2olVl2O1kfpFN+SI+6ZTHcjJtOw8P3FEuQAvFC9gaNccOIQiDeQx+JtqJAxqXhTnjyCmgyQk3URYg8zBJrNWHDGBCzTj0+x9t+UcG/ezriY= X-MS-TrafficTypeDiagnostic: AM6PR03MB5249:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TgTmrcGW9vbDfxWZivZYk2wpiUhMm9uVsmjzZ5zFUFnJ1Vf/thmNzMEcoaV2xK44hlcRuFScKvbQNcSFNfWQB87P9dmDLn5ljkOC6jW0gIGXwJPDZsuqNCs0AXkkEvLx3chZLcRVmmNntibwuylfcuxPdXyHC1hRd7cHnWg4A/ONayV2GFJ+n4muMsRvIFD/Of/KB9YKK+QItb86a+7WX7LvEomOzhIAZHwKo/qx6ZM4l7x3vrZ75eYiv5fQfQMHXSvtxe2U+FQStDyLA5GDgiPH5MiDV6AqIBYZjyWOe596/y/V/0xWpHREst4L7WRcpuRTSAfTWJFObcwWlcgouX2EXLn1Ol05uj/Z1RTZEs3BxiEkQCsjG2eb8Ia09KPiLRzUYEQQpuCcXNmEbMqFAdjGTHwfsm/vGmIqCp7yNm7vVbIOVOdkow9mnLjHm5pKeCIRhNsgPEoBcI4yIGZJuFlj/sGUrevvX4V2/Q7L773B93FRD4MlNva7w2RU/NLb1erJQJPB6kwCK843NshQ/s4fuVt62QZMZE2TKPRBy/e/sXXXVbg0IExNPQAYMxlXmby/JHrLSKPUlHqBK8JCcg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: a7QtcLyLe0DPTUirnO8JTVC7ZauuU36b7KaXewkVCZ2PahSt3JK3+PBNrH4l9ZyJj8x2tID+kFm3Bz6QJa04S499KKBhpnN7Tpp9cTxKW6pkOKJuP79z9iLwqX1BYfzBicuYgBItFl1LqeYjyp7iz4PMFm/vly8KYHONaxbGTKc8totlebNig8Z8SoYuSF0l1HSooibwFWBjKJMfoz4/ECA4aNKdkrRvaz9RD5GaTWQdrYn6ZvXG50hTA3u5/XNN1RxGU6J2ss2QouybL2Sts261PEQrDFOnKAG2cTcwxxMaG35mYlSM7Q1m1g2YwHGEQiSaissUbTd2unhmjey32zrRJB9omPX9VViQOxoae47ywGm8O8iZtCYR7IzZa47bLj78q1ZbODTKC4V6SFeKSCDmTKvSNYhA82wA08oH7tmQBhBZulpCQpov4MNlyQ0lv1t9HWAN0lgNYuHqvA2/F4lkgNfBoIjagMYDHlkiY67zAkDwlnSngg0JO/34O/H0QpaQgFNdv/o6ScYBfJVyoApaO64WTgF1QDtYRNdkJUTN7AgQb2R0RJGkYI64c4EX1bEdp283rzRluvbhAWNrk/W69Pp4GDVH8mSdQVyvhh0jipz/iNW9TOuBGyElH3H18vbXea/akV/y4lw1XO28hOuopNvr2bG100+zIBB8z4SomiLz2SPwrcF8oAYraGMQAMFDjewHOdSqGNdnH5C16yXEOPdXu1BJHnjI6wWuT7C4XoR+0IZR6SVrELHHCYbh6A3UUl4K0mF0tyHCr+h7mEgbh6OdpXQ7UEFBshxytyxWCJU3VrkN1A3HkPsYUu82AAFZY1CI6prhXOyMfPdJ79hCOlMa8vGAlqrPvKWunWneb1HxYYKMoGmHtWLRzWG4atuBaVWb9fPKbXr9E5zE8FPgmPIwrE2AFPZu7Ti0GmM9OO1RWIaaXQ33xZdYZv7EXfk1896+swcjUlQJznBAuA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0470b4a5-88fb-42ff-7714-08d9c68ce5c9 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Dec 2021 03:24:30.4104 (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: AM6PR03MB5249 Subject: [FFmpeg-devel] [PATCH 36/36] avcodec/mpegvideo_enc: Remove dead code at compile time 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: DiFDNIwk6PLT There are no encoders for interlaced dct that support 4:4:4. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 0ac8886246..15b6669e46 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -2035,6 +2035,10 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s, int chroma_y_shift, int chroma_format) { +/* Interlaced DCT is only possible with MPEG-2 and MPEG-4 + * and neither of these encoders currently supports 444. */ +#define INTERLACED_DCT(s) ((chroma_format == CHROMA_420 || chroma_format == CHROMA_422) && \ + (s)->avctx->flags & AV_CODEC_FLAG_INTERLACED_DCT) int16_t weight[12][64]; int16_t orig[12][64]; const int mb_x = s->mb_x; @@ -2112,7 +2116,7 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s, } if (s->mb_intra) { - if (s->avctx->flags & AV_CODEC_FLAG_INTERLACED_DCT) { + if (INTERLACED_DCT(s)) { int progressive_score, interlaced_score; s->interlaced_dct = 0; @@ -2191,7 +2195,7 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s, op_pix, op_qpix); } - if (s->avctx->flags & AV_CODEC_FLAG_INTERLACED_DCT) { + if (INTERLACED_DCT(s)) { int progressive_score, interlaced_score; s->interlaced_dct = 0;