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 4081E463C0 for ; Thu, 14 Sep 2023 10:32:49 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 06AB668C76A; Thu, 14 Sep 2023 13:32:47 +0300 (EEST) Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2069.outbound.protection.outlook.com [40.92.50.69]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 86F9068C750 for ; Thu, 14 Sep 2023 13:32:40 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LbdzVUeZtuzGAuuuIhW5J9Yao7MgwraiGrhChGMFB1nNd4l9g1N7/4zoWE5/8m7JGt3BNC0DmYmZzmbryY7JrTPtDNArEDtUfpd6OvoxzclHcnbDa6n5rrR6b2K2MFOVPQc4rEoK2grqw1+2a6LcFk5klsstf5iU9WIyhirp2vrdgNz21q8CxJ8kf6se4XfuW+yt4Xy8biZdfcw3htEqwXGirxTq6CkG6Yt4BxPIxG+jCfxxo+2IuYUsY3KQPvSpFIrLoYFGuOsvAngfnPk51AcSf+wiIE/2ORyU9LgSYjulrBb8bRbMPvLyv75dHzscdLRkTzrhCcxslQLGVYp30w== 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=povz5VaEwmXgvAMYe1rDO0Q/KJ2P3AWYjo65Ds6P0fI=; b=RJZQ7f4BWFc+d7Zro6HgYTOsTzxkmMMe5xZIui7eciU30+zg+nH6HLIUruqMwrrE0XiOo3SI3LsdU328T+kiuv395LI9Qtfln1e4xBFtsk88qaypwvlJeYs345DC5N3FrVUiFo6ZNm7w+GIa2eiygCpuAphWRVu4noulnz2wg/eFKPvEPptxiKrivzBAvAKxrJGVJxCzjsLIEKJVYwTfN1mpzY+T++d+z4uoutznSmU7/sj1Ak8aDAm0laK5EyzfdX2ydEJK/KBOme10gx5G5+tzjabyEseGg4xFw01vA8tbZ1rP0YdPLH79PyUgpy0oH9/VoNbj+OtPtwKrncEHDQ== 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=povz5VaEwmXgvAMYe1rDO0Q/KJ2P3AWYjo65Ds6P0fI=; b=hyFyMJonGVOBXpy99lsl0Ww0PhxKUOVXKW1T4ULox8m3PfpkbrciFMa7pktT1GTatzJufexy9cFNplWY7SvXRsT8tOk5BgufEidxY4HW0za2obwd0wUa1M9hJtXD70ZGXewXs9zlAiy7AP+oOK4vGqO1ssetXpzdLuG9axJHD666QyRYORlETDYC0rFWHXWPky8lXKiz3vPJODzEWT+pxQXRQXZbMzpPd8L84qMd0O0Qyb/7plwh/tpxKTA5zzQnY2PGLAlEEdOR9M9n492sRcZH5JV0zReR5fcg1q3+rgyMNhraY9XMeBGzXSmxXEfR4CSACnBA+DEkcsvGsNgTEg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0193.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:178::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.19; Thu, 14 Sep 2023 10:32:38 +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; Thu, 14 Sep 2023 10:32:38 +0000 Message-ID: Date: Thu, 14 Sep 2023 12:33:56 +0200 To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: X-TMN: [xzph+e1pCCKBatMP40VWV28WCs/pElUQ] X-ClientProxiedBy: FR0P281CA0245.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:af::6) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <6bd4ddd6-96ce-762e-8a72-45640ac0d5f2@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0193:EE_ X-MS-Office365-Filtering-Correlation-Id: b9e6ca65-77f2-4a01-e348-08dbb50deaee X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: x3ZKgjo4SXsC6CBNpvyuGCPF1RI68k2zjug2Cui3iXg4LRMAcJaPHtfgMfG3Qc7kqk27POZWKHJizfH++zQyULX3Zn6Sma8j79keKB686CciseuyPZybxfH72/9WkY8xOr/K/ySYDeC+8gbswPIITahLAx/SGZYGrRUBbUYqLjzAdPTVj3/YVz0ISFS9VmALOcKcg96lqFqtcj7FCxJxcYx8we/zqkIBuOsGMktV99v3C8ROoI/B16fidFhcSFsBt0wgkXnxLjO29gGX6u1JQfPzSoAPDOdK5srTLoW51fqryiVKEpBmdbkTOwe7nzCkdjtvADbvfx/sdoL9uUpv6SDh88UP3vwON8of6/onU0lax/nYN5Ppbp3dfdH3917p3eUBBBBdbeMUhIEau4JnOVYBRmSm6sVw6z3n5fG4htrq+byuthb2BABQRlemIsWbs+/onF+Jo3hnYnElaPAgRImJPC6l2j2Pixd+hg2iJO7Ii6XHk9CvARv8vbLf07QGAPahFczMWSW0fKNfxpvV6FVAAjOqkR43A1GGKLc+PmfeaH+yzNIljnXiuUR14ILE X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MTZOZVQ4VUxobitPc2ZKaHhKTExPWU1IVSt5ZUdodFNXMm0xd0E0Nkxpc1Fp?= =?utf-8?B?eHFkamFqcW1RV3VrMmFmdGppV00wWUlCdzhFRFAxV2N2c0t0VHBYdUFMWk1v?= =?utf-8?B?cTUraFJkRkJEbjB0K01jelBLTXltQnNXdFdMcWhEcHE1Vjllc0U2eUtDVTZ6?= =?utf-8?B?T1B2dHVFVWJRdE82bnMwYjhGQXAvcEZwYk9tV1J0NEp5SWtTVGJZZUM5a2Jt?= =?utf-8?B?b3hPWU9xN0pKaTBBamhmbkdiYXhwL2pjdHVGalFNTlNUOWN0aU8vQmMyaFBr?= =?utf-8?B?UE85d3hqcU0yMTVYcXc5RDdLZXJ0UjlNY2dCTU5ucFUxa0JGZkdXQTJnakY3?= =?utf-8?B?elJaL29LeURCQ3FmYll0amdzODN3VTQ0YzhDR3JHVWpZSGE4TE8xeGEySFRw?= =?utf-8?B?MWFwY1FJaTZWb2VSNFJYbkhUdUg3aC9ldmxIZXVwMXpMb2piMDk4Q2NUWFVp?= =?utf-8?B?MWdyU25aMGk1Nkp1VnFMOWliaWZzcll2YW9hMTdJbk5xUVMwT25xTXl4Zy9K?= =?utf-8?B?ZkVFU0g5ZFdpUmRXUzdTbDVPcm1WWit3YnVYT1UxaW53R3hFdEF6aHVvSjVP?= =?utf-8?B?Q0tnSlRBMC9iWEh5K3dxZ1B5WTFBd1d6R2NNMThUUENlNXJRNVQvd2IwWkdh?= =?utf-8?B?ekt6d1MyYklET2NYVDdzTlJkZU5YZEFjbXd1Rk9WSlpkUzh1Y21PSmZNbnor?= =?utf-8?B?UEV2cWlFYkpmdjdCcVFKbW1qQlo0clh4QStTbG5zTVVzdDhaZGFZR3pPNGJP?= =?utf-8?B?QVBNVUFFVUlUZ1g2c3VZS1hubmRLWG5WenhiV2NnUzhtQlo0ZHhtTUhVL3dz?= =?utf-8?B?d28rRzIyQUtzRnQxb1REUHlxTWZtVXVrRjlkemw0ZTBzNS9aK3RxRmtYNDc2?= =?utf-8?B?bUlmY0lwTklRR2RtUk5VVm94NkU5MHJhd1BWZVVSbEl1Q1ppdkduOFBBNmta?= =?utf-8?B?RVVwV3JNSFBUWXQvR3BHVGFjRU9EYWpDcCtLWE15TElVMjE3d1hyYjVWdTlt?= =?utf-8?B?ejJGWGpRd2pXRHVSSzc5cXVxc05pVGZHWVA3NTFWU0ltWHpOZEZjT2Y2TVNN?= =?utf-8?B?cVdiQ0ZZU1hKYW9uVThvMVJVZkRuTEtjdmY4bzFINUwvcm1uYVUxQThiczlE?= =?utf-8?B?MW5EZE1mNGZNbk45VFYvZjdpVWNjL3lpVHJZOVpudGtBTXAyOTJBV1JGSHdY?= =?utf-8?B?RHFFUWhaMVVlMVMwTHdSUG1MaE9jMHpvUjlhaVRkQWRmNFA2a09HNGdyeVNU?= =?utf-8?B?UVlwblpSL2hSK3BQSzExSjdYenRHSFV3UVBKUU12ZnpKMDNseHNuaXd6UHl2?= =?utf-8?B?QnBtWHduUVduV0RhZFQzS2hONkJtMGlGTTJoNU13Tk9qSXVvclEyQ1k1dk5M?= =?utf-8?B?UHZIdWNWVnYzUEpxWFBlSEJOQXpWZXo5dVVTK1VZZlhaS2RHcFlVakF0dUdW?= =?utf-8?B?b3oxWGZKdXllbXcvY09JY1RKTjIweS9NVERuTjBEMHdWYWhyalZXcFpzTDZP?= =?utf-8?B?WU9qcGI3ZHptaEZpQVVvaDR3ZmdQeG1sR3JvcGdzTll4NzNKQkpvdkJOV0th?= =?utf-8?B?VXNheXFGUjVXajdyVWRRNW8zZWEwN2lKRXg3djhHanRJREM3KzFKdm4wS1Q1?= =?utf-8?B?LzdUaW0zeUo2b2FWWmtHUWNnNWlpQVB1VGlYNHVTL0N6QnZ1ekc2UDBvOG50?= =?utf-8?Q?vUt4JzHBN1FgL9xOl1SR?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b9e6ca65-77f2-4a01-e348-08dbb50deaee X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2023 10:32:38.6039 (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: PR3P250MB0193 Subject: Re: [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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Andreas Rheinhardt: > 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]; Will apply this patch tomorrow unless there are objections. - Andreas _______________________________________________ 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".