From patchwork Mon Nov 7 01:48:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39218 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp1848585pzb; Sun, 6 Nov 2022 17:48:14 -0800 (PST) X-Google-Smtp-Source: AA0mqf4n5gia/bIPBxtW4X7hT/b4008aTp3XdMFD1OqxJLX7G+Gp7Z2QLqSKlQGQJ4scuqoTZUGa X-Received: by 2002:a17:907:728a:b0:78d:2b4b:e7f7 with SMTP id dt10-20020a170907728a00b0078d2b4be7f7mr229883ejc.269.1667785694157; Sun, 06 Nov 2022 17:48:14 -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 g13-20020a1709065d0d00b007313312730esi8478024ejt.85.2022.11.06.17.48.13; Sun, 06 Nov 2022 17:48:14 -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="o/Spa5Ej"; 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 895EB68B9AC; Mon, 7 Nov 2022 03:48:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069088.outbound.protection.outlook.com [40.92.69.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 792F0689CE2 for ; Mon, 7 Nov 2022 03:48:03 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FqltpHduiqLt+jocUmgcutdzHDZP4LmF9UhkJ2gZdX2n1D73IlddGmI4B8ZXKakToA0rCtyVjfOV5beeMsPHBv2SUgBvD53/f5OrHo+VZQFXZHXhvfINFLRA1ZnRMs76TEDiEqHMCVI/vk2fsiIb2POUFRPiCNmYS8jGoxkUOnuscpNmKJ0FkTq1xxWP8peT4/AlRG4BYq4hcEQNrYBXrZ23TZcxPkx0vNUnivGJ6WWMZzi+dd/9SAVIdYG/zziTmZVZ8D4WYehXrpIzySVw3kQsYaJMFl3HpZGL7Dp420xmprZX4VNGU6MwJbk1+vHgana+jWUgRb8X+92t4JJE+A== 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=leVdo+Epml6Sf5FEI4RrgOF+xYTshpYpAI7rW5vtZKI=; b=juaiLGlkx9A4BZAUBBVYlcylZWkAkpg78d4DOoOQ3bGebSOTjk+lsdqk5ihGBRW+HAzBsGUlj/9AVD8J9Y8mXNJZnGF9eTPe5/C/DOc1sYq9fFwNPF9bJfpzfwvV70uLxQo6uhAi5jOlhzVYPfxhTJz5oCz8/MpkV3PGXN0j+eQTcgMG00XrgSojT2w+dV3PH1yNEAIfB9Q58Wn7hpINH8CtY328ubi2SZDl1EcIPEtuNFpnSW1/bRYgtCmtUXQa7JMxIh61ZgOvsA0bK0ixt+877BjkNhMCjKz+XgqfXLB/2+0l/zXYx8Yb2KOY/gFn27CiCdMx771H7yLdIrInlw== 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=leVdo+Epml6Sf5FEI4RrgOF+xYTshpYpAI7rW5vtZKI=; b=o/Spa5EjKpfXfvHUjoJFl+bbhP6ELZkvZLROSIEa83z87fG+EbIEpKsR+1L985f0oP5nbn30i5iF0WobK/jU0bnYluwdbB2+uZLOhgmSZ4NHC2rjfYJbCQXAqVwBAw0cvWLWhsVrmMhiNsUMxW7xNb2b8QUJZifTtinKSRAvIJLBCnWyknvn4s09HXnVHlqf3TwQWyzaBZmF98/cD+4KJDXrnG+yA6wV2qoUlTbVM8dimzXhBQWV6QpoMammvlzL/eVZmlMHW/2RQ4KkaeypAgBO/uh2l2AxXABlR8Or6LsIc1MksfYW+fctJAAAHEG276V4brrNYy3cAs4c4VWN6Q== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by GV2P250MB0923.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:7a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.25; Mon, 7 Nov 2022 01:48:01 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::c323:d08c:85d0:dafe]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::c323:d08c:85d0:dafe%4]) with mapi id 15.20.5791.026; Mon, 7 Nov 2022 01:48:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Nov 2022 02:48:02 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [v8f2aZl+dhOENgBXNL2ui3DiI3ijQVUNktvIT3gDs/Y=] X-ClientProxiedBy: FR3P281CA0110.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a3::7) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20221107014806.1503393-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|GV2P250MB0923:EE_ X-MS-Office365-Filtering-Correlation-Id: a36f655d-2071-4aa7-70a3-08dac0621a9e X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqxUC2t/XAH2K/2kJg/kN5yVfmQufslg2ZC9t8ur6Yi9m5FKJnTOkCcNLj4pmInBu0VzT+aPoXEyTADyIIITmyDEDhF993r2xOhAGPNzBknQdlPGwZUnhLbgpErUMY/NxB7oP5tNCob18d9Mg1IHWJOzgqSb3RfiI5vgkfjs1YF17OP7UXJiDG3iIo8Q8NauFBButJgaaN/kjPocj+4uqddf1csxAa0uK5tDKKW0EllYninqnOR84M6BMo/dQkYi6aRp6l2n7/XNHNl1Kjewh1LNdVWJOlkw6LoDE13oEU2o5CPKn7bMs2IQKBp8eo5XzqQTSz24+G+FUFw0tWxrUfIcgCqK1+7K+5CXanLuwPl8NePCuD3ZsnoFQy+SX301Iwf8m1uYKDMeaKscDEnH2UfqcUMWbK+cYWqWAdTA04mHkQ1gt67DS0W/NgomK61A7oP3sGb9pp0APAO0eHP4iA505sQdJR/VOeWfWY6Ct4JTrBJkV+g+5AdOEW3l0NAKo7u2Vhy9osO3zZmiV2utS8uo0Fp2hC9ubJh8DmGGWtRImx1gla4KcflHsH3mFnZOt8X2Ox/2tauAvonOu42wWyF6PBHDHDU+6RrX1tqnuIIfBdXS7k67aY6ZIQ8qSxnVXtUG0V+wgtodH4ri/IktLSAYgJIrk2iEA3QcXSNu5OS1vV1pf1QcD7ADXW+E9c8pJn5AQRDvSAU7G9fBSXdqn5AvrjyC93vWrjUVJFgmnJAibxfCpOFtcqVjeCh6kWlNy4= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yq9vPV+oSvFdqUTqBv11fHMoUzaaR5FnBsMdH/DTLMIqWSvuAW7NZjhraW55xmJIifBGtAqfKz5JdyL32vpy5AbpXFbfuJn3iG0eIhit9mcUYB2q1F6qThU2E2FEa2qDVgXFq6r0+wyhUQOivBF+MU5sku8/FV3So6ZgN76tyQCuPf0NZvTltdhq7xKkblTBxItH2rxFaKrwcAqPusRY79B8CKubDTHrEn17ofxu4YrP2N985xItf0jl7izqskt5obwFBgck7u1QZCx5vJ42Ghe3CmlTHn/uUFTZf+mG9fMP0dyoOF/TU7frqKoYBzoh82IN9nLxPuTVWbxWjwKRy+qrt2EMiSL7MxLFVqSqiBvvUv5DTb1rvNL1ImBuPq6/5/lbAa6svd8RI2Xu/3MLaqGvnaxMqTCVL8cGPQ42i/sN2I62NwWbtRcek/oHKxZjluQEjKaQzDS/c+eeotGPdS/Ya60fFKrwK9b9EYuiUruBftl2h7U0El2PysHlIlwXMKPsUI9gJ/Vmm01ZPqaDeIQ649dDS5BtrTCN1SCqC+vW8s5vklKT2+zv+Co6+adwI2P3usB1M+vkq33N1JCPH/37m/OwX8yQu/S8ucK1sJ90o5Euy/HAcVvJ8V47eQdeqwj+f0KkIz5b6gkcmBwqttpCIPVzO0TLKYdwD6dTsaowjL/dH/eo6T3Q1pGwrnfu X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HoPwbv60SUe0jiaQvNkaB3eGjNKcPQllo5WWEduwRykdwsSDf2hmU9C+uS89fnt382vVok/YvjUnNUgFaxjdOTbL7bRJFODBSCFJMI9N1rPji0YrfatIUCS1dror4WeDy3WA/2gkGH2ZxL9C4yir29kkeHgc+xcyFWpEXRPZIyrakveHUXnER4wifRWqPo7jwhZ6GZyaMoD9r4qhzifcNKVFVR/uotR3S0vXLDkRW6vjlogJ1DASdcBL3IOuQ69oXoYHKf+Y3VF+zOYGXb02Ni0FiP0PS/K7Rv0WZTnroBk7nIYd0fwAE0Jl4VCUvJDdzQI7jQXuB9ZTAGeFHDOvinGEsdYGF+jlw2F1DsfNxETRrgGuEGbBV9oFpE+GPaLBq9fw67gZdsb7anrcWrh71ML13AG9Qrx56OCT2lRc4Q5bGZE1s+9RlV/jjUs4B3eKCx+MgXjxRqHSa1Z9O8G4BOoQdWUlE/H60gUAAVqM/zw5hxE37t64yWb6+BY7xQvgW7C6123phLGz0OICRakxH+qaHsLO5Ru7hc9n9Z4QlCjTMnK5OJhsO0yg9tsWV84o5zdymANSr9V8MAY82QACqnm86NQKtLQmSqWbNp/IbdsdOUOXDuRk+ocNHpUwqyyZ9tGWlM8MESf3QdBoHIB0iYEfbfSS2GjdE4UkHY1W6ny7STuhBO+EeXMy6lHEbqrprHmgIJye6Ep2C/iRCbZLjIVXRa9kPhUKv1TKchWVktbc07J1Sdf/+IQlvILTUgNfzOYNIR7kTtYnk5+tp3CHj5E7RDyZcnH0bwm3x01ZB4NfumJLYRKdFKcPHbw2Ca2VGpgNy/Fs0/4m4RY6PZehfIiOw3KzDbhYMb2VeLBQqCQpJt4ASLkBdDBZCh8Fp7WI1mg/XsgdevFVwS7mFH4xHbDRDGu5BKKc+cNJxUnpjyFFXt8OjNqSzqlXhyWe1iOqvSLW75IF2Ysj/3uvvuknt0IKCW2CqNm3szpn6fQvq31s/gOCN3lHQTRdm9Ea1RFmuLAznbABUBOE4y3917TWm6Q0ggHlQYjevAZ9VOIS4Z4cg9XS/0oWFLK2JUvwpkhSyolVoVtZ03z9DaVpHOJGKDlUTguLSE12ZjjS5QNq849uwuLuwznqg7gHzyic6t8NcyHYqpWZuyzyWHsBWBUGggf8PVwflwGGjQZ39cCIC/FjITDKrmJl2h48T/t9oEIMu7auBgfuzNg3/RPfRY9RFFJglduKe18mYszwP5+VZi/6RbWLMyhe8xhFZ+l2RgK316tLXfc77x7raT8URyVKYEvZQM9sLY113oN9CL3gXGDSP/IJxccW3qQcV/acKNli X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a36f655d-2071-4aa7-70a3-08dac0621a9e X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2022 01:48:01.4778 (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: GV2P250MB0923 Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/clearvideo: Remove unnecessary level parameter 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: q0CsP+bbpZpf Signed-off-by: Andreas Rheinhardt --- libavcodec/clearvideo.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/libavcodec/clearvideo.c b/libavcodec/clearvideo.c index 4d6549560b..82311bc645 100644 --- a/libavcodec/clearvideo.c +++ b/libavcodec/clearvideo.c @@ -362,19 +362,18 @@ static void mvi_update_row(MVInfo *mvi) } } -static TileInfo *decode_tile_info(GetBitContext *gb, const LevelCodes *lc, int level) +static TileInfo *decode_tile_info(GetBitContext *gb, const LevelCodes *lc) { TileInfo *ti; int i, flags = 0; int16_t bias = 0; MV mv = { 0 }; - if (lc[level].flags_cb.table) { - flags = get_vlc2(gb, lc[level].flags_cb.table, CLV_VLC_BITS, 2); - } + if (lc->flags_cb.table) + flags = get_vlc2(gb, lc->flags_cb.table, CLV_VLC_BITS, 2); - if (lc[level].mv_cb.table) { - uint16_t mv_code = get_vlc2(gb, lc[level].mv_cb.table, CLV_VLC_BITS, 2); + if (lc->mv_cb.table) { + uint16_t mv_code = get_vlc2(gb, lc->mv_cb.table, CLV_VLC_BITS, 2); if (mv_code != MV_ESC) { mv.x = (int8_t)(mv_code & 0xff); @@ -385,8 +384,8 @@ static TileInfo *decode_tile_info(GetBitContext *gb, const LevelCodes *lc, int l } } - if (lc[level].bias_cb.table) { - uint16_t bias_val = get_vlc2(gb, lc[level].bias_cb.table, CLV_VLC_BITS, 2); + if (lc->bias_cb.table) { + uint16_t bias_val = get_vlc2(gb, lc->bias_cb.table, CLV_VLC_BITS, 2); if (bias_val != BIAS_ESC) { bias = (int16_t)(bias_val); @@ -406,7 +405,7 @@ static TileInfo *decode_tile_info(GetBitContext *gb, const LevelCodes *lc, int l if (ti->flags) { for (i = 0; i < 4; i++) { if (ti->flags & (1 << i)) { - TileInfo *subti = decode_tile_info(gb, lc, level + 1); + TileInfo *subti = decode_tile_info(gb, lc + 1); ti->child[i] = subti; } } @@ -599,7 +598,7 @@ static int clv_decode_frame(AVCodecContext *avctx, AVFrame *rframe, TileInfo *tile; MV mv, cmv; - tile = decode_tile_info(&c->gb, &lev[0], 0); // Y + tile = decode_tile_info(&c->gb, &lev[0]); // Y if (!tile) return AVERROR(ENOMEM); mv = mvi_predict(&c->mvi, i, j, tile->mv); @@ -614,14 +613,14 @@ static int clv_decode_frame(AVCodecContext *avctx, AVFrame *rframe, cmv.x /= 2; cmv.y /= 2; av_freep(&tile); - tile = decode_tile_info(&c->gb, &lev[4], 0); // U + tile = decode_tile_info(&c->gb, &lev[4]); // U if (!tile) return AVERROR(ENOMEM); ret = restore_tree(avctx, c->pic, c->prev, 1, x, y, size, tile, cmv); if (ret < 0) mb_ret = ret; av_freep(&tile); - tile = decode_tile_info(&c->gb, &lev[7], 0); // V + tile = decode_tile_info(&c->gb, &lev[7]); // V if (!tile) return AVERROR(ENOMEM); ret = restore_tree(avctx, c->pic, c->prev, 2, x, y, size, tile, cmv);