From patchwork Thu Dec 21 23:01:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 45276 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6623:b0:194:e134:edd4 with SMTP id n35csp734345pzh; Thu, 21 Dec 2023 15:00:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IEvVLXDu58df1Q5FLdjzND54u+OH8F62cK/bUsrDXuGM2sw8vbrGB5yqU8dyKhwdQ+052gB X-Received: by 2002:a17:906:abda:b0:a23:9a1d:334d with SMTP id kq26-20020a170906abda00b00a239a1d334dmr567522ejb.7.1703199639384; Thu, 21 Dec 2023 15:00:39 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id me26-20020a170906aeda00b00a2353a78718si1265727ejb.995.2023.12.21.15.00.38; Thu, 21 Dec 2023 15:00:39 -0800 (PST) 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="NhKH8/mC"; 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 506E668D1CD; Fri, 22 Dec 2023 01:00:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2028.outbound.protection.outlook.com [40.92.75.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C586568CD4C for ; Fri, 22 Dec 2023 01:00:28 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hY8jxU1yE5ikKAByhxYNE5cEdmOXtq4Fvgsfk4zp+8kWzKWDnhOzr1SQtJdiseEBbrA4bBF7jotc62Y2zPF0fRjFpLSEe219xhN6/+822d3y6rMs+QGhIiqkYlTO9FUYhqm+TMdgrqeQEu+7Eh5NnpcBq2dub3KBSE2SzH2W1NhACBV5Pw+IvSf0tSXd0U9SFiw7EWKM6qzueNEr1sAv50CNUVbVtOkC4yhNSXGZ6+Xo0z51o1ASTIreVQIiwdzm3E3vxwknuVcIpz0c384/rRuNs7P96YIhi0BbQWKKqshnvbEbAgBpXBmKXQWc5V6/uRzlxZSbJMyB+s1gSTKzQg== 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=0J1oxAvW4w1aVUj+4Yxawc3TctvTcAcHlfStf1y+suw=; b=dtbKUg0+2+bAQTH/l+0YmU8LEpeDCM+JufIiFNkHDhSn6Rlfqn9Ftm5C9MopsI/mBx/syiYFmPOpw6d+5Ux3BMb26QOEWgMgeC04n4lYZgPkqYgBkSYQ/4pnkw8ubwAEucAx2VsQb32z48UHj5nBaG/g0QPiPr6dbo/iQVmyIszdO+elM1fT3w+g0Gn7a2AcCdngxcCzDMm7h8fV5bFImntKjVvx2UYJy0HvQEuyxH2g1n/Zqg6s+urK4ufhJsJTnd9ypMCBalRwtmvaXYJeWfGbrq6yBXXcvHehaA48NdarR6iI7cz92Jcl0UceGx1W8+ZW4JBB1hk4y+lry3eW1g== 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=0J1oxAvW4w1aVUj+4Yxawc3TctvTcAcHlfStf1y+suw=; b=NhKH8/mCvuqhehJweyoElGmvKO5TgbQLlbOM12OsZG991LNS6UfvGPGEB3cH4Jskp1SrcwAUm6Ch4RbEu/DOsJ9hcUDUCYl4NH2DGGBQHBjdWxQRE7hhxkjaPRu9bAo5iMvRPsw2bL4JA89zxldmcaYCRkM3AmHRf/YEMpgOgRzTL3FFJuq4fsReN3wiYvs01ZrO+Pnx6F4iHOAcNV9J02i3dJIXnjm550cuiNYxpVZAl1ODb7VZY/IODWIyEnBQIoiuTXZjGQSqAfhlVp94yz97b2TMSm7e00ZD4DttjAzYh1m/77KlUckz9Ks9YYComzQQ+2T8U2VVXGy1NZDbVw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0199.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:326::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7113.21; Thu, 21 Dec 2023 23:00:27 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f59c:9cff:a42d:bde]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f59c:9cff:a42d:bde%3]) with mapi id 15.20.7113.016; Thu, 21 Dec 2023 23:00:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 22 Dec 2023 00:01:52 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [yEtlBOVmDnmTjW2lZZbEHJdld6sxlLOCAevtzEziZ0s=] X-ClientProxiedBy: ZR2P278CA0022.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::7) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20231221230153.2350842-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0199:EE_ X-MS-Office365-Filtering-Correlation-Id: 41de50c8-3943-4d12-3241-08dc02789ee5 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cz5E/5zXEehKAFXjgBemRj7pqiCdO0OBstkpSaofXqakyM1l9S8KPK44iEI44VJhhm6sCsbmX4wz8X7FaStHbc96wWL5Pw+dCQsVbmB+SgXGOoj9oKrc7ePTOhCmJhmaIg+5uOdb22YEuOYyc4J4S798rtEPMo68tT97uzF9/jZCw4zqNRKAfcrWBLhrHxHgpiIdFRtw3aA8ipcy1OpCYCjqjP9Ul451A9AmEQx/v+gVpWsC9iE5ygL+yMBe/sP3tajIpw23qnmxTkvK9OVKBPp9HkkOb1blqdE/GH2RxVy/x6LHAE/nis4+qLmvw591+MuSTAyqJp+ztqs6+fSBLgO9OGNewknb7KNH/cBLCKWO9ehqsR9cnNg2Snn6o1752FMm/H3GNoxq7DeRwzylcPCM/2UmiUHm9FUrPRa8j0EORFgjRpFa9nRnpNW0PNgPSxSZiCrHvIsMiFKKti5SYpmi1zaouVWMlOUzWK0Z94X4+QmEhuerFguAAYtktg2+8UcieQ2wP/Pfmu0k1mnhNne4aRLoAd9L1ogWYTWmoPF7d1Kj715zFX6VoJ3k3k4ZuaZ6NCdr3UxSyqJzC4+SpQjGibLVLw10RRJiRfAaa2blFBw3XDTYzzqrUFZWp0oY X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qLLPeNhtc2/pM7SYsDv17y8kmCQ8lYdj0eUl/34Evlf6hgLUT0iKw4l+R96aDe0PUeUPQTUlR622vZSPafnslwKpDndy38r4XDt+K/moLnjZNhHACxkbLZt/KfS15ODAWpSl9+itz4b6wBvIZNfc0bvKwWWT16aPxCfsBmrf9so6D/EDBKZnwGy9NWsap1W3QHe2/xZl9rckBMj34UrAGjY5G/InIPOfXzJhjwslNr1E73zBJJc6mfP+ayIC+83/nJsa9G7qe/NuaPieZStwIJS4hMvhlSMoPm3L77fdw3PW4Rz9JhRVxpWA1d8Bsx9oSO85OSvg9OTNvpDRADrhMjllugFZ58ghMDi+EE9RI4oPyym9ad4YChRmbJvrdT40Og1fIiqgD3K/Xaw1QrDSyKdMYZikVLty1lZ2Mic6KH6h9q/VqwRDKeVMbnzOPIT+r76Cb27HRnno3c4Bymdp/LJ0DWLSafODfOBuKtxQ9DhLVvKmc88zPpWj2blAWJKI41XVGGNr/4ZRrP/p95l9NlYZk4ig93WlHQ8YJOuwvU7mRIIliCBbKbX/6m7IaCTWdljAJ8+l+3JVJ55A+IKGw+6ytEliEaMKiY9mVRwwbL9uerXg/W7FjHfQLjgD8+oIpc2rGfDjXcaDwtyoyjePeNY1bzIAoDyRpJbxQMNbMz0HjfnXe7YirfDb10lZMCXBekgYtI3o0oCASXkUK7+2an5KjlO9wUqt6LL7LgnGIL4gJEernDa8A/qtFsY8y02TvZwt980AiGxr6a7Kl7oabiou8Is0OvFJ80rmWAHsGO8JBEt+lSi1fYDiCFr5eaKsCPOT1JIH9HnJlj1ndo98yeJmAkUuPZs1k4nc3lHMsHeqIa0q38ypgsu7tHasydh8mcK2CPqqOjcSjOcCG0Tg08PwYiUJoN+8R0VYdo90MEZCfsHcsNhsrSjFTin4sG2x9/QjcxzT0VkWcZTM7QvoOWnyZgd2QsTMtSWqiPWbLOlROe70iOcOH+vfy0D7a83S6J/E9ND8pJ48+rXRoU13PNFX6o3Gg8ls4ZTY9SNaLg102qKBks3WcLuq0E3LO4j4GcoRUwS5slW/3q/Zmixk09SN3ghmLiAIeOXaNmUb02Pi9jjmkaANiL70EokXTumJ4rrFluOWF4mpDP/O4CqZBd0CpeMh1eJBzKGFMIytgHIt1m1HAcYPX1qhFLQzGr6PTnXtS2qHaX9THPoZu8EGRpQ/4Rcc5TeU8avXLw4HlWAMUbmG6B9j4LXB73/mwxU3 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 41de50c8-3943-4d12-3241-08dc02789ee5 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Dec 2023 23:00:26.7573 (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: AM8P250MB0199 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/libjxlenc: Don't refer to decoder in comments 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: hvxWApWYNKTa Signed-off-by: Andreas Rheinhardt --- libavcodec/libjxlenc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/libjxlenc.c b/libavcodec/libjxlenc.c index d707f3a61b..055c9b7bb1 100644 --- a/libavcodec/libjxlenc.c +++ b/libavcodec/libjxlenc.c @@ -85,8 +85,8 @@ static float quality_to_distance(float quality) } /** - * Initalize the decoder on a per-frame basis. All of these need to be set - * once each time the decoder is reset, which it must be each frame to make + * Initalize the encoder on a per-frame basis. All of these need to be set + * once each time the encoder is reset, which it must be each frame to make * the image2 muxer work. * * @return 0 upon success, negative on failure. @@ -104,7 +104,7 @@ static int libjxl_init_jxl_encoder(AVCodecContext *avctx) return AVERROR_EXTERNAL; } - /* This needs to be set each time the decoder is reset */ + /* This needs to be set each time the encoder is reset */ if (JxlEncoderSetParallelRunner(ctx->encoder, JxlThreadParallelRunner, ctx->runner) != JXL_ENC_SUCCESS) { av_log(avctx, AV_LOG_ERROR, "Failed to set JxlThreadParallelRunner\n"); @@ -446,7 +446,7 @@ static av_cold int libjxl_encode_close(AVCodecContext *avctx) ctx->runner = NULL; /* - * destroying the decoder also frees + * destroying the encoder also frees * ctx->options so we don't need to */ if (ctx->encoder)