From patchwork Tue Sep 26 22:16:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43936 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:2a18:b0:15d:8365:d4b8 with SMTP id e24csp2209525pzh; Tue, 26 Sep 2023 15:19:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF8YDTdPRzRVnhS1XEiwyir5K7SlBrazDcJUtWRIjkkakRL/29mOzN8VLidSus/xoHmDuQM X-Received: by 2002:a2e:301a:0:b0:2c0:302d:f995 with SMTP id w26-20020a2e301a000000b002c0302df995mr278782ljw.1.1695766784233; Tue, 26 Sep 2023 15:19:44 -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 t8-20020a170906948800b0099bd23e8361si12615854ejx.862.2023.09.26.15.19.43; Tue, 26 Sep 2023 15:19:44 -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=tSIl4Ffw; 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 2EF2568CAE5; Wed, 27 Sep 2023 01:18:11 +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-vi1eur05olkn2083.outbound.protection.outlook.com [40.92.90.83]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6B47868CA6E for ; Wed, 27 Sep 2023 01:18:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Nc1LzNgdR7o5izWfODDmAR7r+2N8HGi7tg0yeYwPA40Vaw5PXKlXFhhSjfhQucGifiI7bcMDcnvVardXAZg92EGBbGDP8kWidNYuzp6Clq2rB1s1vS+PQckmCREREwGtPQO3z7OggcQPRW1+PXA80z92aV+IPLCZqLeZsLwLGuVczv3NOEEO+cVra9HGDhHYc0+oWcZJfWS+a1zthb5ocwCOE5AS9BB5RBo294fA8bjQ+iZ7ACF4A7ZM4JfT9oq+30rIW6vYHuYamnKg9mD5Pity3ACraEmSKIWCIOGeqmE3sfQN9I7B8TRhV3+MHJhNKZDycGxqobqaFeywUfYHjw== 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=8hkN1pxQUmDs5Jqb9XiMycR9hUt9wuaF0xG1d11bHj4=; b=RbNlCSIN493wbzcVbDWIL9+rkphM6vn2LCZQryp0W1ePqk3RWe3AEQepZDQIR7/RA3oyx11oiI9WG1+TSrFXbuN09Hr8UmGSQu7vxdPAIKmWZ7rOg+K4tS22id8z+vvsF+UOkAacYSb9gRjeTFsmBatmh8Ux8D2jIFMkNi4q84rgA3ZAXzWJOZuVsbrVjPPJi1IO5Mjk6F3WoFjFtnZZmYTFpB5g/IyeZKq8UXIibf2AuGqoXVuDLy/llZzok5Onp3et0VYv70hL2vB+ftQCQIt7KCDLqofQ1VmRXvzotJLifHVdOsj4stf/Z5fj8ZLTAuySq99OvchfkZ3a0poQgw== 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=8hkN1pxQUmDs5Jqb9XiMycR9hUt9wuaF0xG1d11bHj4=; b=tSIl4FfwExohDpLrRwXXms/WASocIrwGRGrrKKRz+iB1QtOZpvIpLFo/UIVU+CCGU5PZ7pgd/rJOURteR/TL5ks6r0bq0TguJubqCdfWpogcutzkw8VPcgCvRRyN9PVAPGfCxU31ldygC4WeKriRL4JZvaoRE1uDm0hpp+vaZdAaOhAtult+hCLUbnnHSDRcV0gWJv2D1o1otxkMoAWTMEW94hJ/pQiFfY0V5YY6wKy/uzDz+Wje6R4r7f43WcDMjuyl7RIQGkweH7J89Cd4ZeVjCELLtbownWR0DmT03fsdjwNC/Ep+det7veVf1KBYahUlp82NMBlNkgy4Tu0YqQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0189.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:275::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 22:18:08 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::9d42:7b4f:71ef:c76a]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::9d42:7b4f:71ef:c76a%3]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 22:18:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Sep 2023 00:16:54 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [Nm2/edThen/FTv6Qz8uZyzdgQJCFaD3z] X-ClientProxiedBy: FR3P281CA0019.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230926221732.3711507-22-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0189:EE_ X-MS-Office365-Filtering-Correlation-Id: 15531b35-e071-4c93-f76e-08dbbede7648 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: unbV+PdPG23gWuLRUwsV/5Ds5n4yqqsfFttBmAumoH/YeDs1ihinbYjwQNa89Zyr1ozIE7Cz+CdCKcv/v1UEOOSEFfT4GSOe2XtlCfhkmNP4G8Rz2ylqLgZBNkJGL6AAmJ+oC5Hs35h35Y6nSAymLTIlJjC927oy1npBImuD/D+Ke6mwk3/mX0CmT5tWRtXyUDf11MSO8yTNcV+OUtuLNQ7mPfkGrL1Al2EL0IuTGpLSTltl75eqxtHl6C6WtDAmqGbOSnqASP64d2BFpFIVr3EMv1AdE9IUduh2i3nMHZFd0XQz+8lkHGVRuUdKcKYwfUcxyA/LUGikLa6YQNOl06lX/4QCma2PuYq7JWIHO5Yc8WQqTNxP5jF3JutA6tXnng8EVfmCG+JUdKrJLPsxIuLoFUa0UdnESjRO5Lv1pudaPj1EyoWAsmiU+VfYEGz4PvtDXEToWHpzsecKmpjMfw+hKq20izaZP3zt7nzzzvPDvM+pzwD7LCcXms4dlCCRx0/tRqnOT5s7wSnLqrnC63nBmKqG/nxNZmD8HSJApvgKvclNgPdWO+vh3q9bRnDXgps7omlu65JD7ApbOUYrg7gZpaA7WLj1CL87wHaO3qGWHChc2Uz4CGYUSHiwP9h2 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: S9XOocR0CzXgx/kP2moFsKpQ2LFv8KLt6QYrVjkr5brvnLXElNwIdmaPcLScuWxLhpKnFeen7UqINHk7rcB7mbnlk0bXZGdsYi8oxWF7vfCWwB4wfOG9HQs/uitkKDsHe2rNQNVFUO1DpjjZWu/yIK5qYsf0dpw1slvDSzjQ0Zt8sbiQuw4euF4Lq6lXMPR171zp9FJjt6QTq1BoUblHTC/hf+r2Iyruy32yJqzrKTxQE/FJOSiDmit1BsnCfXVMD03bCPDh8z8CSZsWGz+5Ownv6XQmL/1lNTrriNuISCTrMEEwqovigYNjz/IlrntHTMpB2+E9NIiI2Z53V5a+nV+vwR4jwRXAsyFfW3KnOfW7ekVwZH9akWxwgIJ6KPC3TblJIHDPRrcezvz3fVIbrzZ1lVMVfxmosOHHateTttKh9w2mMPMvCi7f469Fd/dPJd/afS/NxjSCjRZu3wViWc8aCcCopGkOB3TUAMSuSQiPUPROr85BqDv6TzZ1KS0IcurKPLpngUijMtnZHK4XdsfFF6bVlpaROVJlhAkiJLV7OrTm8SPGLknxCni4H/NgLjoCHzbvXjBHiME8yVECPD6OP//r+G9GfPYTE0C3CRlmjQhHc7x+XCvAmJ+x/7JvUICGxgSnGs4RqkTX4GGCMOmV2N+3dxpSrfytKl6v5f+NmttRMVgYd0q/2Q4yXiJ4l/1yTc9sGNa/XiexeJG9f4LnyNAX4x4rYrBTJxRejwpgsJueq1u2HU0rmDPAlCGiNbb2lh+WvQGyJpNi/Uru5B4yHjIV/TW/qa57XPhYhRa9nxSkUv0TW1GYMSLiGWc4vsrBdBrGZL1Gq8mqPWimch4hh3g+7ro3sn/3pAC7DpCozb13uSjjm1PG0bt/uepIoMXhULtrntSFZ/70vmYHpg/YT+wB09LuQzY9FlLAlcfe9OXzlaIL93BcLUcCbWJWYMNCJO882WmpQ5AeF73wxdHR0AYRnNj5T97nQ5Lo/MWo3WKJVbXN1+V7rjrCHy6dUcCsCJ5ATu7KOkU6a0nKxV3gWD6RyevNwbWnKY+EYPj0kcStFGyI3HB87aoxJzudz/0HbYhn3hQrekrnGADRhcc47rRTzfSA3pyRjJ8aYh8GoIIg35zcFhmbphuZXU3mEtOX6EgFW19sGasg9y2CjUPXRPOZB8RDxTX01RzXt3XzyNXIlBz1BqLssCIxcndOLoaks/VvZQvvEaitfjVMAOZ4glGRNEKhsya+M3JWReyWhJIFfa2eyUQaWHkqzhbc X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 15531b35-e071-4c93-f76e-08dbbede7648 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 22:18:08.1910 (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: DU2P250MB0189 Subject: [FFmpeg-devel] [PATCH 23/61] avcodec/vp3: Reindent after the previous commits 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: qks8o1lOQYI+ Signed-off-by: Andreas Rheinhardt --- libavcodec/vp3.c | 52 ++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index b7c323b153..b11be97fbf 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2488,34 +2488,34 @@ static av_cold int vp3_decode_init(AVCodecContext *avctx) s->coeff_vlc = vlcs; - if (!s->theora_tables) { - const uint8_t (*bias_tabs)[32][2]; - - /* init VLC tables */ - bias_tabs = CONFIG_VP4_DECODER && s->version >= 2 ? vp4_bias : vp3_bias; - for (int i = 0; i < FF_ARRAY_ELEMS(vlcs->vlcs); i++) { - ret = ff_vlc_init_from_lengths(&vlcs->vlcs[i], 11, 32, - &bias_tabs[i][0][1], 2, - &bias_tabs[i][0][0], 2, 1, - 0, 0, avctx); - if (ret < 0) - return ret; - vlcs->vlc_tabs[i] = vlcs->vlcs[i].table; - } - } else { - for (int i = 0; i < FF_ARRAY_ELEMS(vlcs->vlcs); i++) { - const HuffTable *tab = &s->huffman_table[i]; - - ret = ff_vlc_init_from_lengths(&vlcs->vlcs[i], 11, tab->nb_entries, - &tab->entries[0].len, sizeof(*tab->entries), - &tab->entries[0].sym, sizeof(*tab->entries), 1, - 0, 0, avctx); - if (ret < 0) - return ret; - vlcs->vlc_tabs[i] = vlcs->vlcs[i].table; + if (!s->theora_tables) { + const uint8_t (*bias_tabs)[32][2]; + + /* init VLC tables */ + bias_tabs = CONFIG_VP4_DECODER && s->version >= 2 ? vp4_bias : vp3_bias; + for (int i = 0; i < FF_ARRAY_ELEMS(vlcs->vlcs); i++) { + ret = ff_vlc_init_from_lengths(&vlcs->vlcs[i], 11, 32, + &bias_tabs[i][0][1], 2, + &bias_tabs[i][0][0], 2, 1, + 0, 0, avctx); + if (ret < 0) + return ret; + vlcs->vlc_tabs[i] = vlcs->vlcs[i].table; + } + } else { + for (int i = 0; i < FF_ARRAY_ELEMS(vlcs->vlcs); i++) { + const HuffTable *tab = &s->huffman_table[i]; + + ret = ff_vlc_init_from_lengths(&vlcs->vlcs[i], 11, tab->nb_entries, + &tab->entries[0].len, sizeof(*tab->entries), + &tab->entries[0].sym, sizeof(*tab->entries), 1, + 0, 0, avctx); + if (ret < 0) + return ret; + vlcs->vlc_tabs[i] = vlcs->vlcs[i].table; + } } } - } ff_thread_once(&init_static_once, init_tables_once);