From patchwork Mon Sep 11 22:28:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43705 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e27:b0:149:dfde:5c0a with SMTP id gk39csp2425092pzb; Mon, 11 Sep 2023 15:27:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFg3FXd8M5dxKp4/ixmuAJIXGFme+Ksc2aNux1REXHTXVsyLL3/ejjMA+KIxBnQFD69neQw X-Received: by 2002:a19:500f:0:b0:4ff:a02e:a53f with SMTP id e15-20020a19500f000000b004ffa02ea53fmr8138277lfb.52.1694471235087; Mon, 11 Sep 2023 15:27:15 -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 d5-20020aa7c1c5000000b0052eb384d37dsi7488106edp.99.2023.09.11.15.27.12; Mon, 11 Sep 2023 15:27:15 -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=kqGCgtAI; 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 2583268C972; Tue, 12 Sep 2023 01:27:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2051.outbound.protection.outlook.com [40.92.74.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 752DE68C8CF for ; Tue, 12 Sep 2023 01:27:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MrW5ShsIzT/nXQCjCwAuo9suXmfZnN6PazzWHwEGxfxG4Euw3xwz9QHcNBDAfi3ypcIM9Gj+ZyJbTaCI9JCEa+AQQB1OFk2/g1Ee0ELOMSZ45Acp3VVZzchdIljs0DfIqZBdYiFFK+TdNsN2vwYvXt3LwecUHvbVuFtuXfIbcDjwgeyV5ICmvqv0tSheGhaSFyBO0Xw9SaNFqaMZEHnE79ts36V6V3ec5xSObedofZCC1aGwF9YYaVzpCsptqdocixTeoO4VR0vmxKhEofrDSh816i8ySF60kXsSqB5DHT6fQGKd1qUmfJCadO1z6FFG7P6aODvtCCAdtoNLQgIO4A== 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=/Z854h8RMYmiR3zLkYTfpGRGUWYvvWl/FPGx+R6TwhM=; b=gNf5EKW5sKcAuexibyanoxyIGWkNhIfodg435/7yUw/zoN9dhhhGe0dTvSTPV61Y/hjSNNUAfvBxITa1QpJ2UwL+rlxqQnc51w5Ggyyigu1E07eks3BQNm+aFtNaJdunWwelMhLrKONZZCqI6bs8VdvSOs6EFQhNNd1kE6pfjFSGnBBc15erRQDHYxDOlXx5ezq/E6Gya/CgzNceYBb/Lhf3JlcrQJU80marGatQ4X25HoM+LcEB+M96tLRB1y1HQULjY/7HZlNp3ueX1/J5cInesZq1Qk/eKwxqGRfzMg9SSGfGlknnLYKX3U3RRP0Cg/8zVzLF+81Rc16d0TPLvg== 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=/Z854h8RMYmiR3zLkYTfpGRGUWYvvWl/FPGx+R6TwhM=; b=kqGCgtAI7zjdNSJ6rdorq21mV2JB8r8siMwzixi7tUaVAO/KX9fo0yEhqq+hB0ItW724O2SBuJLSU9sgafa6nFNC1KMSNJooKlwfTyNDcC8jMmeJADT6bI0ri/lxsvhE7Ml0al3d47G/9qeX6m6+f8C9MTDhbt4ASc2LfSOao7MWInexgcpu0gxGFOEXZJtSegTZ5o0azPSt9bsB4ThYA5BW0jeVAJU9Jn9bTmpjRZxyIjfC4pC2a5ABo4QERA/F9rNGAaa98Unhg/dbY4paeouN4Oa4iGyshKZ4mJOlPJ29cuiB9RBXNj8ZhsLloLEUVDC7cjJZ7pBPyX3Qwo1e+A== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0301.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27a::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.34; Mon, 11 Sep 2023 22:27:00 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6768.029; Mon, 11 Sep 2023 22:27:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Sep 2023 00:28:12 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [/De3yaQmhnoF0talMAAIEMgyjShMlpec] X-ClientProxiedBy: ZR0P278CA0169.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::16) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230911222812.1548877-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0301:EE_ X-MS-Office365-Filtering-Correlation-Id: 3f61e32f-7309-4fc7-35af-08dbb316378c X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Wi8m/nBAP4xFAuxyTSjgmEoduDNsuKsvaJjZp4HNeub/muzzqUaa5ul+Rm/2RpP725M7SMJThZYt3xfRz5YCefpLpHfbaW+k0KFWIvZZYjilI316Nxv8crMcPNgCQ+ag0+BsJHfj8IsoATB6A8x9krpBE7air/PmGVXlHH68jQ6FQ17FYIh+m8iuffStCkUmJ6OqBnWNHAfudZSCuoArn0ZKV68E9PupKbKqyiXxmejchnsYw/fA1srggfT6ONjuJVu19/Ol0BA5KJ6t306lnM4rX6t7fs0klzQuzg+N4lnjFKrSQnt+0idnonMtz5jWPscJ6gmPXdhzWlbdN9OcDDDnC8Rereex+hzlkaWqgoHqfHm06ibVF/1iq9YbjL9gmZJc6NCNQEdLdgbTkmeUf+YgOaYa/TfeiU7DY3HFCW4p1H2lC/H3JC2wObtZSEQMQTFkobSyvVm4TXnoLxepKXxnkt8wYxzRrAXGIc3FYhtZHRgdCjF+KLkr8qyCeixt330fLi/ursSNwB3t4cQ4ftpygliO9Z+Pr1yH9AvNsMcZSxN5vGvmTyuQW8EkfgGNcc/AAgt11KXe0JUKRTqOyIWTt6JJnIpJuOaF0meBVvHqHBXgZb6Ny0mUw/dY6gQ2 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1Ug/6YMb37Jm3DbRYkYK2e2gnQV10bFrfVUmd4Pdn1mMDrWJBx2AAzjxro2sFLh6GVsSag534lMbHX1S/8z89BuWc0O+pPm2rsyt8iIwzjnEbNWEhpoOaIVwW8PbfnC+0CY/iDXgSkNrG02BnoEBG0TpOAjNo5laWNCpa3s4KG6Aox+n0mZf4nogDpFE/WeRXFbxUn2Uh0wP+Px7MyhrROLU7a5CRlf8WYVQSVTfj9gm/EfIAA15hO4EgqMX8lF4qNXV9zmXv+UfEpXbfU4iveeCBdVmoK/rCoNqxIt2JUgiTzNwF1zfLpNnrXg4bYpSsjl+UNoI0oJNP5jlXPoCtJJ6dpnvhSmhmPBTbuWPQX/r6bSHM8DXiKhpLrXAMPGqBJ8aVfo/AiK/ek0g0IPYs/V8YU7b4Bh33OAP3lGkrnPIpTvdGe8OwnojPJG9FAC2vjRHG1qoSyDYMFnhNo4hsM3zJqRdBUnIiexOqKL7nVwM6pPLvklLAnd1+FcGRayV93QSCoz6a1AB4NJgC9ycjBykHTuEJ2yKRqruzlIv47yBrNO1mU+T1DWTyNiYo2bX4PI7KeYJ1S7DJ1+EHDFZ24wFwmObwFsOyITVlbpyNbVWzCsFMo/tddxaxb/tN6KDBilIPVrR99YImwBvOPz9e6xOGdDEI5stXjKF3vzI0B+RqRkBI769cOtspwlBB9brIhHvCSYDXfqrkfS1rPmYUXgqVslX6IoruxtFf53G/3nKluLH3HpJ70B4w5rQ11csEidN8tb/LdD7ObnWI0Fr1163W9rMtXUE+k5h8MvjLg1KGYEraEFewKzY3Zd4xqwhhchobfjmGcY2tRH9K75a8kyx7btuvklX5q7mEkDOQ3uyJi+rjunypBaj9BzGT6mLTKmmFIMbdOUCniIfSw2UUmeZWW9yl1AhF9+1nOtJU7oSBkKeQuz8FC5YuFifiUzLGmLCu0SO72aV1mdSoVii2sIkIkIpCwXjQo+oo1vI7d791zoItURi5s4GPd6Ks5BNLyw27OM55yVddsNuBfylJzEjOgb1B41+5uzPy1MqXqrsrVIf9G+/Us5FgzoCZ7x1LrhbwSGCh8RF6E08poh/hDWE3g6Pun77KbLl8l+FwxHEfDNNpVOF1KREqccMU+IYbcwrAzySgqg+EkML8icA+dVUkg2hQOvHJTzgyLf4EBaxBYPtTrdef0tSFIZ16JLK0xQormb7yEFwdM265f5rH7nFoNoG5zJjkO3FiqDUXVae6h1LdHAof/PlYkI5+t1b X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3f61e32f-7309-4fc7-35af-08dbb316378c X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 22:27:00.8133 (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: DU2P250MB0301 Subject: [FFmpeg-devel] [PATCH] avcodec/x86/mpegvideoenc_template: Disable dead code 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: sPDBA8xLKLPi Since bfb28b5ce89f3e950214b67ea95b45e3355c2caf the permutation type FF_IDCT_PERM_SIMPLE is ARCH_X86_32-only. So use this knowledge to disable code for it when not on ARCH_X86_32. Signed-off-by: Andreas Rheinhardt --- libavcodec/x86/idctdsp_init.c | 2 ++ libavcodec/x86/mpegvideoenc_template.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/x86/idctdsp_init.c b/libavcodec/x86/idctdsp_init.c index f28a1ad744..2d165b975b 100644 --- a/libavcodec/x86/idctdsp_init.c +++ b/libavcodec/x86/idctdsp_init.c @@ -45,10 +45,12 @@ av_cold int ff_init_scantable_permutation_x86(uint8_t *idct_permutation, int i; switch (perm_type) { +#if ARCH_X86_32 case FF_IDCT_PERM_SIMPLE: for (i = 0; i < 64; i++) idct_permutation[i] = simple_mmx_permutation[i]; return 1; +#endif case FF_IDCT_PERM_SSE2: for (i = 0; i < 64; i++) idct_permutation[i] = (i & 0x38) | idct_sse2_row_perm[i & 7]; diff --git a/libavcodec/x86/mpegvideoenc_template.c b/libavcodec/x86/mpegvideoenc_template.c index b5b0a5ffa2..5f013be7f5 100644 --- a/libavcodec/x86/mpegvideoenc_template.c +++ b/libavcodec/x86/mpegvideoenc_template.c @@ -225,7 +225,8 @@ static int RENAME(dct_quantize)(MpegEncContext *s, if(s->mb_intra) block[0]= level; else block[0]= temp_block[0]; - if (s->idsp.perm_type == FF_IDCT_PERM_SIMPLE) { + av_assert2(ARCH_X86_32 || s->idsp.perm_type != FF_IDCT_PERM_SIMPLE); + if (ARCH_X86_32 && s->idsp.perm_type == FF_IDCT_PERM_SIMPLE) { if(last_non_zero_p1 <= 1) goto end; block[0x08] = temp_block[0x01]; block[0x10] = temp_block[0x08]; block[0x20] = temp_block[0x10];