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 1141C4AB0B for ; Wed, 12 Jun 2024 13:17:42 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E52E668D8BD; Wed, 12 Jun 2024 16:17:39 +0300 (EEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2097.outbound.protection.outlook.com [40.92.74.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E6B7668A62B for ; Wed, 12 Jun 2024 16:17:32 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G+wFAyOkrZSIfI3aeXkJc2Xr808OcfSnOXAvuftlh99J9wRlfH0s485u9qm1Y5hImqLDMpumXFQMtp5domDwj39bCN6qAo6wVIJ9NIQJvsGoxguZB7MvgE2Zc5iYc8FqRS1LtlgG7UUUGtRR93lPX6E8kljiNQbuO+mSFk2DU5X/rnJDD4IEQMUVs1mnfqeXsj5ucKeM4c+vxd9HSy3Q6B0TNarjyUuwLnfsxlTNEn+seSi544R+8jshgJaroWqxU98cYD8z6U8E1OZ5L7pQkZmz3xnAd+rl4JUDzgAncJ14/GhIwCL794Mu2aZNBoQajtrC4cOHr0rUe0lVzB7wKA== 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=uu2MPJLDaW82bFBUeKkxrG9FnVifRlvndDFqWtNLf8U=; b=kj6Gq4VsUGVRMbf3m5wnHQUO6l97yXUQQGhw70x7UQ1Q03VmFu95EUDYZxxeodI2cLgn1lBtwyhEOGtkhxuJ2gn7sUPoIhhhXp+P0VD7MQiwyYvuslUuSq/+hxfChhaX2byboh4YHejJJxZ9bDZLsaZKdT6jl/3QGV9ss2DfwG2rAkliyuwMP5iYStJFAMH3mvRcDeAMuRAvXJsK3yFgdzy1JeToYssmJLnRc28ruVTbczcUZ29qoj4l4l0G/IqU7uH2wwx1fIBZP7KoaHUb35zy2yoXqUXttpiv5iZNgY41Kbz+lyB6cr4YBGMaX9z4ogKY0Ic9BDjLRnUEJFB1sQ== 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=uu2MPJLDaW82bFBUeKkxrG9FnVifRlvndDFqWtNLf8U=; b=lbtFYw5y8+Bz66LJB99S60E/8rawwHwLAY0DsR0vdXg/IYvHCFoZpYfdEjUtjXpzfvDDDYVgsTROtm9c3DX1a8UCc8WRwwdvewee/Jy2R1dCnukFI3lvQqOKDBT1gM7MvtI/9sOrpLduZjyUzdOzfneMCLlIGOlXVw/mbsFo239ZbG4R8ScNNZOdPUYGMjU4f9LDNPClBeN8K3KntzhteSKKClrd1M+VWwSMiNiQiAo+zpwTqoFIZDOgWJlskt5gJG4T5tqf3TnrPRu2ifWVfgW8e7rqXemVa/+hpvlMsyT1/i/FG/Eyxa1Db4vU3u6htrDXJJXM7Y8PUAjOS93+Sw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0103.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:372::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.39; Wed, 12 Jun 2024 13:17:28 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%3]) with mapi id 15.20.7633.036; Wed, 12 Jun 2024 13:17:28 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jun 2024 15:16:20 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [NrgUno+kQ7cvM7I/BiMR7bZswNKN1QHh] X-ClientProxiedBy: ZR0P278CA0172.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240612131716.2102282-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0103:EE_ X-MS-Office365-Filtering-Correlation-Id: ca1ae75a-6ace-4cd2-a24a-08dc8ae20205 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199020|440099020|3412199017|1710799020; X-Microsoft-Antispam-Message-Info: j1rqIMgdpO9nsDaMrHHAq07aUQfNMsk2RedxSblrY74Ha66IDKpcjUmzDRUVmAcNuaPIb4XOR5gWzQd12B2pk7DRstK8ljgaI9MifBg+oC9Xd5RR6UdHk98ft6Ci/25LzkBjqvW4JxwHhesohz+Okx8zOjVINeivkYmz8A7oCFLFu+eWwPHLTLzKXFqSVvBQpk19ScHEMkCHHwzcSCPcfSOEo20p5fNO2wpw2rlf8hXm4i7ZvEnfy9fsJaxBLdXBizP0d4uMYcVPDAp63cFuSM2qHBvsVeCHpcGibOwpuqIBHah6zSJJ9fIKGkXC/cbcaCW+pAQy143JpDDUL3SiskuWUyH63wtFQOaPii1d74J8fajcHkGXINZbuorN8I681s5+8RkA6C74Rr6b00fuOe4gV8FQtOlNDIlbG8e6HHp5V9PAAc7uODckxpT2v+0qDoycbwsWw9EGR6h9SaYw+0/tcYcYb06gveF20g9UWlIm3nhHHMNQDmcFWQ2opTooasTIdnhPKndOAuJ5sHS+Q1JR12VEyYQYm/mpQnx1JSxJ2AmxvRiE/y/20xlHDMO6MUeGX7qTkI4gppC6a6NDikKM4dn/WOcqWWFqI/Bh8Ti4humQyhZnoCkhboP/Vq+7 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?4kra+YICIoNXiNoy3KZqLzVClP6vFfy2/h2KDvCuaVf7L+KleQnE79tB+HfK?= =?us-ascii?Q?9atfFiwIXWMx9EUleNtmWWjqQRkMWUlTrkggunTOikSm1VLgmi6fajsjuaGV?= =?us-ascii?Q?N3Bll/Eqpjy/6qSYpZZD8pqUqx702e8/d4XMn7YGfTmMMGXgiarfzl1RsfBo?= =?us-ascii?Q?+D4wLkyFL37dyvbQYM0kvZM3p3awTITCDq9LQ3os28FzVirgkzFNUH8pp551?= =?us-ascii?Q?CLNEZF1mburQq8nN4dIMWx0Ol6yJ9/LE2J76UkSgWha1Hzeao2mPdeyVNtcR?= =?us-ascii?Q?wm4mub3N80QgJf72h5Mr5UvtLU1kTBkGYwc9BxPx93oeizukM2iXj3oPbaYa?= =?us-ascii?Q?mFLLN8LCeZEWePyWPD6CkOKa6NqkJhPlT+C3YOo1obsccX3cul6bQOIeAppl?= =?us-ascii?Q?RB5Op5W531GH5IRryKL+6lYSgebq9IB97KZ+qV3saVZcDw7XiPW3M0K2eZWk?= =?us-ascii?Q?PrQCRH7U7LtSNjg4VLcrlNEnSQxaMnhx7UW4HIUt3DX1/n7K+W9eM2uAFGMT?= =?us-ascii?Q?dQgM6B5325sy8aVY590SKe2TU3coSR9TfiOPlY9ypWlI/6413EoWVG2EZZw1?= =?us-ascii?Q?a1uwmBsWtYYwOoPeWG51U5ozwbT88hb4wkkNdXmKSgMdpQkPAZC9bYI0Srjn?= =?us-ascii?Q?Y9lkBZBlYXbUZK2IiSDVjOqy5AYKra814dxTYuFYGsgtsZa8ez4+jHnCbrKN?= =?us-ascii?Q?tSH1+LXOL1dkzYwkDNztH36NHqtgQPN12sULscQe1B5D3iBs6YPZwU5Gqur0?= =?us-ascii?Q?Iq74RvOPE532CfRI9lF4yYi3iDNIrvn24DE0NlaXm789Nk4hdyloYmpVPygp?= =?us-ascii?Q?JAX95/rwq9SCZYvsL04rwxFhxZe2ZZEGtd+2EZ8kQJzCHa5dhjPmghRvnFdd?= =?us-ascii?Q?4qlx6x77KlA7PJ+bv4+2xDcUC37Jh+xDYcyBIW0Fzhjwmw2D8CNx/oH2Qz8m?= =?us-ascii?Q?DWED+IbxSc7TL/XAoFXQXmJXdVDz+nT8+hL7hm6a0/WCQgfEQTABUhb8oyPc?= =?us-ascii?Q?xyCLRuBGYasmWudp0bujixGcsEUYEhsLDN5Ny/hxGePuMrDa1OmjMPUIxJxQ?= =?us-ascii?Q?bpPjpMO9eUOl1PnyjRsyyEDoi+xbIIKE646kAkxDcqbDYDCoHt0wb4aLTYyX?= =?us-ascii?Q?v4+stZlNFYlnZWNtQfx+UXpE4jKaXyaT8Si7FAGpTSo1LWTVFVQ9Od7Vrv9h?= =?us-ascii?Q?BpvMyDPuV7iXGAVRJjY2+rNQZux7rp3nb7doaIyvvujhmO4dUTmH3LEVP42b?= =?us-ascii?Q?lypLu5ADmgPMv/iEJmnlVXWsNfYMstnlgN+ukzQhmQ=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ca1ae75a-6ace-4cd2-a24a-08dc8ae20205 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2024 13:17:28.3926 (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: AS8P250MB0103 Subject: [FFmpeg-devel] [PATCH 01/57] avcodec/vc1: Combine identical checks 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 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: Signed-off-by: Andreas Rheinhardt --- libavcodec/vc1.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index 987e77fcc7..d263c70be7 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -583,21 +583,23 @@ int ff_vc1_decode_entry_point(AVCodecContext *avctx, VC1Context *v, GetBitContex static void rotate_luts(VC1Context *v) { -#define ROTATE(DEF, L, N, C, A) do { \ - if (v->s.pict_type == AV_PICTURE_TYPE_BI || v->s.pict_type == AV_PICTURE_TYPE_B) { \ - C = A; \ - } else { \ + if (v->s.pict_type == AV_PICTURE_TYPE_BI || v->s.pict_type == AV_PICTURE_TYPE_B) { + v->curr_use_ic = &v->aux_use_ic; + v->curr_luty = v->aux_luty; + v->curr_lutuv = v->aux_lutuv; + } else { +#define ROTATE(DEF, L, N, C) do { \ DEF; \ memcpy(&tmp, L , sizeof(tmp)); \ memcpy(L , N , sizeof(tmp)); \ memcpy(N , &tmp, sizeof(tmp)); \ C = N; \ - } \ } while(0) - ROTATE(int tmp, &v->last_use_ic, &v->next_use_ic, v->curr_use_ic, &v->aux_use_ic); - ROTATE(uint8_t tmp[2][256], v->last_luty, v->next_luty, v->curr_luty, v->aux_luty); - ROTATE(uint8_t tmp[2][256], v->last_lutuv, v->next_lutuv, v->curr_lutuv, v->aux_lutuv); + ROTATE(int tmp, &v->last_use_ic, &v->next_use_ic, v->curr_use_ic); + ROTATE(uint8_t tmp[2][256], v->last_luty, v->next_luty, v->curr_luty); + ROTATE(uint8_t tmp[2][256], v->last_lutuv, v->next_lutuv, v->curr_lutuv); + } INIT_LUT(32, 0, v->curr_luty[0], v->curr_lutuv[0], 0); INIT_LUT(32, 0, v->curr_luty[1], v->curr_lutuv[1], 0); -- 2.40.1 _______________________________________________ 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".