From patchwork Sun Oct 2 00:06:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38509 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp527713pzh; Sat, 1 Oct 2022 17:08:31 -0700 (PDT) X-Google-Smtp-Source: AMsMyM53SSx4xiS3l7s9nDDtDrZu4s3yBNjdj3KJbzCvAk+Jc6Mv+I6JoVy0vQ1Aa6tjVpWTsmtc X-Received: by 2002:a05:6402:26d4:b0:451:280d:3533 with SMTP id x20-20020a05640226d400b00451280d3533mr12885933edd.316.1664669311406; Sat, 01 Oct 2022 17:08:31 -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 sg35-20020a170907a42300b00780d58a6ac8si5713310ejc.804.2022.10.01.17.08.31; Sat, 01 Oct 2022 17:08:31 -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=Q1HvutYF; 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 ECE6968BB94; Sun, 2 Oct 2022 03:08:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2105.outbound.protection.outlook.com [40.92.89.105]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EF01F68BB4E for ; Sun, 2 Oct 2022 03:08:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g5F2RnygQ25jWDyHzqb9YhO2QAht0ckweVVcn+0gVmhIpxDWPMebJvOEZiTELosjMr+o9ClwgazjwU5D4QO5mriLFbONQMm8iZkGm11NmNSp2q0etyKchGrpOPeQE0R1zbkmWcYB882zX6wWgn2l7gil0dSsb/9mcEqzSocESO4w4R4eHG7YjVi9Z1HhSGAvpBneQwQJBUksohB2ic5kh1TFrpDFA8Vs+l8IgZ+mf1aGin3GfjryWfXVrVFh2zNVYkJmYGXD7pljMCEy8VY7PYtANYECGW2Sm9TQPhkQ77fuSg2cKmQQGnOVlt/VhiRZHqTfdfwZfDgwVwcK56CZYA== 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=z+79qgwo6fbgypBjOM/uNai62K4kV0iifknM/RG3nX0=; b=B1QkOAmvKLGK/3kpK6hSpum2FTmoeappyXNLgIuMan52vbX3p6rSc4McejN85A/SUShRRgWSDFHU/JLd9UdJK04UPdV1aT8NtKXvTVs5b9/DxB492uEmAIFchb3Izg9kaMAt/wjG1Q+0GocjRfdvjE/Ry4v63gr2GwXst2HegbdfiLRYf2hLoSaJsyU48mI8+pJCHs1LsTaDwmx9fdHK2j0OqTkaaQSGvbxk2OOUK9+sCBJjahahbbEb48NI9wim/iSQ90eXTN1hj/3XEGAcsz5gWPEh4EHAie1FlaCRJQfSIi5tlzUwLda+0Q2D4paSrF6MvfFGdrf/OzyTu0wdOA== 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=z+79qgwo6fbgypBjOM/uNai62K4kV0iifknM/RG3nX0=; b=Q1HvutYF35se4YEE5iKiIhn8A1C3EEySZ+aLCh0W7Sm05Vp8gcBign7UGxV46yXWcgUY1F106tYPIR8PpBqQo652OPZSCJWJ/NDjF6Egij3zUfnap/ZCcSvkczzrubRg/ij/CbWxwEehDA7CNG+ZBBKLTXm3VOY3nWnNzRKkLDZeVCBNNGctTfbsLEZdiRiF3oVAH+w7jTtl306L2BLEDKxH6ykmXxCw11Sj42DbB8z7vKpRRbx8pMt9z7Oe13BimLKC4bwZD3bdHV53dRPmVQNg1kqnFU4TDNWglH1MlraOn7ohmFIvwjDVML3x9CXcIDxjpfDHzXydbQ2uY4R0Gw== 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:08:19 +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:08:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Oct 2022 02:06:15 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [5gc+03HNv13lmQ8ZO35dI7Sc6HnBHWihyXXIeyvj4Rc=] 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-11-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: 7273de41-2603-4285-0c5c-08daa40a3646 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqRS+LhpAttTUY7UGhdHTSoJZzxcn8qZwE5APPAqfP05YIF0xFtTUbXfB79+4AzMII0yY0Hv3Mu1o6ieWeIQhAsjNfVCuGyVvAH/U5i9wNSy8dawzp9yGnvbPysdaW1vX8Us6NDdCFaofeeIk3FJy3a8Wcb1x68IrN4+j65uVT0jOcQtNE7WXvgdDA1gZ5eiZFrLtZWScT8s94VmpBpszwIeRtfrEzhXkG5TlIgi5DwbQUmFAif0zvimtFd8wSeMtKqio/pebpP40jVIfgF+10i0pwrD+ov1N+ApHO0pHck7ZFNxGZf50z543lQt4TzPLapI94bqxgU9UzRLxh4/J4c8j41ckzrANK01kM/+GIQoKchtPw7p0ruxCuzdgz7TuY8oqflfDFf2tghKVDsmKHHrCQkV5ddPyBLkFeA2SchZZl5AcuGQx7JIUxpGReFV0iErKI4H3QIFj946RrMbvmG4lKshKA+d5gpLa5WRWb45B7kdq2+rVP0dLGzZmxDtVno42JS+xvg2ywO3KSych324KSy4cVj9nqoPUNaV0lk5IO7fphCLhn1QAlQk9v7wozYV4dXsmPTYei24JurIRu6pCIuSgjyPA3p3om8KbQY3C4ItucfM0hyhQ5wD/WE8mbDBMYrkGAGwc0llUyjZDnCEn/hno/JVqo7Zxzt2OasF0nM/8nxc7SwL9qHA3ohtFA9JolbXpSreJFVz8HomegLrg0dZ3b7FHMu9RgT2q/rYnrNGV0kMp1xAjvvvAjiUVg= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: C4cHcIs/K4UmCN6B3RjeuJ8CrdtPG0n3sCMbE5SNoJERLkggnjM+mPY4FQX+cNRBYvZGJgylp0Ukq/6gND8fXhfbSr5KGnsWX2mFQvVi6RrieD4wrm3Op0b59cMCd5NrNPHCb5WrEsjN5jfD/KfGT89KRGxFizryUMTSZ355M4rpuUkdhd9xNWwsDB0v1iyLHNkbXTN2mLvgnlvc17CrOdR8QAuQdGNbf88/JC05vfVyRHcA34Ul3axj7P5AVOCxX2gJFxkp53Oh9TYCRJdLl9sTsT1+9DBPdD6rqTWjNprLurALS9LTUsmXpajKXUKJIV9vGUjTpUM6qu7Ar/q3wYvSpzmhsJe8zLLiFKEAx8qUfdxKvvWR3Vgz/u8m3poHtyPt2jW4uNhuXxyVlH/dX/X3SK9JBkQ75+LRZ7S1C6OCzJvhjpP04eNFE9QDBQ+Z6PFCRWMoTgCvlS3GTEBOm+ZrTc1omUocM+6vF5Os9x44KfhmTsbKbgcX5ZIg1HK1WPHZ1rT952McPPI2pm23h91E+VDowHEEUuWnviKwSfngHnICuXhjFJsupjJkozkaM0xHe7ijXeUSiVWIeHYxonNujlsPwa2YfFofol4Etq/CZC8kOBivj7UcoaegBlfzNxATlHbCiPfATPRduZAqntTD87IOLfkh/xUxJ0WpOvsrRs+2ZDuXOZDQ7eehiljF X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1pvL3Eg3TzmJSOrpGlRzQnzYyu7GQhUo7CMya2sKhy27+z5PXIMWQsJtDRLh48p5JY7c2Z/1PBh9ExZ8g6Rt5yuMkIB0Oyt4zJdvnQhH7SpJIPI9azzSVJ2tP1hNQqidsTUUgpBvM85+aymtHSMya4xx3p2qmxotm4e13+M6svAQZQKIdJnYP0ZrhHwDZFqdF3svSV4TEg8qV2NCbEpchG7RGprdoOiu7jO1E5w4UE33g0XOtIi9/RBrXXxviqR+B6qA1q+wwWKesVsGojrwn1rnMf+RDdnNv8FrvG+4NHYpQtgecuoaPQKf5Eju0jdyIJP75hWlWwhcnpEMX7wPzMNpJCG2ovNUjXBqt4GOavNyx59u40/Rr0Tny0T2paUtPcUQjOwJJ6cJd+CPuRGJDSSgHa0fBph83cFnI1bgAc2lRF8W3Ii/0bm9jjYpLhsSeJokbJ1ly3K1+XWY9SoJaO4lTxWaW4PDOc6dN7bFJ/q23I3pIoRGv2re4ULb5/uXSGWh5dUXAdMMMMlYaA5xiv0/7IteugtoT9hwgHBrPLsc25l6huzfU+Kk3X4zufbM+JgnB6uDXLvT7B8dB8TpI7OSwu27T+PrIruY4GTG9Gds5fvH+rDnyrILeYVv0mMPOCle8oicSRt6zlkFLhENZcjj3oreHSGYH9Q36CSnpWlNEYQW3VxkIFd46L1LzoVVuOkjHqtPiE5fZ7IMfUXsmq7C4vNF4CoLJ8aptWGuCn4VQpjd4GG+cuDUm8ZqzsRep9UccBD9UXuXwllXZHl/NZyzSZBorHomj3pg5VMo///EEnXVzyWUT3pTpRDLzSmEuzmzaLnFVIIXzh164sUkrob+Oo1ylA96Erfeu8d/qnZpFq3nOIpRkm6rQSW3b8Bhkz68QV5k6jaa0ManVeKvNcAIiB8919G/mahwfBkjcs3n9cHb4KXwo0DhIYQKyUHSfk1ESV4aPjQLHtikP8sFeEnQMEq/2mcUE2fiFacxvSqThVyRVvaoESSU7vold1zq+3CZ8wMwFYACLMNyNvoTqbms4i9806YKC6CMwErKMzzfM/7+fZORwOvUmVhnGjwtDbAB4LYFY/rOcz4ziGIFXgAue5OSXwtwhd0x/9Mr6kSKScuhvZ694EYrD/P/hZGyn28ecuthx1JhtWnob6GvKMnJCUKEqj1bEBEAtFs3a2ekyHpJIxDXv9VWqLZp0sGWFT3d8W5Jr7UrdpkVtPoPuL/v9dnVnunYF30I/z/hjO5uDoOF5ZMbpC8EXx3mYoSjlfqgjzyKH5nBmZhrsbZ2Tqw/ojaaPGHzcPFrakg89ls= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7273de41-2603-4285-0c5c-08daa40a3646 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:08:19.5253 (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 12/14] avcodec/huffyuv: Inline ff_huffyuv_common_init() in its callers 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: AWK2qaVYezoz This is in preparation for splitting HYuvContext. Signed-off-by: Andreas Rheinhardt --- libavcodec/huffyuv.c | 9 --------- libavcodec/huffyuv.h | 1 - libavcodec/huffyuvdec.c | 5 +++-- libavcodec/huffyuvenc.c | 4 +++- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c index 4a5bd53998..23a2bb2537 100644 --- a/libavcodec/huffyuv.c +++ b/libavcodec/huffyuv.c @@ -68,15 +68,6 @@ av_cold int ff_huffyuv_alloc_temp(HYuvContext *s, int width) return 0; } -av_cold void ff_huffyuv_common_init(AVCodecContext *avctx) -{ - HYuvContext *s = avctx->priv_data; - - s->flags = avctx->flags; - - ff_bswapdsp_init(&s->bdsp); -} - av_cold void ff_huffyuv_common_end(HYuvContext *s) { int i; diff --git a/libavcodec/huffyuv.h b/libavcodec/huffyuv.h index 92e390ad78..823a091809 100644 --- a/libavcodec/huffyuv.h +++ b/libavcodec/huffyuv.h @@ -93,7 +93,6 @@ typedef struct HYuvContext { int non_determ; // non-deterministic, multi-threaded encoder allowed } HYuvContext; -void ff_huffyuv_common_init(AVCodecContext *s); void ff_huffyuv_common_end(HYuvContext *s); int ff_huffyuv_alloc_temp(HYuvContext *s, int width); int ff_huffyuv_generate_bits_table(uint32_t *dst, const uint8_t *len_table, int n); diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c index 89db3db65a..093070e348 100644 --- a/libavcodec/huffyuvdec.c +++ b/libavcodec/huffyuvdec.c @@ -300,6 +300,9 @@ static av_cold int decode_init(AVCodecContext *avctx) if (ret < 0) return ret; + s->flags = avctx->flags; + + ff_bswapdsp_init(&s->bdsp); ff_huffyuvdsp_init(&s->hdsp, avctx->pix_fmt); ff_llviddsp_init(&s->llviddsp); memset(s->vlc, 0, 4 * sizeof(VLC)); @@ -545,8 +548,6 @@ static av_cold int decode_init(AVCodecContext *avctx) } } - ff_huffyuv_common_init(avctx); - if ((avctx->pix_fmt == AV_PIX_FMT_YUV422P || avctx->pix_fmt == AV_PIX_FMT_YUV420P) && avctx->width & 1) { av_log(avctx, AV_LOG_ERROR, "width must be even for this colorspace\n"); return AVERROR_INVALIDDATA; diff --git a/libavcodec/huffyuvenc.c b/libavcodec/huffyuvenc.c index 0e9b24c8db..5293d32d2b 100644 --- a/libavcodec/huffyuvenc.c +++ b/libavcodec/huffyuvenc.c @@ -210,7 +210,9 @@ static av_cold int encode_init(AVCodecContext *avctx) const AVPixFmtDescriptor *desc; s->avctx = avctx; - ff_huffyuv_common_init(avctx); + s->flags = avctx->flags; + + ff_bswapdsp_init(&s->bdsp); ff_huffyuvencdsp_init(&s->hencdsp, avctx->pix_fmt); ff_llvidencdsp_init(&s->llvidencdsp);