From patchwork Thu Oct 20 08:45:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38854 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp46327pzb; Thu, 20 Oct 2022 01:48:33 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6ioLJ5wNJ9UXurNBGItFyOvBIBuBRZpD4pbXOsb0UkLiY16XPUqQ4xgGGMKpmFXscngIly X-Received: by 2002:a17:907:dac:b0:78e:17a0:d1cb with SMTP id go44-20020a1709070dac00b0078e17a0d1cbmr10129022ejc.618.1666255712916; Thu, 20 Oct 2022 01:48:32 -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 o26-20020aa7c7da000000b00458ff6921e6si14710477eds.79.2022.10.20.01.48.29; Thu, 20 Oct 2022 01:48:32 -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=d7cqk9cQ; 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 C1F4468BE2E; Thu, 20 Oct 2022 11:47:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2030.outbound.protection.outlook.com [40.92.91.30]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 285E868BE2E for ; Thu, 20 Oct 2022 11:47:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T5Eof/+K87Cd1F/7mNCLiPmZFzo+silTSB8JXPrAaHHhoPc0oUYQbj23o5ni5HNWBJ6wMj/8kMAtHqDJLLEdpiQjJd9spg5pHDntRr9QtvxIfX+p9TTYf+tvLrFT3LuIWn4SZAdg51EOQguyYE6R/K1Vjjd3hM9+bRGN2xr+lE9T3bs/uIDcWYf89Lympg1FJUklsU57p+nwcs7aU2Pb8z9ZDEcsN8bty80PkGdD/kKeSQTeCvi5oz2wccSSN6UwbORS/FKE5Y/jWSXeYAk7/dBaggF44ZoqdqZe/z6+U8MRnCHccid6jiUVHxMCmkJjYs3Pr9jjbs4MZ8s7dpSKag== 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=M4gyE2st57cp4NiU6ChezSt0gXOz93NDTaipJznPRO0=; b=H4qXtCD7xk95GRCPCrd1Zgm5kjgeSVfffTCEjnuXa70++x0AzM80wI4KQqLY1U+HFfZZAZllAtxAH1h5NUQxjgO1AZlieRiJdJML6VFQjr5yeoco/B75CIHZ/Q5kIdk/j3KxeWAwRJICSgOwA+rdtcm52S3R8q9r7E4XrnffbodioZmLsI4z9hKY+Sy1DoRSvAv6S94KoQveNVRnBBvcnGtxYk3MEUYmqWtoQaCp7X2C++zSHfHemdz2K0edxy8nq/5Dvoh5NjjgpM5shHwXhTw55FN1Rv8BYVT9OriFPIHmrMK/bYaJ5g5/RTsC0VzWtwr3i9Oei+39i2941tWzlA== 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=M4gyE2st57cp4NiU6ChezSt0gXOz93NDTaipJznPRO0=; b=d7cqk9cQrKqr6En694jqvLzIL7gjOaJ4Q7TSTLU1/HxAystJQk1WO1AtME31y8JN9rDocvPq+40FeXannqElE5iz6DfuoYbZ7qAx19ye5BqATpJodEQhlVk8KqQpq/c2Cx86aeF70gTXivJITtZwp44Gye0yHKzs2mRgksME0q1Q4iiU3OHgzzWHECEhEzy/gGB22weSSqmLevci66lNftOhaQj5CwqqfT8dF3CfMxz05S5A7GHMjbIuOhDAE3gouBTRnsNMW5Oza4uB+Y+niRKJJ1mHJW5rc6/62WjNXx8VpQkibWro/taRI28PdCBwYnJ3W3lQXuQ1LQwVba2ySw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by GV2P250MB0825.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:aa::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.34; Thu, 20 Oct 2022 08:47:12 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Thu, 20 Oct 2022 08:47:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Oct 2022 10:45:38 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [DAPnvTL9SkyNJcjLY+HPW4BpgzPTiyAdFO3ht0vJPNc=] X-ClientProxiedBy: AS9PR06CA0774.eurprd06.prod.outlook.com (2603:10a6:20b:484::29) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221020084540.2378553-19-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|GV2P250MB0825:EE_ X-MS-Office365-Filtering-Correlation-Id: 31395ca6-850b-4603-baf9-08dab277ae8f X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3kEq9VXjGDAyurdVkDmkI7qi6NEutkzyvcW3hJfK02tUunCBPu+D9fBV+wCAy3R29kpyvgoHokr5UB6qs7j87BWQP8QzqBqVE+7JT4iev6qzkzV20//B2LE+zbsp4Eg5LfZefje8u0XTgvwG1Fow6nZ6/dgcVD12ZBPz8qsw5+2rcm+vA8ujKtvWZQ2gJ2HH+AsdnX8RyCr51HDeG66no1n20UH2InI964qUCIatRSRD0Qa/GJtzlTBl2UZLBbqaBsLjBzB+HW2MKbha7UFDBJhLgL/EtO9vj9lwS1B3Y9xSFTeNYb/hV9UlyrcFG5NydMj+aH6WmgsYBJ3MxNTCNY08QOuojbV6A/DuR4IfuqP1l23KME1RP5m8DnRqHhTifvstT5uOleKri6VzEkC5GRusLe0M/h8rRjUPvVRVQR33KwaP1IVTT2LoFQuiipGNB6Khi0H+/GtHjkqaDKmQPLO7X9q7U7E4xAfCov2zXSR9ieGBh1NOVQd0A7Nvmfg1ASsFzJb4BV5Pbetl+Xl79eCWmvWNzVGo1bxXf5+ayuDwzgXkqecFFUdGnO9YVK147E5d09Spf3W5RLK3qcLzbtU+uwjJb8D90jaMCgpuYpzaz2gUf9NnpvSTdBdmasnx4i0TVH+atS9EVIPbZxq8Cq1egmcCJOO5wKt3JnQskVx3gz3uz3+elbT9oNR3rQdfCPA28gdsSWrpj20d+Lt4xS1FywfxK/AVu4NpXa8YDI0YUKhGOw3SDYn2dtiATlT3vQiYU13GkzEziefdQlDsHGY X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sRRvCArf+XHYUQxUU2XAHMgRG7g4zXl0MudrDthh0ruC7vNPFMmbC1rZS74nkO6wkcEGQTBXQHrskYFXws53tdHZj2lgFAFNgjlCvrq3Apj9+cPdbM+9HvIBHDYZslfckFgs9F/DUbum1LkqLwwBllTsSVase2eAfuDujw0yrgmrvs3B+X/E/SwmyezFpK7I/gIXKXSrg7C+F2QeV/CQ1F8TGBQSCrkWIkYIayvnNrL1saxmDYocNzkUuWf5a9Vce4xECXVPaBKKprwPpdJkEcnKH7dAQMyoza66b6IG5BncDgNOjW73PEHojcKJPZu11J1nIiFl2pbBylijLd9nFxPhlHleVVsdMomtfk8JaWQ0R2tY7f3cNcGAvrkJi5YddXq6uo2vM+qqkHzC9HLyOAv82ULezD6tUP6DJBPuZBgwEq9FlAWSQS+uWW8TTdA0KcTVq90/7Mxdv/Ybh12Hs5N7zy3cVBRyareG1eQd6bNNLJMRDdtvPpnFMRF5Iw0eDzRfBCr3kkjV6Mn6SwlCZIXnnaGetj069Zt8UfNuhDR/X2299qRyLx4HBK9FO0XvOlq01bLuGca4yZxC5jcFhjSEDLXwLuTEHDnMwh5b8IpK3HrARnEMCYj3ZXzPkW1/6Ow2QN5DouwnQnS5OSQlKXpXjfs2WzQwxuv4sD62wHa+sYnK1qNW3/+JBf73GiJi X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bhaVtdOXNdtfQM+W5kUcJjvfxjG/UIjIS38y/6426MT2xTAMRmJA6vY0Cmy8yKV1jJMQidF/Vtnf2scg7CwW88Abx+g62N3stypqx9RSUDqVVpNFRNzBmF8GZhBeCLe3RPRkK4A/ljwLOLhse0AFaVP9kmqAHGKFWz/48r89VLLAQFjFgzCIvPb0TmhtyQVN1PB5/Mzu3QTA2xyVEOkD8DI0uRJjll505fWZ2EzaVrgzLIdgMad8kDiUdKSYMl21M7R72c/XaX/4ZEmWoVt41qdZkfKwBv6Qcq8Ny8AcpJbpj9aMfK6gI0fhXoyqw1SF7mwuErRjYVBU01FBtZIcw6tjRJqA/MHHh1eUXN4upfAenyC0cr59/G5Z3P9PtQESOep4CCYUTDBZA8ggcVXXJBvIWNhMAO4ARv+5lc7J+QuDiZcpyG7UPUu2UqJMGuLl0VqpdoJg1fV4l2/sjrU9Ee2NEi2yby4vmWyzwxfP+o5TKEHljp5MyRg59YJOsEnMzDLna2k1ZH/x3s+fo0L+Kp1THyUiZBN83IddnQ08ifqKnZD4U9UWk412T1t5a5qQSRaqvl9JyJHm7ShD/Wha99MY1ZqyQkwcyT7ORgyxFa/xDGe8pP7jJKzmki9nrCHU0Wj5brkmPdHN5vxnTZD1D8PSWUd6PUQSiDd6f+qCwRg9pg8Ze30hfE+vouKiq1c+2aloiRTN/Z2WUGBetoOZyzLaJGnBU6Dp0534vpg+fp0ZDU3H8PmXxYiRXM71CsHBpl7NLENGLePn0T/nYtG8NpI2MiIlewsrKzWLYZlurwwCpaYC2x6v63+7oqWTC0P6BV4Ae8FLx0dWE8eRmVTeaYyBf5AEwldKKVF/4dYirndN956Oj519v2VncQKJ5cK7Hk3fdbVTGhaytr9k/Dy8AI8AiwmHYhFhaTa7DNn2tLYkakcKg8q7Rko416++o0fFLSH5ldCWEi2er2a1tI2hdzzytaIIuSp30sSyGUbsxe3RYNZak8KJZZHfSZ3MPDgok0u4AGzd32TOOgU1LZr3+f9OXdg98FS/o+jlSPwAC9phdQ0qahfKNAMv5CNpW4ZlczNEE5ULUaWlaMr/QQWZb7IMmpfhASFL6oazWzKAn924/rvExku8ITNJqzVfKAiZ4CLOlY/+gm79XvYpA9LbE8+uf5MR2O20ewCv4OzwSxZLjhSJrHgzJvvKTmuV4DZCFHimci3sGZM4/rjUogrQZpjTnDSARc4K7Ciem34TWUIJU1m1qu+186GknAwewTDdBeHCDJJg7eBA36sEg4LMYsH1DOMF6vFOD5EAw+IjEb4= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 31395ca6-850b-4603-baf9-08dab277ae8f X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2022 08:47:12.7572 (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: GV2P250MB0825 Subject: [FFmpeg-devel] [PATCH 20/22] avcodec/wmv2dec: Remove unnecessary ScanTables 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: FtFQKtvxlMqZ Only ScanTable.scantable is used for the abt_scantables. Signed-off-by: Andreas Rheinhardt --- libavcodec/wmv2dec.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index f638b31cec..a70913134c 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -52,7 +52,6 @@ typedef struct WMV2DecContext { int per_mb_rl_bit; int skip_type; - ScanTable abt_scantable[2]; DECLARE_ALIGNED(32, int16_t, abt_block2)[6][64]; } WMV2DecContext; @@ -425,9 +424,7 @@ static inline int wmv2_decode_inter_block(WMV2DecContext *w, int16_t *block, w->abt_type_table[n] = w->abt_type; if (w->abt_type) { -// const uint8_t *scantable = w->abt_scantable[w->abt_type - 1].permutated; - const uint8_t *scantable = w->abt_scantable[w->abt_type - 1].scantable; -// const uint8_t *scantable = w->abt_type - 1 ? w->abt_scantable[1].permutated : w->abt_scantable[0].scantable; + const uint8_t *scantable = w->abt_type == 1 ? ff_wmv2_scantableA : ff_wmv2_scantableB; sub_cbp = sub_cbp_table[decode012(&s->gb)]; @@ -577,10 +574,6 @@ static av_cold int wmv2_decode_init(AVCodecContext *avctx) return ret; ff_wmv2_common_init(s); - ff_init_scantable(s->idsp.idct_permutation, &w->abt_scantable[0], - ff_wmv2_scantableA); - ff_init_scantable(s->idsp.idct_permutation, &w->abt_scantable[1], - ff_wmv2_scantableB); return ff_intrax8_common_init(avctx, &w->x8, w->s.block, w->s.block_last_index,