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 498B848D13 for ; Wed, 24 Jan 2024 20:05:53 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 76DDD68D11B; Wed, 24 Jan 2024 22:05:50 +0200 (EET) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2023.outbound.protection.outlook.com [40.92.91.23]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C0F2B68D0A0 for ; Wed, 24 Jan 2024 22:05:43 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RoL0ajI2jvCSA1Y2IhRiJ3AxRBl6tVTujyyQSG5zrDbSfL47rNX5TRl+jZAVF4znnJoCOFqOr8l27e7LPaDW/BvC+svflM13VbfBVMkvi00XSB60V4E8hB9SeUhkRwB1e/PxeFsqBp/GJPbVc94UaWK7fi/D4m4dpBHBJzNkyDNb8clcpFHUno+wvxXOz4SMez1cPCCyMvg2Y7lZ99JieZGGK2ZWZRvLEcDxcUle1bvI9M0UNB8WM9O67FZ9cRoym+IsSvlIGuIg2NG4LK6sNyrl4YTh93OR9D/Oh/k6UU2VM24DnyBD6SdrUV1/FwqSJgrML9IHItBlmFh16BByxA== 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=xMV3RZvmzHjhJmNRpB5FbSICI1knXxrd6kjD2//QAK8=; b=CqTrhhl3rOyaKKhxgk8psmzQyGniicXxt+R4Y6IfcsLlRCn3lRmZNenjsGR+RzkPigp1M6Z7gguEQW9bd5sbABZukA/PFi6aQglw4VPpUuWWpl1/c6lwqd4sxnqOWjpF6BKXCEeiSCDrCDf5jiag3jAlCQ0xL74T75t2KfZioW2avxLMj6yDMs/5GV5W3gDr/8KVt07I+MTnOHE+GgN9AirlmyoE+k7n3qFUVzdxGFlTFV5b37KtlO7dgheg611IGraGShJuhDghlThwRHTjmRals3ed16PRP50tYVCUK9BXZK9gA6up0ZCEhfNmikMINo2m8aosUGJfaF5hJvwUqQ== 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=xMV3RZvmzHjhJmNRpB5FbSICI1knXxrd6kjD2//QAK8=; b=E1C91jcpUPfdREdONR+759spuInphaG5ldS/qRMFAI7rFEC+79x7GM1u/k3iJWD3h1M2/CRcNTYEyKBFo3E2hDw1ZqRC+VjIHqgFCWx+tZ6UpcJmD9PHuNLdQZY4BsQV2sM1LJa0oUimqGa4ZIH9rPmU4av6hCckBnDzUZ4yAbOBkBSY8iNnRLhPCfLL44qoTXP97oEmTt+qmZL8Y1rV5vQnyCXykVsQVv3MZGBUQezDwazTX0YU0jDtFL8HSceHbbsLyRVUXuZ2B66Io++ZKNP2WmtvYmKocVdc5/Uhz+n68IulTU5Ju2BwkVnC35vvWDkyLJVBWyC5Gxdqdg/aRQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0064.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:23b::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.22; Wed, 24 Jan 2024 19:51:29 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7202.031; Wed, 24 Jan 2024 19:51:29 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Jan 2024 20:52:37 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [Fp1YK96PkTtxM0usB8aB3oItyJbEsy1/wobi7YyAqd4=] X-ClientProxiedBy: ZR0P278CA0019.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::6) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240124195239.558681-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0064:EE_ X-MS-Office365-Filtering-Correlation-Id: abe6b8af-f33c-4270-46db-08dc1d15db68 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nNvxN0aXRIAwogx0AH3IS21OEIZzN8yuwWSCZmnHLSVVoYczND77a3hFqKoKGZN99XUw0U1633hLzrTkZ+3M3NL3oIOAx8Az/i+8l+0b2TM+sAmqqzAyX4zTVqHGqf/MkKGcr7/E/q56cfZhuHFySbqEmsu9f678D87DK0gBZEyG5KEuqGwXTuGkB7t0XZmETYtqx3cmYhnVc175ZYFK6Tiypz1yETeRgE4DpcRbE9p/bWsQpvZFy5gzoTwZuwPJwt08FsADm5GAYNR4TWS06suHr5+e06qpvLdAywbC3HS7eOmkVeyZ4hI4lbz+CsSZotso36TlgwNh0cc3Co4LRqfs729CUp2B2iFZryhQZT/3fcBsBAYyG3Q6G+5WgKa6d2rNjhAwo7EDHDKJM0sqWKXmiCLNO41eYbvINPVow/dGMxjwE2d8dLpwegNBIjnK5FaEc3jrM+LS512nCGdm/qSwQmpuFvF2krt9GhIFu4DrjcgDhN0g1eyNBZQbiyIoONdintxsRPuQfOiQMV3LNaCC9QTpDlRoTt99lNuFeNv1uHtMeCCXzVK0ECjUQ56qIu3W8TgNb0+YZ6rIl2Ct3badQHv1Q7r/Sro6UbSM8X4Mf87rAYqCtd+UqKK21gne X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?swxPLy3LraAvYbqXrR1b2pLk5obO5svbSGMmN96J3IZlC/nJTyAw6ZeHTbSK?= =?us-ascii?Q?k0h4amg0jhDWqTeIWepJxR876/O0TT3Cdzm+TEF1kt8/zFjMdsepYdER0qR1?= =?us-ascii?Q?VOX8lfkJ1KHFVXvVyDIKRWU+d2QiUYDMJQ5+K85i6SrcVhd/XyG5RIXiqsuV?= =?us-ascii?Q?rVmNr1oyhDPsz3XDnrxYN0AXLZKXepRJWTVFZMGCT+3cyfxu1Hu157Bl0iTE?= =?us-ascii?Q?g4esAGARN1dcxBecIJqt7VYO8ugvYsPz8di/NisTHgwDYrENQk3cjci70Oxw?= =?us-ascii?Q?lfCSx6hmiOGuYljcI9LR/efj9vyEOCT4e1ZHYFI8mg6GepblTkZ7EoaGU4ut?= =?us-ascii?Q?ZfSlrmxbmgBHRGhJTd25gqlU4A+AOOUVGFcSSm4CGitsuhEO7n/ZlAzANSP7?= =?us-ascii?Q?ceoZOXWrGjMJ3Fr7hOPpQVcU7Bf8jDGrb32A5Hcft4Rn9buFn5sDzMczNCKP?= =?us-ascii?Q?Bi+GymaYe6iT7ZCDxwas/KK6Q1RtMxVZbvSQzt52uXdCFnExuLZ+Lv5x0ZWx?= =?us-ascii?Q?UOUYS+xtS5O1nUHvu9KIv91+nqi8EdW+yyTow/Oy1lPsnxq4P86A8hbv7Z02?= =?us-ascii?Q?G7hCp2CLa7h1nWWpU4CLB/P9un9DLNKrBFBbRxFXmbU9PapltYSDua67E8cP?= =?us-ascii?Q?Aly2ClZZb+AVycFjWXYGKqspAjm9L0LUBe0GKTVJEMKoZTHNAfyF6T4yjFpg?= =?us-ascii?Q?xxaaUlqBXtQAI+4cADsllNgWGL/yDcQgIWlHX9JBYdKecoHYnLcTcto0tKsr?= =?us-ascii?Q?LWteoO7CZtMElv7KmY9lSI8jkyS00qCWR+4CIiR+kVZts9gXfKIzkyTcRuei?= =?us-ascii?Q?wAa4y9hfx5H10neX63DfoL7I/el+KXUS2z2G55h+PzhO8vAK1nhejdRlGoxW?= =?us-ascii?Q?UsGfRp4kDwoRtohurrWirK5Vi2UlhI/KIts4v1DeXJ69/56+4YAtl0k89Irn?= =?us-ascii?Q?WbLNl/h/WKqL1CMhpKxEvOPz6p/zyysgCG4fluA6NxQf+nt1ZgILnLwOulEo?= =?us-ascii?Q?u1eOadOqOdwBAvb877QXp/SUeA4B5wbkxt3l+Q/9VcUp4zjwKkaqKdzyij7N?= =?us-ascii?Q?87/9yqxgr/7aQ2Z/Raj69uceQV0tRQVGpeJjXOxEf+sWsQrpjVvFxOlyuCQY?= =?us-ascii?Q?+IL0fC1zyadj6nWdweXJN227wueN54sOg/1dY++oDmEEpm8VR8UQJwcvw1sa?= =?us-ascii?Q?y27HAtMbV2CZcuNQOvindpsDY+949r1C7PPp8zuM65+aiK1+RpbfCKglDjsG?= =?us-ascii?Q?cLzeRCdPC0im+oevM8Qq?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: abe6b8af-f33c-4270-46db-08dc1d15db68 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2024 19:51:29.3985 (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: DU2P250MB0064 Subject: [FFmpeg-devel] [PATCH 5/7] avcodec/texturedsp: Add separate TextureDSPEncContext 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: ff_texturedspenc_init() doesn't support most of the function types supported for decoding; add a separate context containing only pointers for the actually supported types. Signed-off-by: Andreas Rheinhardt --- libavcodec/dxvenc.c | 2 +- libavcodec/hapenc.c | 2 +- libavcodec/texturedsp.h | 8 +++++++- libavcodec/texturedspenc.c | 2 +- libavcodec/vbnenc.c | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/libavcodec/dxvenc.c b/libavcodec/dxvenc.c index 796f70da02..280a965685 100644 --- a/libavcodec/dxvenc.c +++ b/libavcodec/dxvenc.c @@ -266,7 +266,7 @@ static int dxv_encode(AVCodecContext *avctx, AVPacket *pkt, static av_cold int dxv_init(AVCodecContext *avctx) { DXVEncContext *ctx = avctx->priv_data; - TextureDSPContext texdsp; + TextureDSPEncContext texdsp; int ret = av_image_check_size(avctx->width, avctx->height, 0, avctx); if (ret < 0) { diff --git a/libavcodec/hapenc.c b/libavcodec/hapenc.c index 2c8bc8e16a..92cd9c4d31 100644 --- a/libavcodec/hapenc.c +++ b/libavcodec/hapenc.c @@ -232,7 +232,7 @@ static int hap_encode(AVCodecContext *avctx, AVPacket *pkt, static av_cold int hap_init(AVCodecContext *avctx) { HapContext *ctx = avctx->priv_data; - TextureDSPContext dxtc; + TextureDSPEncContext dxtc; int corrected_chunk_count; int ret = av_image_check_size(avctx->width, avctx->height, 0, avctx); diff --git a/libavcodec/texturedsp.h b/libavcodec/texturedsp.h index e15d3c2b02..6de8fda690 100644 --- a/libavcodec/texturedsp.h +++ b/libavcodec/texturedsp.h @@ -62,6 +62,12 @@ typedef struct TextureDSPContext { int (*dxn3dc_block) (uint8_t *dst, ptrdiff_t stride, const uint8_t *block); } TextureDSPContext; +typedef struct TextureDSPEncContext { + int (*dxt1_block) (uint8_t *dst, ptrdiff_t stride, const uint8_t *block); + int (*dxt5_block) (uint8_t *dst, ptrdiff_t stride, const uint8_t *block); + int (*dxt5ys_block) (uint8_t *dst, ptrdiff_t stride, const uint8_t *block); +} TextureDSPEncContext; + typedef struct TextureDSPThreadContext { union { const uint8_t *in; // Input frame data @@ -81,7 +87,7 @@ typedef struct TextureDSPThreadContext { } TextureDSPThreadContext; void ff_texturedsp_init(TextureDSPContext *c); -void ff_texturedspenc_init(TextureDSPContext *c); +void ff_texturedspenc_init(TextureDSPEncContext *c); int ff_texturedsp_decompress_thread(AVCodecContext *avctx, void *arg, int slice, int thread_nb); int ff_texturedsp_compress_thread(AVCodecContext *avctx, void *arg, int slice, int thread_nb); diff --git a/libavcodec/texturedspenc.c b/libavcodec/texturedspenc.c index 54cf6fe6e0..ffacf96d56 100644 --- a/libavcodec/texturedspenc.c +++ b/libavcodec/texturedspenc.c @@ -647,7 +647,7 @@ static int dxt5ys_block(uint8_t *dst, ptrdiff_t stride, const uint8_t *block) return 16; } -av_cold void ff_texturedspenc_init(TextureDSPContext *c) +av_cold void ff_texturedspenc_init(TextureDSPEncContext *c) { c->dxt1_block = dxt1_block; c->dxt5_block = dxt5_block; diff --git a/libavcodec/vbnenc.c b/libavcodec/vbnenc.c index 7ce91863d7..01c2482bff 100644 --- a/libavcodec/vbnenc.c +++ b/libavcodec/vbnenc.c @@ -36,7 +36,7 @@ typedef struct VBNContext { AVClass *class; - TextureDSPContext dxtc; + TextureDSPEncContext dxtc; int format; TextureDSPThreadContext enc; } VBNContext; -- 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".