From patchwork Sun Oct 2 00:06:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38505 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp527464pzh; Sat, 1 Oct 2022 17:07:47 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7NJIXkPCQmupXufXgEoigA5AYMqNbMHiKNi8gUiS6rKQwqhYbE9bj+EMroOCfwb+tSGpFH X-Received: by 2002:a17:906:ee86:b0:741:89bc:27a1 with SMTP id wt6-20020a170906ee8600b0074189bc27a1mr11215460ejb.725.1664669267368; Sat, 01 Oct 2022 17:07:47 -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 j6-20020a05640211c600b0043e1c8af8c8si6210824edw.241.2022.10.01.17.07.47; Sat, 01 Oct 2022 17:07:47 -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=U8cUb9XV; 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 0773C68BB76; Sun, 2 Oct 2022 03:07:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075064.outbound.protection.outlook.com [40.92.75.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D5EB668B9C2 for ; Sun, 2 Oct 2022 03:07:40 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X7vjQW7Pg1EwyIKtLheLNRa7TI2FudRhp/2og5WTFH820agc6A2vZvEXOqctbmePqPfSzKhV1usJpHmCJbpuehmJx8ysrnxUhmXfdg+RWM+fV5w9D06OQ/QQ5z6RcgGaq9nmO7xzCmJUsTFy9dNutVSU+yOa1Tw9bJEnpnGAXAkS4xEEX6Mbm+vZ3LqDfBY+qMJ5HvaaJ6WNWJZJJhKLmN95mcVsgHt0fxQMYlT0ZzxlgGTVBdrMuv/1YDvmKeHd5EDKP+SPKOFp9sAbYCb2jOt4DfpTx9eSegJSqV+XsZtel7ObqmHXzhioUuEvGlaEigsj+WPJz8mHXsJOIhRWsQ== 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=mHqq87Ekf5xkBESSYLD7maV5z90FlTnPwzb/Flb/HG8=; b=N2mx/zEhyOUwugQ7czDDlE1BbExIjnLkbCnlqCSYfGphfbHiuzDpJsFoJa0SIeoAUd7hhHuSA1l7X9sbHL03AX2o7eU501Mr8FAOwJqIhk8aCNxWixTkaKfeufVVzxjJTGF6Yssa101YdW/YinFW6suUwnnC8b4NH69LiTxG/MUNYER5dan10iq/vS1WC70FwwY7ymBpzOYWXXTzxw1E3IRm2emX//1qapP6iwm29Ozm6ThR4QplPUGPirBo0X33re9p9ZNAubRkd2A4zUFq2lJn8zwkrIxRTzdpbv/XYo4JUsIkAXlaYsq22c7Zbx7dXKIlI7U4k5cznVHlnB6JZw== 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=mHqq87Ekf5xkBESSYLD7maV5z90FlTnPwzb/Flb/HG8=; b=U8cUb9XVItSIfhS7wD9X01tMJ9XACT5fo7DSrrxxD0EQMKwMgFPipMKsYyOTfEQ97o6gbWcrPozkkG32RYMpUAIidupuNrYzTp3DNLsk0qWUaAtSt47CT5dOYu4ha/maFn/VlkLgKN4hYSdIuJJdZd+H9KXHUtnEhp6zoazE9I1r4FDb85pb49VLKBAGjWtlw668DZHn0Kg71ot1u++N/lwTmyEf9j85gaWcj6bHtTJsnSJfpDE45BxWQCh55i2cewt6wQbwwJA1v7WtBtqeA5M0MZ0xvnJqxP/HKokO8G7c42ujfsFMdRsVfPQOGwiDJPX+LIELzUgotOUdnSvhdA== 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:39 +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:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Oct 2022 02:06:11 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [he/wAziQhpNVTrCGRDHjheBGJsbQ5e/veTHnu6omBsg=] 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-7-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: 157d0369-6f4d-4aa0-2827-08daa40a1e2b X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3nPH8ePuXi+6dv+20UuINthQlaPYDRkZwPVZ/xklTQ5+wNjw9YoZg8YfLPw42ll2LmyOp6ApJJwNpPbYIidtqQDoxlTlUJWPXlGrYC8laQ0Km58t/CREaDd5TkBcC7ZAIJzMj09QZ3Tso6YgVOk8u5cQOBFKzaj+sqUARksOjcjVpnXdakAQk4I+jUcqREOCG4yPypAFRHE4vTiCSGPkgDtoCjEyrtqtLPt1VUUHIRMAOhm02LFBjFjr7nMU9PYOO4sYFPvLajx4VUZGZLIZ4N0LV077PBibNT1VuL8CqzfAPs5GBNG4lz7wDnmR00xY/wy6wc+MQ58db2x2UZDn2mX5XzNdSw9E879Qxpz3Kpw+4AALI166ByGcPrO0W7pwUO/njiaB4RvmMoyQMZLZZCRkThwz2CAjuZK8XSiepRclNVFzI8ev90d7WnQsSNpShtBWvcz2iL6v4MAnZgb+Bp0fy7rG/4wawQwHG94Ll814iGyse8tr1qT9xQh216qAUxtZwuW185wsm929ZYO7expz7gacAI27yy2kOg3YGPPN6l/rVBBY7Q9H39djLC7wW3+ZbzYHz4AJTSa32kpK+WJq6JnC1SVjA1HMc8DAtJvkHMuVl5mGh+9FwrKxrkimkoC38dcz0b166O99mdjetsAMpPj2ch/gFbCyRpbQFghc+/RC2zadKyMwm/mM85/AGx8zz4zdXiVdJeawSxERg60YtylrcWLU5u76mBTd81FvZ6R+71+/Kn+5NDE8YDqCvilevnZbcKYPd4LjqoO8Rlg X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dg/kdA6pEePbD+o8W/TTIvlSHwVgr7hFoca+P1eOrJ3FMBLMCJDAoNaTK2laVA1wdZ05FxN9Qyq0IwaDUN9VZGqB20Om9Dye/c8OqKcs3lRNLZaGSgeJdk005ha6VOcRkkTmiX+RgNuY5ODB/38NeHxsgjSpp0DYsCKxsEf1C/XUP5B4uDQhE2o4EZRMODmO9OG3Tu2BkjxeLoSwIVVNw1Vc2w21BBMo2njUx3u9WCMH7b6R+piiIl8FmJWnrifLnU1knCJheLGp9MaljQdRTD/5kyFNLgfsBZK2+wyEHGtdch4ngeRPz/kdpri0XF/x/YOlPEQPHDiegZMhY9/0xSd8SMnGxRwrL1rw7MQf2KkCx8oJqN4dfeXMSU/k4+i+3FWQONBTWQTMEsMOoW7Rhi0ZASVSWYLM8vapRtdFAX1ERo/4/6kgYI3KI7XDBTwZ//EY5BbLl8I6cZxSV940k6fUHG6TQveALLy3HGhglvhMsTxOKBu1qFAPiu3/KWbv7W2MZSnNMWCtSKiJSnFgUHJxJ2H+5SCoDedfHhK87ADr1fmwxt2pc5w1Flh4PNV+z70PJJ/IhdAPuVTE7V9tpaaJ7bOaxtyRfDNVj/Z2ppfaLxB/WphOpmzS1H5rABmZ+h87/J4IKbGUxaqGqIgskY9Gjj5yZ5tH1fUKUz+/Xq5/IZYxrPjqCE1l7yqJELy2 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yqvBEOB3FyaAFjec/Yme8+YKLuPNWTuA6SWfUeUHU57uEL7MLXtVNYzHKypMd9QbxY1DhMC77cCUkuN0US9oVmt0/yQindOO7OvMpxajmeawB1+Wq+iIpFXEDa7GGgqrtqfJ4A+43hgbHdumEcS8rQSfPDfRIWc3KOYzhHpMO/YueVjyXmgv9OaNBMKAoemkajZ2zigzb/PlaXT1twLMvVkvHBQ79DodpJz6z/hEVOBfMbReJ/WRjA/ySev/A2OXGxPTkpk5j864fI8m2N37fCDVcGjFJI8iOP/X/Rx2lK0ZDLX4Dn5EctXRp82MyjFBVeZ2yktFCMfRhH+FJiRz85fXS99TIJgHn86t3ds0wQkDgtgBmEWVplkffcn6ySHFOrNFO4GQPUvJ5L33IhHKAmTPdt9v9osWrj+xbjldsAYTF/bBTO0JokyNg1Em6OIrHUk4PFOr7p1TxpcUE/sUWZMgPlVUYHyXgjPBGKAEVY7BbotMSFvGpQIm2153wZFgG5BEYDN6Q9nTQdhM/Kl0ADoED53J5R9tatWcHtd9v/K/0Pkr57kRmlt0Jsw5VU++86h3+Vn/5jKuYL2ciqn6ANkFR653d0A7BgjXFGkqIsYDhmLbsg+Fh+A6fgDfB+MGeSd/Dr35YibCidz+VnJhmuDAEqz/8Ht3c12DBDDg5nAbPT+HSzoNZBxcBvobl/v3RM700K9X4ZRBSOpAvHuU6OeS5iZ8CAN1l8xZkOI0U/96u9nqaJnaOjkD3E+nk/tYEDAwBSiTDKoiWYI7CGz5sLQy2hbSOdWREz3LQ5CgQfoIz3O2bP8ORsGyhABTcg6CkzpD94kSS2QLyeVLh1Cm04YNzd8dm6Miqj40f5AyUTNDHFNUQ1r8TPo/KgSjvY4bpiAY/m5XNhn0vLvdpVqYguJOGGNyMsMZ05iWoKuLPtSW5R9osYgW0mHazXflSbpiQyRiivRoPphlsy1qNoQ0e/USD5F1JUPfkve94QFZ5ooYqxWyihapycIPB2599OHDahNX5hqG+o9HtaHbZSM2V6VT2COIOF/RE7QZZYABhFTG/5yhhiBAUT8i7AAv9yFB5eCPp2e02S8kJmUwfjkkff2uwosuC7bGCWcoy5oAnN4X/JrQdOV0+8HiqFywBzfCO062aqH8bhS8IGfSGSr9C65RRWqewwX0i3JgmCOQ3DpPANCFnwsuFDbSro/WvXyxMMr2jZjHZu1mTpox6a7yzRugY8RLRn5cmvV92xMbU+Kn77q4RUGPvXl+A4ib2vPHIjn0j/y1ji8tllVbIUzloozvvDH1w1DZ/Yt1O4XESp8= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 157d0369-6f4d-4aa0-2827-08daa40a1e2b 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:39.0837 (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 08/14] avocdec/huffyuvdec: Don't use HYuvContext.avctx 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: N3R/JuTtSKBZ It is nearly unused anyway, so stop use the field altogether. This is in preparation for splitting HYuvContext into decoder and encoder contexts. Signed-off-by: Andreas Rheinhardt --- libavcodec/huffyuv.c | 1 - libavcodec/huffyuvdec.c | 18 +++++++++--------- libavcodec/huffyuvenc.c | 1 + 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c index e582060cc3..471bfa1bb9 100644 --- a/libavcodec/huffyuv.c +++ b/libavcodec/huffyuv.c @@ -72,7 +72,6 @@ av_cold void ff_huffyuv_common_init(AVCodecContext *avctx) { HYuvContext *s = avctx->priv_data; - s->avctx = avctx; s->flags = avctx->flags; ff_bswapdsp_init(&s->bdsp); diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c index fce7497386..edfc8c0038 100644 --- a/libavcodec/huffyuvdec.c +++ b/libavcodec/huffyuvdec.c @@ -813,12 +813,12 @@ static void decode_bgr_bitstream(HYuvContext *s, int count) } } -static void draw_slice(HYuvContext *s, AVFrame *frame, int y) +static void draw_slice(HYuvContext *s, AVCodecContext *avctx, AVFrame *frame, int y) { int h, cy, i; int offset[AV_NUM_DATA_POINTERS]; - if (!s->avctx->draw_horiz_band) + if (!avctx->draw_horiz_band) return; h = y - s->last_slice_end; @@ -836,7 +836,7 @@ static void draw_slice(HYuvContext *s, AVFrame *frame, int y) offset[i] = 0; emms_c(); - s->avctx->draw_horiz_band(s->avctx, frame, offset, y, 3, h); + avctx->draw_horiz_band(avctx, frame, offset, y, 3, h); s->last_slice_end = y + h; } @@ -952,7 +952,7 @@ static int decode_slice(AVCodecContext *avctx, AVFrame *p, int height, break; } } - draw_slice(s, p, height); + draw_slice(s, avctx, p, height); } else if (s->bitstream_bpp < 24) { int y, cy; int lefty, leftu, leftv; @@ -1006,7 +1006,7 @@ static int decode_slice(AVCodecContext *avctx, AVFrame *p, int height, break; } - draw_slice(s, p, y); + draw_slice(s, avctx, p, y); ydst = p->data[0] + p->linesize[0] * (y + y_offset); udst = p->data[1] + p->linesize[1] * (cy + y_offset); @@ -1029,7 +1029,7 @@ static int decode_slice(AVCodecContext *avctx, AVFrame *p, int height, } } } - draw_slice(s, p, height); + draw_slice(s, avctx, p, height); break; case MEDIAN: @@ -1100,7 +1100,7 @@ static int decode_slice(AVCodecContext *avctx, AVFrame *p, int height, if (y >= height) break; } - draw_slice(s, p, y); + draw_slice(s, avctx, p, y); decode_422_bitstream(s, width); @@ -1117,7 +1117,7 @@ static int decode_slice(AVCodecContext *avctx, AVFrame *p, int height, } } - draw_slice(s, p, height); + draw_slice(s, avctx, p, height); break; } } @@ -1163,7 +1163,7 @@ static int decode_slice(AVCodecContext *avctx, AVFrame *p, int height, } } // just 1 large slice as this is not possible in reverse order - draw_slice(s, p, height); + draw_slice(s, avctx, p, height); break; default: av_log(avctx, AV_LOG_ERROR, diff --git a/libavcodec/huffyuvenc.c b/libavcodec/huffyuvenc.c index 2137a16714..020159a20e 100644 --- a/libavcodec/huffyuvenc.c +++ b/libavcodec/huffyuvenc.c @@ -209,6 +209,7 @@ static av_cold int encode_init(AVCodecContext *avctx) int ret; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt); + s->avctx = avctx; ff_huffyuv_common_init(avctx); ff_huffyuvencdsp_init(&s->hencdsp, avctx->pix_fmt); ff_llvidencdsp_init(&s->llvidencdsp);