From patchwork Tue Feb 1 13:06:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33984 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp601909iov; Tue, 1 Feb 2022 05:09:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJwcSxWI9WWc+8hWzYpk/a2wpQeSC9dGBpIELnRM0BQuwZQEVvbkaWdxSIhcDx1jetw5pTGo X-Received: by 2002:a17:907:6d99:: with SMTP id sb25mr21555688ejc.15.1643720949205; Tue, 01 Feb 2022 05:09:09 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v27si10291257edx.440.2022.02.01.05.09.08; Tue, 01 Feb 2022 05:09:09 -0800 (PST) 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=Zqetf05p; 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 54CC368B2E7; Tue, 1 Feb 2022 15:07:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071051.outbound.protection.outlook.com [40.92.71.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6803D68B2DE for ; Tue, 1 Feb 2022 15:07:36 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cRuSncrKaFYwB7yUy0j8Y4N3GKC6VVXIVtVWqNdmGdk5ChPxa89vBUTqkSQyIReabQuNZTsSlgEITV+KmpFFi8AdIjplDFp0TIMOdej2a6ci9uMXjgzcwsC9aZnZojfkdMh262IaC+JR1Q/hlS43VE9jnq7SkQzzbdRkpumuKxi7BrGgEZx9v+VsJGHLAg2eoNyAvKO2aqoAURq2VBIg3FBCTD7SOQinuMF6XAumzBTfEf6vvvcUgFzU/4PLAik+dcASS6e7Xo9pm2v9oAKRx+BGqD4jg1XjhHvhz5xqmM64S3UG5NNZtRcSDIE2O7Dd7yZ1QXTQV+TCoFzNxOaJng== 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=HABDUQ8uO4qiV3YQ+txT2vA8zW66V3hs226HYDQ0puE=; b=MDhJER2IVeHQ1ySDqp9lnzdUQIVnTZ0w/Gz8x2gevEnjR/YaQWhKotoKY+Gq+jy5qldNP3WgKqBzcuCqyxj2ITYHTF8fIGFXPVD/hPYeUEah6iis85TmwmPWtbmezoTorbhm9xLnQ/IZM/aMpQHyJTP68HXCtWcHfRMjGKiMLaKa/bPuRGMPf6/CVSRlbTovD+ktBB8rieRYBIUTVcQc7zDHlYmBqAJvh1Ns7zXXHKtigqxbNucZU6Jp8w+YS9YYMmLW5rBQvrXbaOtewhTJ6HDpPqE+1WjnZbxXXnIzBlO0y3Vm6GP1nHAtukBMI2JEYO/Z3FZMoeRdEEaH2ecdAw== 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=HABDUQ8uO4qiV3YQ+txT2vA8zW66V3hs226HYDQ0puE=; b=Zqetf05pnbIK1cT5ye10gh53bs5RoFaix0g2rRcHT4etpCLRsFq8YKz0DP/iNfooFT3gfH8Se1GleEI3zewwG9bxDYlSduxeN93p0j7EBSIo//ltE+NAZx/hOmmRmh4WkbeG0bpstV/wKwmu+O0CRiO9Q6/zJhwzPW3PaETIBs9sRx5z9/sskzquYJfeL57vhJJ20Nm1HQ+9xsHtnHBJ5d/WYYQTb3S9rO5IKMuAXtihDdNb9mZ4UW29ZXr0c0Or7eQrWYC3Uzehn/MjhFFv1L6WCaPoD/Pq/YT6QMvZOEMWvsR2rDv47zQH8Oi6Tazc4aN0zPik8a8P6YNDHVKBHQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM9PR03MB6948.eurprd03.prod.outlook.com (2603:10a6:20b:2d9::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.22; Tue, 1 Feb 2022 13:07:31 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%6]) with mapi id 15.20.4951.011; Tue, 1 Feb 2022 13:07:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Feb 2022 14:06:07 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [Crk2n7YHwAFsetbE7mQWFFLVKqbWsZTd] X-ClientProxiedBy: AM6P195CA0092.EURP195.PROD.OUTLOOK.COM (2603:10a6:209:86::33) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220201130706.1420875-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 18417162-daaf-4e33-b037-08d9e583ce2f X-MS-TrafficTypeDiagnostic: AM9PR03MB6948:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ABkZdan+AliLUp1nxBU2o1NS0WFtiVkGI/ZBl2q6E89ip6TZbxMQHbQLurhSADzikCIVHnIwJCjI5TYZsnXt8cAqG5DFNK0wNOC9LcB5sBfh+rveEXwTwSnOO67KpXfoYnbE1FgqMiRmfD+hd/Xsg/jKj3vhTnKzFhQUXwIqq1MW6DHukoK5AXVUjxppfiyybooyvRQff9sKpu9D0ok/Rn/3QHYTPFK7lE6Hjq6TeKjmVVkY0po98ljoaILOaPCPrf0Rlcf/QH+pyuoGBVix7eV5jLn2CegFGK33w56DX5mB4sEkq/sdyNgJEsUM3G2rvQIHpm4Yc5zrUS5U0h1M9FezKgBWeG6pvIHjkaGpoo4x6Rkc7smdC3yXk49djrD75VUvQkmmVa8iXOunZyAla0VKog6OVG56RVKrWsuODfrqu4V6o7xWCX8w85ymuLuldhqoeYixNZYAVj/bY/IlGlST59hW6w9qD7c+1hfTUgzRGz48XUF6NmroTiS80vDEquylaUxLeoFrTfVG6HzllVUZ3avlq5Il/2Qblw39OxCd8s2qOOihvIdpCbiBGADk X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nNfFfipOsAy//cFJoIaSta6Pyr6ubjaAWUKUF5GRfj8xSwEMLjaGIrf6Iciisukd+74Thpz3T3D2G3Z+l2xCkmlr1/uTsa1b1ofunijd+dz3nKUXKRFYO8+w4qcjjicanrw6SVHoASQFz3pQjTCz5hpZyfMj4gwVsrp4cb5nUTqoYK8fZHhj/AEowkJSOU7v3lSXuXHeS5JgZdo+Bxwm6P6sMZM3iEvgdXN+RF9lvbH4Qjl/PH2dVsbmrWy9Awef417i0u5y9IYC2Ouvp/7M60xYLE6RMxoiMm5SBUd5+GFeRKt/sKz0Xb3J8BP+majl2VH05uBTTdxDPwWb+yzEYFTWzVzbYoCi7Nos//De7Kzknl8vFeGWKENn/i/f02wfNA98HGZSR45asApwX9zvTM6arZjqvKo0KLeGztzlsyfByMtZn+kvy8Pz1nOYbJx/W4VpQnyk05yH0RDaO5zo8bdYVu4APrg5UA5KEBmKdjnKRStnlZSwuRDH0PbE9/EXrws7FzZCEqrORL1FUUvUCTNNtpC85EVoJ5ytrlj/xWTI5Dmg9OZg1Wk/DDqgSVPocGbP+I6OIFIJUEAovj+k/45Bw8Y8RFaN10yaNFtn5vXPJagNC73XGc03oNIOy+bN+Bn5tEou+n5SJ4brTI1QW87ikk2HlNNoPVST4Sl4EVNGI5BygZHqp2PxzCrVdsvHbHC1/7sDXahSuGWqlP8GUbRDmFcIj8+SuOQdHKBfAloHqWQy2fsYJzP/4jkfvfndP4xaE7mpSiLB9LMCxWH4v786BSCGNQ9WxZcG58rV+/mha5dWjaYrdpTIs1hywl5fGYDrVh2wwjDyTwzKtlS4Twe2LBbW4/rhsiUCNprCjnpW+qmE+jYZYSTLu09hwgRUmA0kxeSIa1bOFN5r/4fCDa6HZQ9lhA665zfYhOpk2Z4AcWhPNbEMRHrFhO4FeCP8BYo0lqW94cJDVxjvNI7S4g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 18417162-daaf-4e33-b037-08d9e583ce2f X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2022 13:07:31.3125 (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: AM9PR03MB6948 Subject: [FFmpeg-devel] [PATCH v2 10/69] avcodec/wmv2: Move initializing abt_scantables to the decoder 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: t0gyBBKOvNui They are not used by the encoder at all. Signed-off-by: Andreas Rheinhardt --- libavcodec/wmv2.c | 6 ------ libavcodec/wmv2dec.c | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c index fd64a0938f..57e1267782 100644 --- a/libavcodec/wmv2.c +++ b/libavcodec/wmv2.c @@ -20,11 +20,9 @@ #include "avcodec.h" #include "idctdsp.h" -#include "mpegutils.h" #include "mpegvideo.h" #include "msmpeg4data.h" #include "wmv2.h" -#include "wmv2data.h" av_cold void ff_wmv2_common_init(Wmv2Context *w) @@ -36,10 +34,6 @@ av_cold void ff_wmv2_common_init(Wmv2Context *w) s->idsp.perm_type = w->wdsp.idct_perm; ff_init_scantable_permutation(s->idsp.idct_permutation, w->wdsp.idct_perm); - 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); ff_init_scantable(s->idsp.idct_permutation, &s->intra_scantable, ff_wmv1_scantable[1]); ff_init_scantable(s->idsp.idct_permutation, &s->intra_h_scantable, diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index 7518088b6a..dd0e2683f5 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -29,6 +29,7 @@ #include "msmpeg4data.h" #include "simple_idct.h" #include "wmv2.h" +#include "wmv2data.h" static void wmv2_add_block(Wmv2Context *w, int16_t *block1, @@ -537,12 +538,17 @@ int ff_wmv2_decode_mb(MpegEncContext *s, int16_t block[6][64]) static av_cold int wmv2_decode_init(AVCodecContext *avctx) { Wmv2Context *const w = avctx->priv_data; + MpegEncContext *const s = &w->s; int ret; if ((ret = ff_msmpeg4_decode_init(avctx)) < 0) return ret; ff_wmv2_common_init(w); + 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.idsp, w->s.block, w->s.block_last_index,