From patchwork Sun Oct 2 00:06:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38504 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp527418pzh; Sat, 1 Oct 2022 17:07:38 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7A3r/XKSmQU7AsTSxEe8zUGLjba02XYtknhy26DTUh8SZZhZ82t4p49UQW1q+kC9StGhLM X-Received: by 2002:a17:907:9812:b0:781:bbff:1d20 with SMTP id ji18-20020a170907981200b00781bbff1d20mr10873143ejc.33.1664669258201; Sat, 01 Oct 2022 17:07:38 -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 mp31-20020a1709071b1f00b0073d64fca704si4537307ejc.36.2022.10.01.17.07.37; Sat, 01 Oct 2022 17:07:38 -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=UoVvdN0b; 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 E972768BB65; Sun, 2 Oct 2022 03:07:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066093.outbound.protection.outlook.com [40.92.66.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 20C5468BABE for ; Sun, 2 Oct 2022 03:07:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nyMW1fq7g2hznAIzWkJq35eqCnL39UucHIjPeWZEpsUbzZNLpDNONmLGDkt5IYlQ/FgP9/UwQE7xitEVi6q4DKXthFKxm+7c5evwSJWtUEDrPixpbEVMo1BXfDAVpEq00zjykRCWElkxc2zKieiMtI3jSICVKvkjFruKLTG9bL4nEBnj7tVdkwPbnI2850rqk2+ZHwS/7vGPGhKnNhHIPiB+9B7kXjrBtxTEPs5FiueJUdbD4NzzphZbph4cTKx2egMXHL09xkbEmBBDCawzZLAqD9cj72osTnWE5rb7p9ycBSFJaOO6LPjPAm2GPcwlsQX5Jjtv/S/RDzsjKRc8mw== 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=sYKhh9ZcpZAcNbo8WwKQ3v4sOfaSwnXZkyOd552q9GM=; b=Ul4tJDCm9He7D0VkyhderdTjhv7EpH/odPH4aEJ45UcMgfftHlkkXSKoE/LuDy/r0FvaINXBGKM+FNVk67eJARSsi37T+O3KzNkr+IuXOEnyRHeZQT+a9oYi8D7EIbQaYCdxUGB2FW1Ka6bKxBgSul+MfkO+iTqIcj5pItuQxNpUSV15t7oeV1OPAHUY/FEML5Bt7yaCimWHkRmimYPKkp1T8Enr0SZ4R2cRBm6uc7GLtwyWbBLHiyi8AJsznujs6xY1mrOMvtdm5GlVMyrjODstXVod/eZE/7eTgYDZ1Bvsj7OsmpLzyCpCI8xUw+OHgBfksXuEEuLQe0200weohg== 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=sYKhh9ZcpZAcNbo8WwKQ3v4sOfaSwnXZkyOd552q9GM=; b=UoVvdN0bhKM1JNCTB3n2YfIswXZkynpEC1nFAzn611H8qUXNtCiZc5GL7/EQ5laEAVUbfO3ifkn1ktyVyUqQiF6Cd6gIstbR7urhCWXtJmrSUlP6juXu9COIayTsIoBIIm8X8DRQ9KFz4LMhZLoPKGjmFtlmkXo2zlQGF9KzyoFy04LF+2au7m8i0cYxFXbZbW3RvzF0t0emrbfs7NWGXXatRaWK+mQb/mqpF5R8UK6orNtYQ4tXlxKhREHA3DHBe4oQW3cyEEzDA/G7PkHpkCiecp09F5cPiNgigYTFyeEo09nbvWie0VGwKHtH301HyrrgiWiF7EtdkcxbTpw5YA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by GV2P250MB0997.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:d7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.23; Sun, 2 Oct 2022 00:07:26 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8%9]) with mapi id 15.20.5676.023; Sun, 2 Oct 2022 00:07:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Oct 2022 02:06:10 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [csSBwQPCivwrYqibODumeetMGoiz0u5KwzzCJK6Kqc8=] X-ClientProxiedBy: ZR2P278CA0010.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::14) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20221002000617.469194-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|GV2P250MB0997:EE_ X-MS-Office365-Filtering-Correlation-Id: 39e20d9e-807e-495f-79ab-08daa40a16bb X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqRS+LhpAttTUY7UGhdHTSobAHkFdROaaUXt1itC/3w13gQsgkRwOKLCr9XNisj/7gFjY6nxwsVn3S517+j+E34+VZBQEZmgF9DMGQsew377XVAEdpBRySYVIVCrHaGcKOGuEJAll1O0tAooBnzAcTvUxSC3VNO7MT7zsE0GPj31ydyxA4XdoYteGzX/uesK3EXZFDuToJMyEDvKIAaTGIHkoGC1qKdn6gNHQAtTlEojv1QioljBZuGfrTsrxjHXatUMXC1bBioTl6PUjat9BH0p4aO+udNmsTxcybZSZw7dIfFyTVQS2S7YWOeCi3qx2NFQY7vVv7mgEyA3BrqXNjHqebKqHc4D5mCT18IrS0yJjt4FKOFDOaU7IUqeMFrwSqhKZFgbyaP55it6yMSWy9fXl01sILQBE5kbjeysds3N4M8AA26aoSj4SGbdzIY0gPhq5ncVPTwJakSm+D2H+WaWLK/svRjXcqajArxzLglqCYHbiM+OX8Rr79ZjuuuDU0VKL1hSoHuEXO5Qylqgsxgl0mKFEGAk9Hb1kM3Nq5shu1DzCUcRnBQCl8eagfUFld5yAs4qAdmYEhsFPZCflpJql6fAp/QYFXikd4SnK5mNYWn98jYUKz/L5dehgaQyNuVnpZtsf0JbdKIocUbpWFkYfr4/TkX/zspzwY0WvxeBvihrKeC1/f2S28J6blrmG4+Sv1dcOCWw8vytwsUFuravo86PaRJj9bs7JRndkWOvrcr6TVgbF1eccc5vswpVrU= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3wDRQ6EmM3tg/EEE7fXrl1Z+ECw5sM7gqgukOm4xeVKrakp+KJj4bfeReJhCVCA87DQJx6blqPMSxKx6JwgDM1IShhdg/+Hx4yC6u0buk0HFrm+BdDqEbaHCAYckBoZdCb5wrnQgqFJLCIT7Hnvxa6Ogs/izkTp8ANhTswHjmm/wFNzMaoIpNOAq7QggL+S+hha0n7IYNYDNYeepouIOfg58T0japN8J9c5XDpiXyzsKAHEV06BF02se3HUvtNrWElL0tBB7FgnXdBtLwcyjnsnz5ZWFYdCli3nPWRKp+TEG68+uxl/Sawe6OxTZ0tqq7JvzXt03RQRkQ4EpLEPAU5W869FgSev3oRhApquFonTDnK/F33eSq8fjbDi1itJhIFX8yc2eL+GwHyeCdOLTRshzHEL5l5eVh3koGK79uuF641sMJAiYH0uE5EZ4xyod4Nsr9rRy7898pzH5H9lRaVYBSpjABXRvEvfID2scQ75M3RZjzvIRutsiP6m/zW8QyLZEplD5HHwgm3iVrR7IzIWhudccWzSX7i40Tpm+odF+Hry95veqTrh5CxRdmt6jHYzp1Vb/qgr/OCQTRllRmY4dDEo52t33/rlFLBJY+eX6wmM1oa/7uv92a1QPbatBr4UarxPtM6BDCwlZpHZ9mxD4GbP0C3wWOMIOJcBgjjqf8WJBpXQzWbMnJICR3+Sm X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AxJxbzib8T7rohJekhHblQ76l83o3k1/MY42ZRZXN3GDppLp6hq+cbjIF+cGiJh45GgbBrUv8wGBexy0QVB2xJVma9sNjwK2FJf5/OoNynbol9aJPP0+WPWt8jSNudx9WXTNP24FtVdSkWcDfCEwkFbNL8LsCkTdGdxAYWPu7Y8gzfHZBKozPsgJCHTlM6Lh7t59GyvORQn3zlANbNV7F8KGfduxTUtVqhN354++f6Aa4pb5D4isSG62wDNpIxugJaQhYAGtAyp0ry+nZROzWIcnBSHQOXbET5D+4ySl4mNmdwkesQ6DaRLeO+Wgpg1dIpSyAuwupFWRO+w55UBfjEK5Ua+C2X9P3LCKN1HKhx5zR582YQfu3S37LwWmFTS8mVPoFQALomuD2ZuAmCGbRt3OBMKnBSmZfEOv3PKuXjF/meNEpHRaz3yr4KjSSxwqSfJv0AiEh2vXC4x444DBpN8D4vdN0I4bYTbFb51a61PehZsMDj6kJgNuYl9ACm59uFFn2AJSfRiDlIa+AdtXYoSAbOJZTyrc/y5+89hIL0JRva/8Yw5rFrKzENZiNprzK5IjoF7KUC6SVsrpsKq8QVF7cgOT6eL713PXf7jeRlfSLIipVBQEtlnGjL7on/0dWlXB3xt/ZinMeW1jGx1gCZWEz+CV6iMxqOkIMnJJIegsjSvuJKHyZ1eKpFqMXpkHEFgNDzwXgggKEVDf2QjeBCR7HUXYKD9DzQL8/oHFUkQ+iElVtAve5eANpVPHRQhiehB+5eDqG2+2PFUvotqyTHDCiJmtD9Kwd+P9CtovA639w+d9f1V9OeISxxxHhKsWNldpZtbi6wGykg3xPB84b+mBmNxXEwv+oNLUSX9DnS8b5sSt0xApFeD0Dh7Hpx8X4hqjQKHU28/LOQbtiveSdvyjXr+ONctlz6RB8Lefj64MoI45Vhg2TsUb2aXEo6lWk3djSMI7f3va0imW9IKxK6Cr8BsLwFXPRks58R3HiOMe+BF291OrRPqJQJ71GCceEXF5lNwfR6aL0ZigYiSybmOoOnDeiuHI7VGWNr+V3LiXrcfVHLnMARVZyrT7nolRgLq6839pN6HM0iyOy9q110fqTmswn1L4/TIHDFhiBkOtErjUind8WimUOSj5DPXRZiybz/ZOnhFp+xdnj67HVJgtCfjVyJ+llvUh89joZ22g3zOUvMgBhShnVCq4+LdRKcCYI9OKDKD6ue00FWJPSLPWlAOQZft9WW/D+PyW2YpEhWgx7CUTqY7BIb94Zek7BeBcA8Zzq0s+I5cK4NKtB/fMQXa4OQjVUPHQNlGAcFFYO12W2jS7dnaiFwpUZtpS X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 39e20d9e-807e-495f-79ab-08daa40a16bb X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Oct 2022 00:07:26.6078 (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: GV2P250MB0997 Subject: [FFmpeg-devel] [PATCH 07/14] avcodec/huffyuvencdsp: Pass pix_fmt directly when initing dsp 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: T9ajQuh6mwWC It is the only thing that is actually used. Signed-off-by: Andreas Rheinhardt --- libavcodec/huffyuvenc.c | 2 +- libavcodec/huffyuvencdsp.c | 4 ++-- libavcodec/huffyuvencdsp.h | 6 +++--- libavcodec/x86/huffyuvencdsp_init.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/huffyuvenc.c b/libavcodec/huffyuvenc.c index 84ab7f423a..2137a16714 100644 --- a/libavcodec/huffyuvenc.c +++ b/libavcodec/huffyuvenc.c @@ -210,7 +210,7 @@ static av_cold int encode_init(AVCodecContext *avctx) const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt); ff_huffyuv_common_init(avctx); - ff_huffyuvencdsp_init(&s->hencdsp, avctx); + ff_huffyuvencdsp_init(&s->hencdsp, avctx->pix_fmt); ff_llvidencdsp_init(&s->llvidencdsp); avctx->extradata = av_mallocz(3*MAX_N + 4); diff --git a/libavcodec/huffyuvencdsp.c b/libavcodec/huffyuvencdsp.c index ea1ef911b0..36e8f6130b 100644 --- a/libavcodec/huffyuvencdsp.c +++ b/libavcodec/huffyuvencdsp.c @@ -68,12 +68,12 @@ static void sub_hfyu_median_pred_int16_c(uint16_t *dst, const uint16_t *src1, co *left_top = lt; } -av_cold void ff_huffyuvencdsp_init(HuffYUVEncDSPContext *c, AVCodecContext *avctx) +av_cold void ff_huffyuvencdsp_init(HuffYUVEncDSPContext *c, enum AVPixelFormat pix_fmt) { c->diff_int16 = diff_int16_c; c->sub_hfyu_median_pred_int16 = sub_hfyu_median_pred_int16_c; #if ARCH_X86 - ff_huffyuvencdsp_init_x86(c, avctx); + ff_huffyuvencdsp_init_x86(c, pix_fmt); #endif } diff --git a/libavcodec/huffyuvencdsp.h b/libavcodec/huffyuvencdsp.h index 603f9c8c2c..779a51ac79 100644 --- a/libavcodec/huffyuvencdsp.h +++ b/libavcodec/huffyuvencdsp.h @@ -21,7 +21,7 @@ #include -#include "avcodec.h" +#include "libavutil/pixfmt.h" typedef struct HuffYUVEncDSPContext { void (*diff_int16)(uint16_t *dst /* align 16 */, @@ -34,7 +34,7 @@ typedef struct HuffYUVEncDSPContext { int w, int *left, int *left_top); } HuffYUVEncDSPContext; -void ff_huffyuvencdsp_init(HuffYUVEncDSPContext *c, AVCodecContext *avctx); -void ff_huffyuvencdsp_init_x86(HuffYUVEncDSPContext *c, AVCodecContext *avctx); +void ff_huffyuvencdsp_init(HuffYUVEncDSPContext *c, enum AVPixelFormat pix_fmt); +void ff_huffyuvencdsp_init_x86(HuffYUVEncDSPContext *c, enum AVPixelFormat pix_fmt); #endif /* AVCODEC_HUFFYUVENCDSP_H */ diff --git a/libavcodec/x86/huffyuvencdsp_init.c b/libavcodec/x86/huffyuvencdsp_init.c index cc6dc5a560..c9c33b75b4 100644 --- a/libavcodec/x86/huffyuvencdsp_init.c +++ b/libavcodec/x86/huffyuvencdsp_init.c @@ -35,10 +35,10 @@ void ff_diff_int16_avx2(uint16_t *dst, const uint16_t *src1, const uint16_t *src void ff_sub_hfyu_median_pred_int16_mmxext(uint16_t *dst, const uint16_t *src1, const uint16_t *src2, unsigned mask, int w, int *left, int *left_top); -av_cold void ff_huffyuvencdsp_init_x86(HuffYUVEncDSPContext *c, AVCodecContext *avctx) +av_cold void ff_huffyuvencdsp_init_x86(HuffYUVEncDSPContext *c, enum AVPixelFormat pix_fmt) { av_unused int cpu_flags = av_get_cpu_flags(); - const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(avctx->pix_fmt); + const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(pix_fmt); if (EXTERNAL_MMXEXT(cpu_flags) && pix_desc && pix_desc->comp[0].depth<16) { c->sub_hfyu_median_pred_int16 = ff_sub_hfyu_median_pred_int16_mmxext;