From patchwork Thu Apr 4 05:02:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47793 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp100647pzd; Wed, 3 Apr 2024 22:03:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX7O30OV9i8no78QCxqAQr1iWSH2Jat7Ukop2zKsba55ZWADAkxOyJn2zueaPOvdayexnBYD3zI8nU/lQgAO6qThd+Tbvr6PW0cqA== X-Google-Smtp-Source: AGHT+IG05P+2D/LV+diwTCa6bShZ5uOrp17tDK4EnYZrVa27kSmqJzlGMRIMBCjZAT9B3FPHlzx+ X-Received: by 2002:a17:906:a0cb:b0:a4e:a2b4:59c with SMTP id bh11-20020a170906a0cb00b00a4ea2b4059cmr648974ejb.6.1712207018084; Wed, 03 Apr 2024 22:03: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 lb21-20020a170907785500b00a474107fbcasi7361998ejc.652.2024.04.03.22.03.37; Wed, 03 Apr 2024 22:03: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=E5UzQ7u4; 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 44F9268D19E; Thu, 4 Apr 2024 08:03:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2054.outbound.protection.outlook.com [40.92.90.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E2A7468B43D for ; Thu, 4 Apr 2024 08:03:05 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ncP5FOfcLR6RMXF9/H5DlBVs22YRoB9dfSPpJuJaWshEttYj6P9YQ7ciul0PkS8hEdDs21kRTR5R4EJI6zotCFLvfTShTZ2P2pOlyQT88fjMs8QS2JKfPa8AjyBeaeTJqd9A7lw6tqFNpDJU54GnwHg/XUZIC9C5tv1h/Me8nWHR0tJJqzf8Z0X0XkPzgaZ6TTK4YEQwkHKBAXT8YL4ZH6Jh2vsdpB7iugm5J5hg6/tZauP7QOJfMxY8SSWVtAus2BJk48MRyH9kehcjT1ugsteSnTmEuDRk+vZ652AvjW+/MVFtuLdH1+BbFZ406UG/zdjSUZEsBA7+OjjrKygmhw== 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=KFr3Bb+tUnkgLZ3yiWv0b7gZKoa6xhOJo9XG0+6PeiY=; b=MQoZ+YDwqOYr72IC73xeplcW9p3sg95eUIzp+5ZNl1XKlSW9p0sYaa+7ejo2ttgRj2CpmpF4qZl6zWhycViri02c2eT9iIOod2CufQlEUOZNjtru7cO7qgJlcgGhQqnrpJSn8OrTlq8EYVJHfR3qjLBwartLGYe0KaaaM/nxmMPiOfuCrW3hhpRSW6OsOoFhNllrz4UrcXY8YZa64sUmx7z4BedbMv+pdDNnMfcEsM220HDQTKuGg2qJzHjuGzI2MdE30N3Gsg9X7oTJOQ5Gk892OIOpi5kPBex68Udx2waWei92ZCmjYf5ufRMi06MZA9I6f4hjtSPPriBzcah/Vg== 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=KFr3Bb+tUnkgLZ3yiWv0b7gZKoa6xhOJo9XG0+6PeiY=; b=E5UzQ7u4xCJXpu9CtYxe+kSCHV/aTDP3HQjtMhCBZvGw+GxABDDaUeUTdTtpe33eevVF/U8MMIopL5nPL3pAi33wcO9e8Vr/ZfbQtqJWAf5grsVOauZk58St6fXlAZ8Wh8jN8WEKiWOxTx/4ZTNmfCvebM7X34V881ZbxG3MNr3tQ25dRYzyiz39UOzakf0eBOEAuGLHL6PY2DIUMY3TSnDNaI06wDrWgnfBjpZmaK6yxkZhNrxsxJ+guDKFWrDeYzSkn+6femUp8T3fcnpCMEoDl+cIP8UJM3fhvYfqhasUj28BKhvbu9G6h4XaxRfZ6IgS84uMoGs0BKnmDUMa2w== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU0P250MB0436.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:348::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Thu, 4 Apr 2024 05:03:02 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Thu, 4 Apr 2024 05:03:02 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Apr 2024 07:02:49 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [oAFHGw43d3cEVnBOGPk/sgKjnV4GYn2OqbM2m3Egx9A=] X-ClientProxiedBy: ZR2P278CA0028.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240404050250.3450360-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU0P250MB0436:EE_ X-MS-Office365-Filtering-Correlation-Id: 21ddd5e0-e00f-40d0-13fe-08dc54648162 X-MS-Exchange-SLBlob-MailProps: 9IecXKUgicCdj7HlD3lQLzAlIqBnD71In4YbHjWxTGOUx6B5BbSJPCbDnZwrqt49QhdVKdfMcLeJTS/eLkqXqocOQR7NfUmfb/CZWM/tVNpRQrL9bs6vpBultF8KkOh+Ndfwz9NJGS6R/BqoBUYjEQ3vkQHRiSmpgnvXJVQPqLEPEAggVIrYqvkW4CSM2WLjAbFi71nCborx244+9IbcEfleTRjPBnjdBJSzqV3A1YDuDWAt856IO8Uh5uY4mKlybvZC//3eByFMmqO63KfMVCzRXtXf8x5baejVuALyI3MDvjyrt9867cAdC9fWi/8Q0zV0VXc3Z5QCG+Ay0g7UJRS5O+a9NhK4kwZ8Qat73SrPBEFGWtrShRW6UOBCpud7cBMcNs/87BXedzVJRQ2yaQsDDmBr0vrx1240aYMh/ZbCchdXp/laokfJ1SZVa+paI4J+g5DsMTJSgFNrhlRyBYOroYKan9982o01gvlCcFIm9TD8HObt6dNlhTSvY777F+rkl3AtC4O0exBvdk5McsCckeP06mw3IXOgWolzX/5d3RKyXr0TnBe4r5Uatx64jgZ2M5Z/TpgC2yiUHNPOdXoKZ5U4hODsvYxRrZ+ydrjYBvIMfRVrP6HNWEqdV9zRDy8ECpIcOuhREyUHpiwxrrcavzSqwMJZreO7GYJtBndVfPiLrimArl8lXqc7AjwWhmIGNaeGSZtcmPxc0oFg3SdeGX7K/KA36skW/nZnB9ncssX6wmMkgA== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OC91CYiuuF8mvF8zjyKzUKWhivPH4fFb5QPbFGITQzbB3+gIkBP9EiOgB/J+C+osbVREoCT0504t3qHcHTvGHja4qhV0gFLdDWYXMAQOCH8NE1zgwwuF6O3J5P7TidAsaSSEYhanisgQ8h1tx3fqblIRxORvjQXMOX3O7lgOeAg1RFwg5TxHwXgf+BAzlp3dI4Lbj0RqT/+5Hj9hg1c5jHMnnfnxDz2Bu9WnOtCVidX7YOneeyLBtfG0t4wYacr6T+yChN5FZS1aVtXoH1oTkQwC6TLoXQOMAGgGlR0zwOhwanHOHkajWLRBS9B9S92UnhCiTUEu7gcUsxfUJ3+Ssr4Qzk7o17VHvbfKSc1Kc/Y7DThQ9nSupN5PPESv6DqJiz9vxUq7TjT9aKZJgHpuBjPOz/uI8lAag7FgmzbgwqO61beIk9CttgaFLV21d//+IEKkDhtoFnO9SYsrzTqNSiaQqWG/spy/JvmK/EnPMRCVoOuluh97irkoVsIGE2Mn/BhxRGkcTqcAvUYh2uQ1PtFU8hnRCcGL4oPmxXUSlYeN00U+EqwiCABBC51QIUcONXClauxGqKYSvhgfd/GCVInxl5BTJbhTy7Hkg7ZGbon6opxSsjtkGl5KEIPmemrd X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sMwtGPGXTYN3vYNyKXaJBa8SZM9NAw/ksj8O6EcsDOkBREbyDWzPSgi0Ls3Yl3frIIJZIOVSZXzz6/1puHuRdT0bmjfJX28NU9PPfIRnCliVndE8JIfTrBi0XCg3XRG9oido68/0g7cN8u2RlPHjdPCDHfXDyZvzIySyVUavKgUyjt2P7/byrYZUZhK7JM6su4iFFRopSI4IHJGoWVVijUFUgeP8n9Ypa/NjgkttrDHkNHSv2N9PX9GfpKvondij/DDuT/aMOZ34KuKluZxMh079GSQZQ/Lx0YfsIVGwSVj35/xPvnQIjie8wGv37aRR8PHJTOyvkhw/bWC0wqRckkyKw5FnsU+/fB4SQ4yNupaO1U5DGR3LwNhHCTFLgw8UehMZWTv7RQ3MqZW0/0gPza9lKTYr11GgSLY3rAXZxjj+dAAb0ViUgiNRp+Gf6bW/E0FdHbLAMpAEjffew6wloJq+Dj0SntAFGj6nyhpdsiXfWjKn+v154M69YC3AVe+bh5vv6P4sFQ4NiLQJ34nDxFUH4HIqPQVzO5Zj1x3s7v+eaQoka/m0c3tlx+eGpRPju+CEGiGcRNPq2q2upWyWhO3khkLahPb7nz729SHR0Q9ltn0uWKGaY51QkLT+R1UT9xwiy1MDxw+dYUUhYbVirDMNjNCxvlK2W1gORGIQqgd5kaWESYRNIfr3Sq3XrcIQSTA+LygyNAB9VUaHD5RubpXajQfNTDOeEz+Ir/BYYPOPvlCqaRczFNzDlTE9FRdjIkZyt6HyqpIgY/8NLdDuQYOT6J2geJFQc+ZqqKtOJrvqzCW6MSIYihFB0vB1Bu73g6atcsIDkh98SpVYNIYRG8ZlOpv56xXYOCGBfz5hH4JoGKoVtXWyW5NQoJxl2nWDxwCTRP9KU5v+saIvkhvtNndTlKirXEe5ZOkaHANH/UrooSyezBEpORJlmMSR927VdbToqrDLnUZK0mZumkuSVBDT9mShWQOqZ71La4lOeRbcgJoKY0k5PmdvOfCUi3EIQsyenhWX5buoxjdC5UVxcAKvclhGv5RAPAfwf2qHIGWkK5h1GYqTJjOw+pxdW2pZ5Cnx7jSXZkiZLlTayt3FgT02XIhYMlwJDNEPmnDyHwPacg2BR3pn532j10u8t6ACbYtJxVpbfmolU1hssLDqbQPJTOslF9inijYHPp7F+pHZPUxBOF65SSjutQcoSHbw4iy6hg0wnKtxcmtB506s3br91+fQ4TuSd2Z9sKSt1OraKm6XOP/mBSuqea6vnR/FXOcxiNwS0dv2xltuVAJ5Zw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 21ddd5e0-e00f-40d0-13fe-08dc54648162 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Apr 2024 05:03:02.5824 (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: DU0P250MB0436 Subject: [FFmpeg-devel] [PATCH 5/6] avcodec/huffyuvenc: Avoid duplicate variables 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: 20ZP18zx0qF8 Also simplify assigningfake strides. Signed-off-by: Andreas Rheinhardt --- libavcodec/huffyuvenc.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libavcodec/huffyuvenc.c b/libavcodec/huffyuvenc.c index 152f94cefb..fd6b01de81 100644 --- a/libavcodec/huffyuvenc.c +++ b/libavcodec/huffyuvenc.c @@ -755,16 +755,15 @@ static inline int encode_bgra_bitstream(HYuvEncContext *s, int count, int planes } static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, - const AVFrame *pict, int *got_packet) + const AVFrame *p, int *got_packet) { HYuvEncContext *s = avctx->priv_data; const int width = avctx->width; const int width2 = avctx->width >> 1; const int height = avctx->height; - const int fake_ystride = s->interlaced ? pict->linesize[0]*2 : pict->linesize[0]; - const int fake_ustride = s->interlaced ? pict->linesize[1]*2 : pict->linesize[1]; - const int fake_vstride = s->interlaced ? pict->linesize[2]*2 : pict->linesize[2]; - const AVFrame * const p = pict; + const int fake_ystride = (1 + s->interlaced) * p->linesize[0]; + const int fake_ustride = (1 + s->interlaced) * p->linesize[1]; + const int fake_vstride = (1 + s->interlaced) * p->linesize[2]; int i, j, size = 0, ret; if ((ret = ff_alloc_packet(avctx, pkt, width * height * 3 * 4 + FF_INPUT_BUFFER_MIN_SIZE)) < 0)