From patchwork Sun Jul 31 09:37:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37051 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1871528pzb; Sun, 31 Jul 2022 02:38:11 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sKnmxiuOIOrMKJT1xSvLLLieXXwLJ72bYFxnSrglR8aI39aHv/u3UEyPHmtIFRjDlrpcfO X-Received: by 2002:a05:6402:ea7:b0:43a:ecea:76e with SMTP id h39-20020a0564020ea700b0043aecea076emr10872259eda.77.1659260290990; Sun, 31 Jul 2022 02:38:10 -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 a6-20020a17090640c600b00711dd35ed99si6518427ejk.652.2022.07.31.02.38.10; Sun, 31 Jul 2022 02:38:10 -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=etidpWbF; 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 A057368BA2F; Sun, 31 Jul 2022 12:38:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074072.outbound.protection.outlook.com [40.92.74.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 924E768B8DE for ; Sun, 31 Jul 2022 12:37:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Acbvu1WbTmo//C92wFvp00tkDdtkyONE1QbcGZPngW7+byiYrHmM43zFZECJXb9lRpA9fAjsnbD8IaF81YH6LzCEWB7Du+qqV/rD8xZEQf91Ytqzn6Oo7YkKsPPz3K5+tuLl8mzvgbCXaM/TKwwBPyd119qe1RUdqLd1m6Wtr2A2Y98UY3yOqM6BoJYknB5GB1CyDXUblBqoMnrWUSeA2wCm9Op3sdsKQRGuFnqpu6rwzqSlV4S7GywvXO29xm8pgcVxftxTt+U5DAmWeALGdJ3TllY3mkn6+SOSVzXIwC/R5WxqEyVnE/35EK5/yLmFL5sep8hzj2AVp2lsa8teNA== 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=L+vATDhiHS7VQ1by2vI+TcyVgdQa5PoV1mD2pshnLts=; b=GNvOU4sUX1c+ghukx60TtyZUFAGK//1x6mohAWjJEv6vtM7Xx7tgwOv5stGqljk7qwEy9P30z3vhKP5nRin6QSN6NCP1O52NlTpP5igb7aGwn8Mtai8mpX2YJTp7Ai7g/u7xX39jg6/wRQYHhP6zu6IMVYU9sv+NrD/gOfm7ehMbXLgoG2s++rOlCtNi0bWjwpDQU2Kf8YgBxzni1BiEkqCoGYV6pGd/kMR7sIhavBAzpAIU6jUSNFLVqspRowOEdhCHq+oRF3OC/HdeLVTgfjEtuU2ZgHZoyJRTmwiAFEQopHx3106uWGLVPAmbHVz8t6eo5c753sTZwyxr8ySZkA== 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=L+vATDhiHS7VQ1by2vI+TcyVgdQa5PoV1mD2pshnLts=; b=etidpWbFzuSD2p4JDGjMqvglIY8XPKWSSQz1rbLmZsZFxbk8IyB2q2N5fuzLOX1Y4nz1bj+hOuQmOAFMQXlWbhyNS5X16TRoEAl8QVwCVQi2CjGM6RF7/H4XEqo+dysORxCHTNMAOV9M2CdXHIRPzwQ2La/XdylfKH7eDUH2qtiDuK0Pstwfk/hYMs8rzOFFI7l/vETVPGVpr4HDvIilaX/0YS/j2gywoDIfSY+N2nyXiZYpZD8orZerA87t5RxAxDu1d0P5M4eOAvN2i3TWbK+xtMqrUaCMx5dl4zqyZnmyD9kF/+E6ePtWjODdPKfNUQQQjuM+HbEUxUSZuXMMQg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by VI1PR01MB4574.eurprd01.prod.exchangelabs.com (2603:10a6:803:a4::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5482.10; Sun, 31 Jul 2022 09:37:56 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5482.014; Sun, 31 Jul 2022 09:37:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 31 Jul 2022 11:37:44 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [6UKMU6pSGx7ZO1YygvYmXInVMGizEETx] X-ClientProxiedBy: ZR0P278CA0121.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::18) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220731093747.1701860-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3603de29-fccc-48e9-fbf4-08da72d858cd X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWZB3wl8Raa43yVjPsq20aa0n5zJbjDOWdOQ7lkIyBxV9gymmZM+hjXWr5ih7LwobXfGlf8iR/dLHQU9E13xbxAlA7v/9aly6JRs+AJyXCrZv+XFMTfakedXfPf7JNeORf6njUD4jR01hhLVpgf3GdVIjg/fTgBL0q2gS+fXj+9C5fvZslsvHUsZpOl5G/7CgeTEIkHB4RBxuykZvwChCU3V6LYCZlUosxh7UXDSt/SLT647OaRX9bUUGcMR6k8wzZeUEKlRXoTuqTs4myk7B64wuRj2BlnuDr1NpZPzHmywfvNPpDWrUDdwo5GUmcQC89u3GQbOhTmKqfbL308xtip6vb/646BYa1nOIxfCdjyJ98MPsqV/aZJRaFWntZ0x7m0YPycsoeT5y9cZtjclA3twZd3m/654t+mgvIUeJY5i/weQFz8l7/YBqh4LWvOtERJX+UJPHPj3tqARG7ONr4qx2jzDw8CSzl3HvH0q6trnwAokkcY8JGwzsp0A+7sWNEWgnnAH0vKpRY08EnQdee1pqzSxBYyy8fEecXO2Uy8eek2PkTgmhxJpz7gyCwiGDuutYm/cVCT9CWhY8Wmf4eTwMgQjDmeZB5hJ+BEnB/fxM7934pp4Fv9zW970KqXdDQxRlD8d98ncMTiTJhDQ5tzs3gCAAWpU4q4Jdpk2uNtBWtwHlhfnke/B8GzPU4eGUqnidia5kpf3zowCw8k+nM7P852EPrOiB8= X-MS-TrafficTypeDiagnostic: VI1PR01MB4574:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zUiaebdi0b8copOP159Wh7kmrVWu4kWFc/Kcyh3hPsMTq3A5JypHMRjMiS691upQuLqil3bws5jQ8VNWOTPkaV5G9slF+LBBM/Zam8Iix1IOA6dK0KiJ0HgvbjXAjyWugujOIBqmMqa7Ukvjyx8A3UfNktZxDFbERrPTK7kBcjBnVQq64712x47gLuRWqshuw8wEKT8iUMSEozHLHrkUotg85RzqmmdJXFL7vE7qVR+dJtr2K1Rt5J0H0v82KdRS4EvG3waJ8IOHe26UO+7yFKphVy7fWX76F5KJEpoosTjRIfomsquVJNnQ84yT9MdoYt4ddpVMohI+XdgqbKGw7dBU7miePBbbclyAqlL4mFhZPyc1BgS02Cf4/dlIyoHNIvVTr8J0Ub6wMOBej2JudUKQ/cV+PjNkm+A/2ohMZUJ0Md5f1Gy44ndXFe9/3JwOdCpq5H/u2TE/sO8I5n9AiDGnnnWTndvO7m/B4vB0Nk2l+0zj0PWcvO79608k1ylrKO/R8UF4nCnHXontWILPrF6A6+TFEepQP/zMaMiyJ5es8H5sXUKeLfT9IGoSbbsUh6ayr4Ex6+DfPMo4i0xF0a/Ohv8DUIwxAty9PlKOA966Q3hXmSex+eVOmKnSg4y43y8EVaStIsLcMWce04in8g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: V+kILAWAl2vhnYqh+076DlEdbUrh/Zb//oGZA+egHGhvhEMLQVtudme7bTO14k9yxwHJO9aTPD0YY4vRLVm2wQ9dT/2UtAJYdA8J8Fn/+pFouFL06KBvRU5j1xQ9IZtMcepYQYrlLNMH46zF94jshAyOWrdWJc9IOf9q2z8aJKSeR9Ojp9HME+oy3/CsNe34QsmT/DtoERVfN+/ncpc7a7bpJXoZaMloXrY9E5xsxdO9VGAt6Ol09jMz473qcO895wTqmuPRCw6keGvwtwSxnz0HjK2y/mN1DRQMlpYpd6tGJYY2pKod0SdxNYYOI3/rqyIXOPttXRE83Wih1r9QAJBsZfoanJULae/0tQlqymeJu5KnAIcXZm3txdk2v1ff7WSJcuQPDMMH8JoT6/XGDeMUBL9JaN4tmpaLDFNJG578Vgx6kIt6SYYF6koKzuZH5SfX2bzcsEILnINGTash8SULamyCVbjwp97l2WNwrtZtOmPbIAiBVDZDV9UXsh/W4wke0lzeCPlXA8LJAY3+Nff8WGR8IPZcIO92YYP7aFlPneUxUwaNOQSViI/5IaOM4p5c0QKzpC7hMfzOzFsrMPDYqpBo5TzFpbHBBlcO1HDD6aJZNEnOVA1FYDuKMX08hAg/EW3UDmGMSytYHSYxUlDwkTwwgN4b2hRHSNd3z8kIksLh1yWyN/UVQ8OF/tmwY93gLwiOHSA1SLssjd4MHBItVuuhWKXHWy53+Y0w1IRA+dylP3suGsY83hWtRcYrNC/kW4epQ74vn7lQXwzrD/i9kiWFtDHFWTKXaFQam0U6OV6FDbrX4dKQDadjyE7M1+GggF6xjQ1uZvvtbMzYlhlL7tHS1+dx4WgW3seGzPXHtIbbWxx1N8G5gLDH8xDux3P5jHMt3IZWzWZGmCWvKTEU6uI2eCbOX1lhA6/IQEfEQucxVRwNvHMLJLgdnxpFzLhMq9iETOsEMsvRK+IrM6SriEAgZwrBiQT6ZIzdgHCCirD0ZfslWdtBoHIUgBWfY0FhWzeq0WRNP54hb5dEo1aEH/pZzrfyvkzudOzDVzbW6zRyo/luZ/fqXxiGpKYpVVerk0VDMpwlKMvkVt4gQT6qyOFC78LDKQlsL4o1BN8qjumIwnxo3KGis0vv3ddrj7i8ftJivm5VgEBYu6CVtgIxAGGEj6r317SFD9lnFMLkMYjk7wtes2OlF2Pqsz6pQowx1zEmhB6cE3CR7snJY7G3mya7JI9BDnS3hTN1lfJ1pQus3960jZ9Ou81J2fTK5SRRSTMaixtCOT1tdshoq2d4QO1HpgVbmHv8RQCzrXs= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3603de29-fccc-48e9-fbf4-08da72d858cd X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jul 2022 09:37:55.8649 (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: VI1PR01MB4574 Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/intrax8: Remove unused IDCTDSPContext 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: a4IhwtIgeK6T Signed-off-by: Andreas Rheinhardt --- configure | 2 +- libavcodec/intrax8.c | 4 +--- libavcodec/intrax8.h | 3 +-- libavcodec/vc1dec.c | 2 +- libavcodec/wmv2dec.c | 2 +- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 8c7e8c9d1d..974768a663 100755 --- a/configure +++ b/configure @@ -2733,7 +2733,7 @@ h264dsp_select="startcode" hevcparse_select="atsc_a53 golomb" frame_thread_encoder_deps="encoders threads" inflate_wrapper_deps="zlib" -intrax8_select="blockdsp idctdsp" +intrax8_select="blockdsp" iso_media_select="mpeg4audio" mdct_select="fft" mdct15_select="fft" diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c index 73b8aeea78..b99e8590b1 100644 --- a/libavcodec/intrax8.c +++ b/libavcodec/intrax8.c @@ -25,7 +25,6 @@ #include "libavutil/thread.h" #include "avcodec.h" #include "get_bits.h" -#include "idctdsp.h" #include "msmpeg4data.h" #include "intrax8huf.h" #include "intrax8.h" @@ -692,7 +691,7 @@ static void x8_init_block_index(IntraX8Context *w, AVFrame *frame) } av_cold int ff_intrax8_common_init(AVCodecContext *avctx, - IntraX8Context *w, IDCTDSPContext *idsp, + IntraX8Context *w, int16_t (*block)[64], int block_last_index[12], int mb_width, int mb_height) @@ -700,7 +699,6 @@ av_cold int ff_intrax8_common_init(AVCodecContext *avctx, static AVOnce init_static_once = AV_ONCE_INIT; w->avctx = avctx; - w->idsp = *idsp; w->mb_width = mb_width; w->mb_height = mb_height; w->block = block; diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h index 5b8946ea25..3ebbf73434 100644 --- a/libavcodec/intrax8.h +++ b/libavcodec/intrax8.h @@ -44,7 +44,6 @@ typedef struct IntraX8Context { // set by the caller codec IntraX8DSPContext dsp; - IDCTDSPContext idsp; BlockDSPContext bdsp; int quant; int dquant; @@ -86,7 +85,7 @@ typedef struct IntraX8Context { * @return 0 on success, a negative AVERROR value on error */ int ff_intrax8_common_init(AVCodecContext *avctx, - IntraX8Context *w, IDCTDSPContext *idsp, + IntraX8Context *w, int16_t (*block)[64], int block_last_index[12], int mb_width, int mb_height); diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 5c5b31ad32..b53490b3ab 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -391,7 +391,7 @@ av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v) goto error; } - ret = ff_intrax8_common_init(s->avctx, &v->x8, &s->idsp, + ret = ff_intrax8_common_init(s->avctx, &v->x8, s->block, s->block_last_index, s->mb_width, s->mb_height); if (ret < 0) diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index e61b549439..6d9b72d123 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -578,7 +578,7 @@ static av_cold int wmv2_decode_init(AVCodecContext *avctx) 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, + return ff_intrax8_common_init(avctx, &w->x8, w->s.block, w->s.block_last_index, w->s.mb_width, w->s.mb_height); }