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 66706474B9 for ; Fri, 8 Sep 2023 14:06:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5A44F68C59D; Fri, 8 Sep 2023 17:06:23 +0300 (EEST) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2067.outbound.protection.outlook.com [40.92.90.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E01BC68C704 for ; Fri, 8 Sep 2023 17:06:16 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cKpqNoNWeNSuSgw2ILJplIodvYBu0aSPWBbA0ho1S+1/7K507CRpZ/GAbpxGdnoSJLMq0B9/czSItn1K+xDGEHgKqUAdYBNk8wNmD2dYEIUl2dV9OPyDRXB/LqFD1XfiEc1+MnaF/zMmZGq+p7be28fZLIfP7fMlgFsrdoJPkW+blCXWDf3G8f3Bboa7EhkpimbYyEodpTVjsV7gPlc0bRJ+2CGUUGdmBh36DpMypVynwPsyKyl3UZRxPJBWOOg2U+8hDxRObjguehFE229eWT2nwz3Ix2MBiGQy5Yv1FTxUyLEREQB8XU4Ynoc1+DYc6c2zv7Jf7vT7HeGIdHtP6Q== 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=q3YcgWumlQ68IC9S2J+cTC9O3fexTwSm/5BglFX7X6A=; b=Dqrc4CEsv77ZJHdfXN5gPVj1qHrfxX8uI7bAWKj+CsZiPT6TyeS4qiNA8/ntIsGFYtEOi3bzrBhhm2Un06ViwJSXTEHb/3vKbXm2sY4rA+uHWCzKOorGAGiq5HemGTErfuXJw0rb8SyKTimkdzq0CC5wjoyUxnbNyXMj3rpjXd4SSnV78TOPzQ8bfUjhFQgwO/itLiWfeYT57WkYfDj1RX42tLOynVrGdkVwz3gTpxsevp5Cv3YF46PGK08bgYYSTn/1+LzHxG/kGBinNQRLVkUPBUserNku/FCXLXdiz2WOJoxbp5HAhWOnhtFKfFaCpSTd5iTpxYIBMIzGobfqhQ== 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=q3YcgWumlQ68IC9S2J+cTC9O3fexTwSm/5BglFX7X6A=; b=pjya4M2Zt4i/HIuM1jIZlizEdAoKk/+d61XlD/2Y4Lj7Yplo9I6TF9Xw/zDa22FBZHkWqsCD154yIMmgYuUDskilT1npV2xvTGTZo7ragFbFYW2sEUnQKf8vElvWypEVWexC5KIQ6MJ4JQDcP3YXC2KGWulrxg0AnzsSADf/TZLKV0QBckuwUf419aUzxOuh3TP/sMjhWSaTe0YgXfybRIQoTnYJXnCrZDceQiTlgKzaD+JCXZ+LOSqaXJQ+3VkH9SbJ5vGBZ+8/4owMMQHWH3tKZP9tZKEM0G/0zQPHm1eRicU70PZ7hzY4+Vg632uCyNty0wkXV5OQ24J4dQr3cA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0206.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:277::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.30; Fri, 8 Sep 2023 14:06:14 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6768.029; Fri, 8 Sep 2023 14:06:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Sep 2023 16:07:22 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [gf5pYBG4WyOVFZy3yBVl5Y0Iw5bzGAzb] X-ClientProxiedBy: ZR2P278CA0069.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::15) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230908140727.2150730-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0206:EE_ X-MS-Office365-Filtering-Correlation-Id: f6dc7c57-7c65-40a6-2a80-08dbb074c315 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fQYLx1EG7qPH9vwckqZHLpW7zIOlh/X2d+Aw0HOsEDkB4tI5iuLCY++0udPRIG7DVWn6L677jbP7Ei0aNKQ7aUyRiPqst0PNzjzj4QiRJKCx+u5qngdhb8NVol9/XTw64VwbV1y5YQcj5XR9WaqrBG0AoSoq2phYRyg/uuSb66UwH0OzwCauJd52vfwtcWdfllTRHwhVvZSgT7RmkRnDIC6Ir7GxQi7udiRcZ01xe/LaHVCYH0/6ZAKR+AkrhD3WIRkT81pi0worF+TQ83p+R08P95EdADJS7DuXN6pjosgTzewkdRGzFdmTj4twr59PcibWuYPls/d+WSmVWUAM/EZ+ckDSnwBJ/5Ak2SZtr0xJ9jMBluHz7ZdVK3LbiGgDrZ7RGmyzuXOFPYhSl7RBLgTYg1hkXoj7eQE65y+NaflQ0o1/sfWV4jheWYTcKU3oWVxUbWEoWLSKZy/7i9cZyFB2MP1KgUIli/RxFPjNR1MLi8eAI0kaVdkb/sZ4Hn9NBkqY43l9s16iUaikEjUa69yrocdrjR92KAYCFRgH0fXpNJTol1/D5QrScMFFuXxrFzkJSgHx5cuD3+7PXOPZkskT9r+e4rl1HmA7uDY6Fg/mc2aCjtCK1Yi+5Mmqcc9g X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?kl+y/qY350zsEVPo69WuSh0Tz9pnLMHhNEJpZhiJrvIR6Y0p1BUJhVPB1EdU?= =?us-ascii?Q?+RNirZMPIMn5JHL6/XMyEIG8JmewctlF5MZ7iOyS1mcdBgGBrL7kSyh0ggbe?= =?us-ascii?Q?ws+nyege1fxiZL+ylBFaJ/+239h9zjULEo8hoKdkK6q6hm2yEEEIVVUAeb7w?= =?us-ascii?Q?rIH8ZaDPbSDBz4OZZrEqUj4vQI/APBwp2PyojCi2KKkfem2ai+2/59y2uTDR?= =?us-ascii?Q?wTYB0N5j0yYCLG+bkEHQ1NivDXwrM9EaIKWJQBnB6Vbqaxny6j21LzxMvRDL?= =?us-ascii?Q?+zhbkjU+cy+4mWUff8O1eb5nkRyUzuE5LwwwZEXwx5kMqKjOpQkpzH0eqvef?= =?us-ascii?Q?GOTLGeC/NN59E6xAttAOXcNU3NZY7ACnMu+/F54kUOgmd+ihhDHaeCvz0x/j?= =?us-ascii?Q?Rn7u1aQOCRG5b3MoV0J1qut9mpI+bikuR2vxXjNs3H8InSq4fXwDaRdNvrDf?= =?us-ascii?Q?qafFd9lmisXV6NVwhmIt+qSn6DXmkt26Z42e4XCVfWgWjhXrykAYOYQdbfMi?= =?us-ascii?Q?YK9JBPOpmfGlAUJoUtZzgisRSoIMgZWQQR4zT2AhrAHyCyr9tc2uvqmDBa5z?= =?us-ascii?Q?A1LzPYnaRI3BRXaqSKQ2DRij154yIP2CG7RwFWqq9AQxjNPmo573cWHmuMW9?= =?us-ascii?Q?IBbOmOlwzHOnxUomKg1/sAKOwwc6U3sqIbjgPpVrwql1j30i4GR5Da4zU64x?= =?us-ascii?Q?Qsj5P6LvpyMsf1emTkNnd8vNe9eW5dBGuTZiVPugc8AMfDdyoAUn2Vr+cqqZ?= =?us-ascii?Q?CIoRudKpDBdVPSVg6QoiN/m4Bmj9DNqnJrfQ/mN/Hiur3ugn1nsq97g3v5D3?= =?us-ascii?Q?IyZ/EWnigWfx90cqUlhjKPcNdIQX9OKxDWCM9fU0w1HCgxkfcD3bq7WZwofF?= =?us-ascii?Q?aP2N9h/dKiAg7m15PqPcgryDOXRUObXEgcvcoNMJifpyjPZ2zbwIawWC3Z08?= =?us-ascii?Q?+FbufuUy99+8d5NGfeGuHdn78LC251D5OICr+JvMA6BAVJTP+LSdtXbYPtsY?= =?us-ascii?Q?1OWoCnmFftg2bOSAWB2ORC2jOTWSwRcD3p7uNQX23rs0SIYfBDricS6UxPfr?= =?us-ascii?Q?gp/Z0buzWCTkEqKshLuj5kp5DVvHwwg0jcLm7qRZDH3Y9u/HRW2x1pPSOklf?= =?us-ascii?Q?pEu4mQ2m6S0+WA/EMyVoRF2QqHweGmfIL90ybx77STpYZ8nGTwtzcjT7zfHZ?= =?us-ascii?Q?JoNZua5YWMCKP14V2QWNiL4993KukkLNZJuDKTeafDu9zvKTwBwCHIhLxwQY?= =?us-ascii?Q?nenj5oeeqr940ZxnN7ZO?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f6dc7c57-7c65-40a6-2a80-08dbb074c315 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Sep 2023 14:06:14.1350 (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: DU2P250MB0206 Subject: [FFmpeg-devel] [PATCH 2/7] avcodec/proresdsp: Pass necessary parameter directly 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: Only avctx->bits_per_raw_sample is used. Signed-off-by: Andreas Rheinhardt --- libavcodec/proresdec2.c | 2 +- libavcodec/proresdsp.c | 8 ++++---- libavcodec/proresdsp.h | 5 ++--- libavcodec/x86/proresdsp_init.c | 4 ++-- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c index 9297860946..2219971b85 100644 --- a/libavcodec/proresdec2.c +++ b/libavcodec/proresdec2.c @@ -172,7 +172,7 @@ static av_cold int decode_init(AVCodecContext *avctx) } ff_blockdsp_init(&ctx->bdsp); - ret = ff_proresdsp_init(&ctx->prodsp, avctx); + ret = ff_proresdsp_init(&ctx->prodsp, avctx->bits_per_raw_sample); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Fail to init proresdsp for bits per raw sample %d\n", avctx->bits_per_raw_sample); return ret; diff --git a/libavcodec/proresdsp.c b/libavcodec/proresdsp.c index 6ed01179fe..bc253e55f7 100644 --- a/libavcodec/proresdsp.c +++ b/libavcodec/proresdsp.c @@ -76,12 +76,12 @@ static void prores_idct_put_12_c(uint16_t *out, ptrdiff_t linesize, int16_t *blo put_pixels_12(out, linesize >> 1, block); } -av_cold int ff_proresdsp_init(ProresDSPContext *dsp, AVCodecContext *avctx) +av_cold int ff_proresdsp_init(ProresDSPContext *dsp, int bits_per_raw_sample) { - if (avctx->bits_per_raw_sample == 10) { + if (bits_per_raw_sample == 10) { dsp->idct_put = prores_idct_put_10_c; dsp->idct_permutation_type = FF_IDCT_PERM_NONE; - } else if (avctx->bits_per_raw_sample == 12) { + } else if (bits_per_raw_sample == 12) { dsp->idct_put = prores_idct_put_12_c; dsp->idct_permutation_type = FF_IDCT_PERM_NONE; } else { @@ -89,7 +89,7 @@ av_cold int ff_proresdsp_init(ProresDSPContext *dsp, AVCodecContext *avctx) } #if ARCH_X86 - ff_proresdsp_init_x86(dsp, avctx); + ff_proresdsp_init_x86(dsp, bits_per_raw_sample); #endif ff_init_scantable_permutation(dsp->idct_permutation, diff --git a/libavcodec/proresdsp.h b/libavcodec/proresdsp.h index 37ba76b8e4..966ba3d797 100644 --- a/libavcodec/proresdsp.h +++ b/libavcodec/proresdsp.h @@ -25,7 +25,6 @@ #include #include -#include "avcodec.h" typedef struct ProresDSPContext { int idct_permutation_type; @@ -33,8 +32,8 @@ typedef struct ProresDSPContext { void (*idct_put)(uint16_t *out, ptrdiff_t linesize, int16_t *block, const int16_t *qmat); } ProresDSPContext; -int ff_proresdsp_init(ProresDSPContext *dsp, AVCodecContext *avctx); +int ff_proresdsp_init(ProresDSPContext *dsp, int bits_per_raw_sample); -void ff_proresdsp_init_x86(ProresDSPContext *dsp, AVCodecContext *avctx); +void ff_proresdsp_init_x86(ProresDSPContext *dsp, int bits_per_raw_sample); #endif /* AVCODEC_PRORESDSP_H */ diff --git a/libavcodec/x86/proresdsp_init.c b/libavcodec/x86/proresdsp_init.c index bde79ab8c0..f7abbfa692 100644 --- a/libavcodec/x86/proresdsp_init.c +++ b/libavcodec/x86/proresdsp_init.c @@ -30,12 +30,12 @@ void ff_prores_idct_put_10_sse2(uint16_t *dst, ptrdiff_t linesize, void ff_prores_idct_put_10_avx (uint16_t *dst, ptrdiff_t linesize, int16_t *block, const int16_t *qmat); -av_cold void ff_proresdsp_init_x86(ProresDSPContext *dsp, AVCodecContext *avctx) +av_cold void ff_proresdsp_init_x86(ProresDSPContext *dsp, int bits_per_raw_sample) { #if ARCH_X86_64 int cpu_flags = av_get_cpu_flags(); - if (avctx->bits_per_raw_sample == 10){ + if (bits_per_raw_sample == 10) { if (EXTERNAL_SSE2(cpu_flags)) { dsp->idct_permutation_type = FF_IDCT_PERM_TRANSPOSE; dsp->idct_put = ff_prores_idct_put_10_sse2; -- 2.34.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".