From patchwork Sun Oct 30 23:56:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39060 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8e01:b0:a3:a294:714c with SMTP id y1csp607415pzj; Sun, 30 Oct 2022 16:57:27 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5kGWuB0uDVg98A0uvU+C1NzTtjpbmfIdK43fgn2aA5DLaKTsGJdcgUeBoRa+7qD9Qzllc9 X-Received: by 2002:a17:907:7fab:b0:7aa:97e5:fac2 with SMTP id qk43-20020a1709077fab00b007aa97e5fac2mr10267351ejc.553.1667174247195; Sun, 30 Oct 2022 16:57:27 -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 dm16-20020a170907949000b007912fb7ad6esi6549269ejc.893.2022.10.30.16.57.26; Sun, 30 Oct 2022 16:57:27 -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=sxQpvXQs; 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 4661F68BD91; Mon, 31 Oct 2022 01:56:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2043.outbound.protection.outlook.com [40.92.91.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 97FB068BD60 for ; Mon, 31 Oct 2022 01:56:49 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YEyFD+brTPYogzGZGOeVEok/GIr1quQH2KUVs4BiLFr7ED2UAUwcsnOlFs/PELgOh4EBud/hzAFGXcKkKnONpZgLsOYwWFm1J+lcDG8ig88pddbqiN9wtLOeqUwbMO6yh1qWIV1DzsUa8kzPH6NeyGt1yAiWcw7kM3XYnjUu4zldWchMU9N6+oFlwUOlvdAxf3v6/t3+lh3nV7ol5lH7ET7tTlAV2hH1hQKjN+ydMqa7zD+vQNFDMXZ7Yas+4EZ8eVxkIoufjeNJIFCexI2EGa7QNqFJ8awUYNm9oKOAQPz7Obb3/LKjf9kHzmyhu25hG9vS58aT9Gtmw8IgpRZmgA== 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=beHB+Gg6sZffSFHiUZ2WA001pKVAIRc50gE0UtspFE8=; b=Mp04GyDquvwjxMarzePqfQtcbEBiUoUL2fB4IIldP8QbcEdLtMFY83akppYCcFOjXr0QE+Dq3pvPUBoC6QINohDFS09opASvwNJoX5I2rqMzS/paxHksG1RHuTLKXBskwDBccVTeB89mLzJb/IwUzdQI1DslC346Xz8C6JhiP4Qq390BGT386csGEWuaZg1MAabvMWeQr5dKz55jxXme4fXu5jjRL9vaZYEyvPRicyh7Ty+K12MPOVdogafxGgYqN6DXXGjfuvf8CXeGR9XTR52W0d7IGE7O/ZlN672g+W30rfFs7KCFgmVy/FRKdTcNdSThsuoq/0Ur23IwNlg9Bg== 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=beHB+Gg6sZffSFHiUZ2WA001pKVAIRc50gE0UtspFE8=; b=sxQpvXQsDUlmoUZc3QVhrHqUSzFZN6YH1df4D4aLMafp2cIT4Xo5OBc+VxnUOlGMbEIcUEgyKZ3ymicN6U3RhyWOAXibJj922dMLnqE4P61OKSoLkxJi3D+E1J4tQdYhR94K02C7hGdeFq483po4tkYW3gR/kl+o9rHKkNCO4UE6J1wmYrV4L2XmXqX7OcYJuGfj3bEZj7Eg6LxwFnHF4uqrX2UCiklMXHRNTGYdRUTChrtDiW4DI0y9xhiY1eKK7zMR0tpRjxz4fYaNs6d/bMQZuomUh/wN7pshnAbzZNxk6c9gITyIfY3B5jQKppGIotqghNqIxt2xguylZbDrwA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by GV1P250MB0857.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:97::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.19; Sun, 30 Oct 2022 23:56:43 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::739a:8740:19c5:925c]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::739a:8740:19c5:925c%5]) with mapi id 15.20.5769.019; Sun, 30 Oct 2022 23:56:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 31 Oct 2022 00:56:20 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [aJ4TLAEFhL0bb4rRjtsZRUvRVp7u1kmpRWh8drueXXA=] X-ClientProxiedBy: FR0P281CA0146.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:96::20) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20221030235631.11750-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|GV1P250MB0857:EE_ X-MS-Office365-Filtering-Correlation-Id: 70f27662-0337-4c84-e459-08dabad2657a X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKxn/FJXV9AifVAmfFjhXa5Iu7eeHADLGWaL04yy/04JY6Vr6wkm/8TVqmQiXlENTaNFh1ZdD9+TsmDuBDHeIiU4Ytr5hmgucsVT5/qvUBOiyKImh02gmoP3NDJB2y7SKVZrYk40FMHJg5Sr2+J57Ul3tLwicZM9GUTs6Rp5+pXlN4P3t2rGbbknNetfX5VCRwznqrKKdL3IZNZzPU+HDBRlNhW0KZWXjlnsma/WHyJnyOanQvLHFX5Dq8yDLnFERliI8TjsmI2qr3pkKPJFi+85R8/gYuQx50btOHk00s8CDaH6JaDkbo3mObxEFoGkjdW/OrXMkI+6MJHsured/PBf9aMNfnYZJxsOebonZt6a379pl1G8rozXblu38hAWe5A2A7kbcOvaQl6HgKPs3eRKVDBAyAQY1YJ9JSXxMMrSDuGk3EGNyAaiBfOMD53S7Fa7nA/PkJcnCGQiSN8GYmOImEU4emuPCZHkgDgh4HijMpk+88bTjpgpe/yOTwAeAr+7pG7kgC7KgulRmYRM+Dk3t8GNfDe0rH4KR5AZFYOBovsdPQyi4Xx9Ff5SC9Neww5lZDOqRo2XTZumKhaiDJeRcTqPzV2SnVysqCLBqqKsY9OaOqTgJmOCoe+EeTM8Uj3fHhOOVYChNw3PTr0vKZxunjUSth+T7YueRTfk1gXUvu/V7YgXA6npXTlIakbVL6LYFR7HK4paXs4rUspLFaYwQVq6WQSay6A= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Tf6e+KIZSselaR2334PqJYOHX61kYVLAWPeRwOQxzOKyHuEeuCrOTKH0h0FPMvWkHVlUSYRk7fPhOSSwS7EOnW2dp+/dTBsYIvump3Omy6lY8AScIKr6azFS0khzr8F/iVLxCbblkUioW4X2eIOTu96zZz8s5Mjoqr59cyQxZRIPf0WwG37ANjXXGZdiHmLm+HULLqLwq/XTkPu4OvZXjA4En1Yu/UM3DyIVf9o1h+rRLdg89iHVvmgfP/KzJ9DBz4FPFmtXSj6vDIXpxcFBzDyQiLjelelE2eLWi3PvMylwPoN8E+yFmMSMQWNhsntGwP/BTBNS5p0on6CPvLWz2UwaT79tUtu0+gk7PlDObYgPahVisEpmC8ifoFSlszH/pxPagOQGjTYvh1ZUdNRRGMhTVj9SuPqayVqwBfqStzzMSLeURVFHVpQtZ414b8rkgc8VH/lhSFJIjZTfdESL8SuO1wctCheZqPVR/rQQDXNPF0GX3mBjHK5WjjfYDN+z0uS2ZaHz7RalgacpYOPY4uPjHjYkTxEAuKkrRhsygtEwHAlpz51i+2dPc52y4pYoFmkX5gvkwoH+AVBkDHyAXkqhXrEfK5zdNwdi6Bq35gD0Nx7Bf0Dng6iwCrBL5beXKM8ZF6H2EpWb6KecV3Mg/tMFQPhmDh5rz04oa5EcC/j4sDHuc4FrTLX0eRD/LtZX X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BpFnkjR65tuy8xo9MtoVst+kLS3nPl1uwVdwA4vE65DaeDIhDa2w7LQMPbf4n8Fs+Z8eKBG5S6YbU3aGlI7Bpyds/bEG4Q/KtdhaNvUvoprNLi9JhEgEFzBzqZ3utoC5mA3A3Kv0dsAmJmY/Uh0l1hFCIbQD0Xxl6U8u9DYGTo8sxddRa4WmBpp3CLOGCUwi+fgweNXVdjN1jEvtONNuMHSOGrNgdeQR6oIfaP4KOYUR3WNiHSiKNc4gL/0UBrE2iTgrNRY38rkTs+Xl3sOzh3SHpER8V0Z253Hg5gkeZDJDjYHd6SwL9clG5Va9wjAxCocz6l6f8zjdU4azWtfEIPQbyXO2eBiApUUPh0RXqOcuxajUfEV97frdXNWQJ1bh3TJuqZgWdfACH1XwMbfG5Si5YZweQgtavcW0ZtcnNhzxqtWDRBY55ir9ecP3xkfObxrRw5xqnj8jKVd4Bxq4d/0was5JISdnvviH1M79mCZgmkI2h8RRXym2MS9sQlXFIESSpw514GPx8ciG0/Yb2gX/42zW5rqVcCaUnMGDxjg9FwMG7Tt/2wsWVUxnLoD5svDi5WYSQN2VkEoYRQqkfTIR/y4ZCCJjailvHUP2ElXNwUB28kkhWGkHcaLNWttUBptW83H8J1BADTUARKUtI/V+Y88EXUedO/H5z1FhnaqxGBvgHXZOAbMlwxkfvIPf9VZ+uGCo+h8SN0DpZYYAb7PYDoaOTRFteppgLd47fXcYuYe6gvMwf0jmoYz/7ea4pCc8fkS/MTdt2Qq2BjgpgwJs/S+72ysnHpxsoXUYqPMiREaIenTwraRzcltrB/PETBzURdRoU+1XxdW7TuEaXep5EkKzVeoH6Gzwm8Mrq6xFMry6x/71+6RlBm+/uAHf17mqRwKDICMkMqjAFAU2B4aLY1yZAikJ91raM7IjkbnkqCX4u3ojzXSIhb4+vuWebZAJP3E9yApxsiFbmq/UAN4CHgwgXz9ZEGKXDNQB008bbPpKctzFNq4IDgkELtdEaBiM5+8UMWTgLGnqDOc57TTIrNJMDRRFPrlUy20EDWlUaY6zW+W4mWgsAFV4jyxTatE+xtlWS6yTDABSbkvDc5NIFB5jh7FFodKw4e0/2WheWeVqXletO02dNztwtpUUpq5AeMzsvPio89oQx9/mQCGEeeHP/OiLbzzBpoBJFX/uPxxrSYjyAsADOKQmwSAZVv+iGAY/mrIRAuaIol/9K5caLOO7BAzaALSPhOaTsyTPv9llekotnmHlpPtDcPwbBMpRDZ01FR3pyInZsCLr5ymp6kJ4C0XtNkfiaDy+/l2sWVwLtBv80JlFV/KBs8d1 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 70f27662-0337-4c84-e459-08dabad2657a X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Oct 2022 23:56:43.6828 (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: GV1P250MB0857 Subject: [FFmpeg-devel] [PATCH 08/19] avcodec/vc1data: Remove duplicate defines 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: 7EQuqBxmKeqG The defines in vc1data.c are duplicates of the ones in vc1data.h; they are also pointless, because they are not used anywhere. Signed-off-by: Andreas Rheinhardt --- libavcodec/vc1data.c | 21 +-------------------- libavcodec/vc1data.h | 3 ++- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/libavcodec/vc1data.c b/libavcodec/vc1data.c index 01a9767d51..004b1347d4 100644 --- a/libavcodec/vc1data.c +++ b/libavcodec/vc1data.c @@ -98,50 +98,31 @@ const uint8_t ff_vc1_pquant_table[3][32] = { 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 29, 31 } }; -/** @name VC-1 VLC tables and defines +/** @name VC-1 VLC tables * @todo TODO move this into the context */ //@{ -#define VC1_IMODE_VLC_BITS 4 VLC ff_vc1_imode_vlc; -#define VC1_NORM2_VLC_BITS 3 VLC ff_vc1_norm2_vlc; -#define VC1_NORM6_VLC_BITS 9 VLC ff_vc1_norm6_vlc; /* Could be optimized, one table only needs 8 bits */ -#define VC1_TTMB_VLC_BITS 9 //12 VLC ff_vc1_ttmb_vlc[3]; -#define VC1_MV_DIFF_VLC_BITS 9 //15 VLC ff_vc1_mv_diff_vlc[4]; -#define VC1_CBPCY_P_VLC_BITS 9 //14 VLC ff_vc1_cbpcy_p_vlc[4]; -#define VC1_ICBPCY_VLC_BITS 9 VLC ff_vc1_icbpcy_vlc[8]; -#define VC1_4MV_BLOCK_PATTERN_VLC_BITS 6 VLC ff_vc1_4mv_block_pattern_vlc[4]; -#define VC1_2MV_BLOCK_PATTERN_VLC_BITS 3 VLC ff_vc1_2mv_block_pattern_vlc[4]; -#define VC1_TTBLK_VLC_BITS 5 VLC ff_vc1_ttblk_vlc[3]; -#define VC1_SUBBLKPAT_VLC_BITS 6 VLC ff_vc1_subblkpat_vlc[3]; -#define VC1_INTFR_4MV_MBMODE_VLC_BITS 9 VLC ff_vc1_intfr_4mv_mbmode_vlc[4]; -#define VC1_INTFR_NON4MV_MBMODE_VLC_BITS 6 VLC ff_vc1_intfr_non4mv_mbmode_vlc[4]; -#define VC1_IF_MMV_MBMODE_VLC_BITS 5 VLC ff_vc1_if_mmv_mbmode_vlc[8]; -#define VC1_IF_1MV_MBMODE_VLC_BITS 5 VLC ff_vc1_if_1mv_mbmode_vlc[8]; -#define VC1_1REF_MVDATA_VLC_BITS 9 VLC ff_vc1_1ref_mvdata_vlc[4]; -#define VC1_2REF_MVDATA_VLC_BITS 9 VLC ff_vc1_2ref_mvdata_vlc[8]; VLC ff_vc1_ac_coeff_table[8]; -#define VC1_IF_MBMODE_VLC_BITS 5 // as a placeholder for VC1_IF_MMV_MBMODE_VLC_BITS - // or VC1_IF_1MV_MBMODE_VLC_BITS since they are the same //@} diff --git a/libavcodec/vc1data.h b/libavcodec/vc1data.h index 3e45ef1e79..ee4ec83263 100644 --- a/libavcodec/vc1data.h +++ b/libavcodec/vc1data.h @@ -91,7 +91,8 @@ extern VLC ff_vc1_2ref_mvdata_vlc[8]; extern VLC ff_vc1_ac_coeff_table[8]; -#define VC1_IF_MBMODE_VLC_BITS 5 +#define VC1_IF_MBMODE_VLC_BITS 5 // as a placeholder for VC1_IF_MMV_MBMODE_VLC_BITS + // or VC1_IF_1MV_MBMODE_VLC_BITS since they are the same //@} #define B_FRACTION_DEN 256