From patchwork Sat Feb 12 06:41:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34254 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:14aa:0:0:0:0 with SMTP id bz10csp3856094nkb; Fri, 11 Feb 2022 22:43:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJyXvAahJQwTysZdFRx5NBjRbswFmxF/eHb/x08CzEskapbzUpWafcpmT6OzJJj9kfr0ycKh X-Received: by 2002:a17:906:99c1:: with SMTP id s1mr4251372ejn.298.1644648232218; Fri, 11 Feb 2022 22:43:52 -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 g22si18926010edb.619.2022.02.11.22.43.51; Fri, 11 Feb 2022 22:43:52 -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=coC7fZj7; 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 9664F68B2C8; Sat, 12 Feb 2022 08:42:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2050.outbound.protection.outlook.com [40.92.91.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 53E5468B281 for ; Sat, 12 Feb 2022 08:42:01 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KB8qJ9ejcc/IXKaM9ZICGuOsQ50oNLM4olOGBQH/Nv+e8Zh1QoKVz71MWkNr7DWNJSdybTF48acspyCHsmMXgIT0xFnaHv28dXMvP+XXxNwLqU0/0YJdRB33fls3NnubNwwsL1ChSwYDGBPoOQn6yZ0UJnr383HU7R1feEqJAhkauvWYE+mq3OcECGKJn4L4IaUvXWQu2pMFBGv4zkvTmR0fXGwtKJbMXEe0f9kVt7yFbb6P6u5mDASOW0eYq9kh3Ir998vpdwYFYhGhr2WaW316sGmk9h8TdnHcMVvPlLOiMVDYEjyghovS/Qu6k52GD8tZnY81rRI7wcZzLZhAcg== 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=UnkCTfQICuqRM+CZdU7euH3TouxkA28EfgD2vRmqaw8=; b=jIz55/jGPMvN7uB7x8hp2rf0CplGdbiLmbdw7Dl7ZXRNg51vD+OAwtmeulLLw5/E1Uo3wYTllotD8mty0+APp3rgJZ49g9XnRJjpUuMDiqYPo7Khz0zBxx0cTwZViYvDooyuTTNP3g45h1Mm7vEhuLlLW+R9k4EoBMW+tG5Dp/XMIUJwAJaGL2aYHLhIB9RC48C5K6rsML42QrciCyHpf5Fetb8lheKRm8wQBHX7q1sfK+HArFhUBZNA/7dFKaz9yxSyvaTHM0+u2Ql6tQ+c9bnAEp/ZD8F3bbGGkE/UcElI4wqF/3CyRnS48GTV9cf7TuzAWLHIgXNdBP5Q30eFZw== 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=UnkCTfQICuqRM+CZdU7euH3TouxkA28EfgD2vRmqaw8=; b=coC7fZj70WEf5A85pDvrXXeCUpHnP3Dp5GwRiMyZygsyfjZgIYInnKmvqEfN3OHBD9m5bG4HoTs5jvf7B57eh1cXvwKq8pgP24mYW9w+ZMWqwttXcIT82zXFhrhF22oX7J0rjSGcuBnOARM7IBobhSzX+TiByTrlkyEKXoC66hg6jh3z4di1tm8Fl2Tue1jIJ1R2ZnN+jzDYYtB19GMxPAcew2psvelL4FgE9zYN0W2+NV8huqJkfJXGm/kKl15mY4wTP6hN5IXlszX+Va7yZxOepLPbBKGSRK3Wv824wSY1NRXdH/Urx05VP+7QSW22xrSmU4OjcJuLpoeDLmH9DA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by HE1PR0301MB2363.eurprd03.prod.outlook.com (2603:10a6:3:68::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11; Sat, 12 Feb 2022 06:42:00 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4975.011; Sat, 12 Feb 2022 06:41:59 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 12 Feb 2022 07:41:31 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [udLiJjAvis7CmoSWbISYeFC2iIkfdm/g] X-ClientProxiedBy: AM7PR03CA0008.eurprd03.prod.outlook.com (2603:10a6:20b:130::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220212064131.2265452-16-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 904120a5-54d5-406c-10d5-08d9edf2c52e X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSJybpSSbCo57WJd93pOqVlF6BkQuEdMA1v1syxrMYBSIMrRT/M/COdpGs19/Mlpe4YTZ14Kg8nXBKKJVBqVQSewXbvjSNg60PO/Xz8mV+Dw9K22pX+5VCZD7XLxLHi4oPsMJ2FL/1vK3u6UXjEknDAI4BIAdBVGaL2/c1aP2htvNxMXi9/9pHuGMr46efGR4Zhv5jIpmND3XWVY/UOp1DOGEtYYxrorZi+5Ifgt4S6PuUakg3sIZ6QnrQWsDzQwNkcqoJfNlKhWEylmiW5Pvq+PuOpVPZaCn3GLTkawPkNKTvzNc65KEiJu0sUWzGXQ64n6sYZt8rLlCXpe7QNnLCEhN42d9LKW72Uqju/R6mZvjsmWVlkM0T4ETS0BSvv4xJrb6MbH7qVYK4FX0J1+jIF1Slk1wReQtnNDRD702vNp18rOmQFjVTLdLw2AX12Ub8ceMMKIKmRQ0vqF4gWTQOZ2jNOTSQDwcLEc9gmvczcYANqj59zbD3kTibG5jGNK9SdyXspsAqKrNbBcmSb8drhc1DO5MVbZVVD/g7t4FFOm6gwdrA4gCuNDEM5ZLtXwllAp6pOcj+1UbVxxKhCzxqaFKc2n07OEHKiMOP+hUDWRfDZM9hKhP0aiudY6V8AC8gZogiTQOzUZDipgHV6z/xdAd5opflU4qj5WweKrXEoZ1fmQM3RjaKH6Cs6+/9mGDuKh/XSVAH03fg6HZSy5/e9zmp170Jd0+4jH97cGS3JUBbFYWAX2Og9Gwd2GQGMJSU= X-MS-TrafficTypeDiagnostic: HE1PR0301MB2363:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4xdeAvUaVQB5l5kxP7esSLfVuMx/lLjsFJo2J6EA96E/d2HdoCnA3qIDNFeuomW6WihclxqnKnyBkbMI3rDsEek2h1tT7SRSRKAGWg65ifQ5xxb1Ps2LfDZaTvCvXCXYiccyU34UfV+vPD5v9/O/SmmHNroHY8A/3VfwF6REJXpU0AD4OeftXV71dTDS9OYpO29hQ3T49vxOYBx9QyorEvA52vC38SgMFB/ybPbC2rTmYErk5iyVrzV78mslZ7V0EcQI2iS0svDuGgclH55pEHshKL4J5M2QO6iZa9PeIAHA+DgKfoT3F46MLIC4jx1/ewPaxF0BGk+54W3uB/I4X/9LSmgBdRFDZjjH/sULe/qmyhvzazSllhfktu+cIxvN6qzSjG6L8qU38mcoVKk+LHy8raTbN/eIN88W0JY6vqiT12p3RgkkIt0sD0nJb/g8mFpnRiek9hyYfScyblpOM88YqtzWRAXKhu0d/1hZi147zVTpTJAs8/iaAJ2II4kfSPGqTFpM8WRG3pp41zDlcrvseK3Ee9XuHRSMRMHuiY/Q4uKQtPlknRouW5VNFjb8CwY9lr9dKQSzf+cvMXO6zQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1X/Zs9t8dbineaGT7g2yTk9fgYuhjJ0072JnIdErHmrlLpG3dSO6AwraKNBxN3lhwBDv1NZaL2J4KSOcJtVN7F46TUxndHErXShA9IOQrHVvYE/Vjx+P0TrKrjreiau+ThiJq3nEyyAcITilx2Y70sxG99kH2kJmFiKAbpm4CHbiuvNmKzV/aaGiO2Lob+XIbH99jWHWWTfTmdKTIINFWJxZv62XPpaCnf3KPGgZYxpYCcA9U/fRjqLhj2g1x/4nNROZBGkdlB9NC4BXUZ5SkjW9G/wuzHH6UtfqS68bW8eXQuK8bcheuXEIF/SfuMcPdR8bhM4sNWGTTzg0FK/PligT2R1BqC0+Fis2Jt01NEwQAfd0mrQeFodYO4jyLwZG+7jQ5pX61jDT3WrCQrgXP4jrvL27Kb/GshZoJCKr8/GB56B2jhJlWp5/xWh10+YLptVtiMPhj/UMBS2LsdSgfr2Kb9EINy7ZmDW1BA51hjFeXnnXd1Rxm8D+9xkkitg0UTpECy0HHH4vQh12Lg69vi1QfeK3XgGc0dr+6KXKD8lUiOZzzm5U4vOXLBo6heWigJWFySdu6h6tf2nV8q/O+tCYPvM/SSREt8lHNRVOOOxZb+SxKjpgZ84JOi2eWRDTQdAoplGB+zmdpozoXH4M+GxqH1Ju+ITUrEMKRUz1UBrHVQ/JiW6GL5YfEzrCr3MZo9TGo+av6AN/YRf4HvhLYI7VI4p8pVxJqy26xiy7Jc7uPGTPFBoCeKonBXmQZbss044m1YnUmKz1Q6RqxEPbk7sO2ddA9XCRgkd3BZQYExvGY3fpjEut58+4xK8OiRV56mIzLKODG8yLOf12AKnrsmeUltxLp+cei1KHPNtbjlCYjXOGd0W4O2XCJp0QIz5ZMeB+1Be2IeT+sA3f+DywSgYs7ZCX2YFxrTp2U9vsOANrXUJPJizCAtvXElVzplhGFbO6VopANg0ALGJtDGrHFQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 904120a5-54d5-406c-10d5-08d9edf2c52e X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2022 06:41:59.7353 (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: HE1PR0301MB2363 Subject: [FFmpeg-devel] [PATCH 17/17] avcodec/msmpeg4dec: Reindent after the previous commit 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: 5Mls6D0d4DNT Signed-off-by: Andreas Rheinhardt --- libavcodec/msmpeg4dec.c | 114 ++++++++++++++++++++-------------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c index ba72c7ee50..ac7c7d75e2 100644 --- a/libavcodec/msmpeg4dec.c +++ b/libavcodec/msmpeg4dec.c @@ -298,70 +298,70 @@ static av_cold void msmpeg4_decode_init_static(void) { MVTable *mv; - INIT_FIRST_VLC_RL(ff_rl_table[0], 642); - INIT_FIRST_VLC_RL(ff_rl_table[1], 1104); - INIT_FIRST_VLC_RL(ff_rl_table[2], 554); - INIT_VLC_RL(ff_rl_table[3], 940); - INIT_VLC_RL(ff_rl_table[4], 962); - /* ff_rl_table[5] coincides with ff_h263_rl_inter which has just been - * initialized in ff_h263_decode_init() above. So just copy the VLCs. */ - av_assert1(ff_h263_rl_inter.rl_vlc[0]); - memcpy(ff_rl_table[5].rl_vlc, ff_h263_rl_inter.rl_vlc, sizeof(ff_rl_table[5].rl_vlc)); - - mv = &ff_mv_tables[0]; - INIT_VLC_STATIC(&mv->vlc, MV_VLC_BITS, MSMPEG4_MV_TABLES_NB_ELEMS + 1, + INIT_FIRST_VLC_RL(ff_rl_table[0], 642); + INIT_FIRST_VLC_RL(ff_rl_table[1], 1104); + INIT_FIRST_VLC_RL(ff_rl_table[2], 554); + INIT_VLC_RL(ff_rl_table[3], 940); + INIT_VLC_RL(ff_rl_table[4], 962); + /* ff_rl_table[5] coincides with ff_h263_rl_inter which has just been + * initialized in ff_h263_decode_init() above. So just copy the VLCs. */ + av_assert1(ff_h263_rl_inter.rl_vlc[0]); + memcpy(ff_rl_table[5].rl_vlc, ff_h263_rl_inter.rl_vlc, sizeof(ff_rl_table[5].rl_vlc)); + + mv = &ff_mv_tables[0]; + INIT_VLC_STATIC(&mv->vlc, MV_VLC_BITS, MSMPEG4_MV_TABLES_NB_ELEMS + 1, mv->table_mv_bits, 1, 1, mv->table_mv_code, 2, 2, 3714); - mv = &ff_mv_tables[1]; - INIT_VLC_STATIC(&mv->vlc, MV_VLC_BITS, MSMPEG4_MV_TABLES_NB_ELEMS + 1, + mv = &ff_mv_tables[1]; + INIT_VLC_STATIC(&mv->vlc, MV_VLC_BITS, MSMPEG4_MV_TABLES_NB_ELEMS + 1, mv->table_mv_bits, 1, 1, mv->table_mv_code, 2, 2, 2694); - INIT_VLC_STATIC(&ff_msmp4_dc_luma_vlc[0], DC_VLC_BITS, 120, - &ff_table0_dc_lum[0][1], 8, 4, - &ff_table0_dc_lum[0][0], 8, 4, 1158); - INIT_VLC_STATIC(&ff_msmp4_dc_chroma_vlc[0], DC_VLC_BITS, 120, - &ff_table0_dc_chroma[0][1], 8, 4, - &ff_table0_dc_chroma[0][0], 8, 4, 1118); - INIT_VLC_STATIC(&ff_msmp4_dc_luma_vlc[1], DC_VLC_BITS, 120, - &ff_table1_dc_lum[0][1], 8, 4, - &ff_table1_dc_lum[0][0], 8, 4, 1476); - INIT_VLC_STATIC(&ff_msmp4_dc_chroma_vlc[1], DC_VLC_BITS, 120, - &ff_table1_dc_chroma[0][1], 8, 4, - &ff_table1_dc_chroma[0][0], 8, 4, 1216); - - INIT_VLC_STATIC(&v2_dc_lum_vlc, DC_VLC_BITS, 512, - &ff_v2_dc_lum_table[0][1], 8, 4, - &ff_v2_dc_lum_table[0][0], 8, 4, 1472); - INIT_VLC_STATIC(&v2_dc_chroma_vlc, DC_VLC_BITS, 512, - &ff_v2_dc_chroma_table[0][1], 8, 4, - &ff_v2_dc_chroma_table[0][0], 8, 4, 1506); - - INIT_VLC_STATIC(&v2_intra_cbpc_vlc, V2_INTRA_CBPC_VLC_BITS, 4, - &ff_v2_intra_cbpc[0][1], 2, 1, - &ff_v2_intra_cbpc[0][0], 2, 1, 8); - INIT_VLC_STATIC(&v2_mb_type_vlc, V2_MB_TYPE_VLC_BITS, 8, - &ff_v2_mb_type[0][1], 2, 1, - &ff_v2_mb_type[0][0], 2, 1, 128); - - for (unsigned i = 0, offset = 0; i < 4; i++) { - static VLC_TYPE vlc_buf[1636 + 2648 + 1532 + 2488][2]; - ff_mb_non_intra_vlc[i].table = &vlc_buf[offset]; - ff_mb_non_intra_vlc[i].table_allocated = FF_ARRAY_ELEMS(vlc_buf) - offset; - init_vlc(&ff_mb_non_intra_vlc[i], MB_NON_INTRA_VLC_BITS, 128, - &ff_wmv2_inter_table[i][0][1], 8, 4, - &ff_wmv2_inter_table[i][0][0], 8, 4, - INIT_VLC_STATIC_OVERLONG); - offset += ff_mb_non_intra_vlc[i].table_size; - } + INIT_VLC_STATIC(&ff_msmp4_dc_luma_vlc[0], DC_VLC_BITS, 120, + &ff_table0_dc_lum[0][1], 8, 4, + &ff_table0_dc_lum[0][0], 8, 4, 1158); + INIT_VLC_STATIC(&ff_msmp4_dc_chroma_vlc[0], DC_VLC_BITS, 120, + &ff_table0_dc_chroma[0][1], 8, 4, + &ff_table0_dc_chroma[0][0], 8, 4, 1118); + INIT_VLC_STATIC(&ff_msmp4_dc_luma_vlc[1], DC_VLC_BITS, 120, + &ff_table1_dc_lum[0][1], 8, 4, + &ff_table1_dc_lum[0][0], 8, 4, 1476); + INIT_VLC_STATIC(&ff_msmp4_dc_chroma_vlc[1], DC_VLC_BITS, 120, + &ff_table1_dc_chroma[0][1], 8, 4, + &ff_table1_dc_chroma[0][0], 8, 4, 1216); + + INIT_VLC_STATIC(&v2_dc_lum_vlc, DC_VLC_BITS, 512, + &ff_v2_dc_lum_table[0][1], 8, 4, + &ff_v2_dc_lum_table[0][0], 8, 4, 1472); + INIT_VLC_STATIC(&v2_dc_chroma_vlc, DC_VLC_BITS, 512, + &ff_v2_dc_chroma_table[0][1], 8, 4, + &ff_v2_dc_chroma_table[0][0], 8, 4, 1506); + + INIT_VLC_STATIC(&v2_intra_cbpc_vlc, V2_INTRA_CBPC_VLC_BITS, 4, + &ff_v2_intra_cbpc[0][1], 2, 1, + &ff_v2_intra_cbpc[0][0], 2, 1, 8); + INIT_VLC_STATIC(&v2_mb_type_vlc, V2_MB_TYPE_VLC_BITS, 8, + &ff_v2_mb_type[0][1], 2, 1, + &ff_v2_mb_type[0][0], 2, 1, 128); + + for (unsigned i = 0, offset = 0; i < 4; i++) { + static VLC_TYPE vlc_buf[1636 + 2648 + 1532 + 2488][2]; + ff_mb_non_intra_vlc[i].table = &vlc_buf[offset]; + ff_mb_non_intra_vlc[i].table_allocated = FF_ARRAY_ELEMS(vlc_buf) - offset; + init_vlc(&ff_mb_non_intra_vlc[i], MB_NON_INTRA_VLC_BITS, 128, + &ff_wmv2_inter_table[i][0][1], 8, 4, + &ff_wmv2_inter_table[i][0][0], 8, 4, + INIT_VLC_STATIC_OVERLONG); + offset += ff_mb_non_intra_vlc[i].table_size; + } - INIT_VLC_STATIC(&ff_msmp4_mb_i_vlc, MB_INTRA_VLC_BITS, 64, - &ff_msmp4_mb_i_table[0][1], 4, 2, - &ff_msmp4_mb_i_table[0][0], 4, 2, 536); + INIT_VLC_STATIC(&ff_msmp4_mb_i_vlc, MB_INTRA_VLC_BITS, 64, + &ff_msmp4_mb_i_table[0][1], 4, 2, + &ff_msmp4_mb_i_table[0][0], 4, 2, 536); - INIT_VLC_STATIC(&ff_inter_intra_vlc, INTER_INTRA_VLC_BITS, 4, - &ff_table_inter_intra[0][1], 2, 1, - &ff_table_inter_intra[0][0], 2, 1, 8); + INIT_VLC_STATIC(&ff_inter_intra_vlc, INTER_INTRA_VLC_BITS, 4, + &ff_table_inter_intra[0][1], 2, 1, + &ff_table_inter_intra[0][0], 2, 1, 8); } av_cold int ff_msmpeg4_decode_init(AVCodecContext *avctx)