From patchwork Sat May 8 01:27:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27692 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp1026169iof; Fri, 7 May 2021 18:27:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwxyNNe8dRWsBJJ1NJ82kLfbC679b8QaAnn9q4o5wKy+I1I2AljzdfUAJg0kPmadZQC3oZA X-Received: by 2002:aa7:c2cc:: with SMTP id m12mr15109481edp.1.1620437257009; Fri, 07 May 2021 18:27:37 -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 r2si6332921ejh.306.2021.05.07.18.27.36; Fri, 07 May 2021 18:27:37 -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=LFhcfpJ3; 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 2ECBE680771; Sat, 8 May 2021 04:27:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073097.outbound.protection.outlook.com [40.92.73.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F1CAC68020F for ; Sat, 8 May 2021 04:27:26 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ekQ4/myw/VAN8AO3g74EE/Rlva3xuMmlVwL6TdmtbPv2gG6CnQwmBqZeko3Dq2qmO/aXZWRb7ZJtrrWT1GpYt++zDgQZ8wiKuSj/01s5XWkbxqyHww7u3jupqpCia95szTGgTE+wjnw8RNm9ekQ6ubGnp4luEkuaRLtTCOIBkN8v9sMI1BLCK3mWcB+FUzAc/M5YgLz0FVjrMTcB9SBTjCVoYskHip6zS0/ugDKBt8w897xip0Wl9OWJV3GwIIVv+jY1vHOUcvxFd44/XhBLiaVfPl0xvjThidLClXHjS93TIdxGDEqIohgG9KxjSVPDtVeezU472p4+cNrgQwuzxQ== 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-SenderADCheck; bh=vcEtiBAiCH39kZgf5k3SXrHE43wW5x6zwG6lrU2ux10=; b=SLwbR+kYzHbSaZVM84wWb64GJoaMexHxqN7tV+S5/2xxJ9wlEVgu9+lwZOKqwLSNtyfADoiI/u/ONzrIenejT93flL0tVrT8R3oAUZmG/y6F/Tg5UVKNL9fsS0I0bzYFEomc6kT8DUB7e185NaYQYendTmO064AElUjXbf3gUXhw0D/8rDeSqEi1lLLtOKtgO4q/+SHZcKCwyBeB037J0xn0Io+bHwSuhwfcr/YMMT/X5x0H0uXFmEJPWjZ7drQYP+82ASUBG9m/nv4l809MCwgN7+WNJfvVUx+KbqfkT4sSNaTZ3nThFylRXCf2S4+SdkXJckuxSPWpYZaWpJ7c1g== 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=vcEtiBAiCH39kZgf5k3SXrHE43wW5x6zwG6lrU2ux10=; b=LFhcfpJ3TtVXPSGbcKaejhcUpadE7ZvvYA7Zq7fhc9NrDhn6sBIYFF6YQnoWyCg3VeyR6L97oj3GatJ7rN9eSSBE/wCSzvSol+I+mWKmDmm8FEmo/OKaOLbXNjZvID5iI6N3Y1IaItJLfqglK3bUddZX4jDU7H7+7+jeHYMnrtB+/MkoElznYFgf0YpMZf3tR7K0iwkcWCt/tiLbvMQNZl3q1Zu8VIxBXm5pi3WaMdds2FCtoasaZymfVzTWejBnz29xkye++O4VSoMVOC+JhWW+/AWFnSkUwDdh5gmUoTfsCkA8eHjlkksbuZTtnDgrlNjjwqWqsI4etyX9zrl0hg== Received: from VI1EUR04FT047.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0e::4b) by VI1EUR04HT047.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0e::349) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Sat, 8 May 2021 01:27:25 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e0e::4f) by VI1EUR04FT047.mail.protection.outlook.com (2a01:111:e400:7e0e::81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Sat, 8 May 2021 01:27:25 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:04E907212059A490769D4BDD71F8B7514B2EF987CDD470F462A69B7DCACBDB71; UpperCasedChecksum:463877E7B46F8F915F29DA6305D658606B11F33F83BA6A6554680C3F68AA66D0; SizeAsReceived:7617; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4108.027; Sat, 8 May 2021 01:27:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 8 May 2021 03:27:15 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [AWIpf5fJyLpuGI6j0BILc+mBQ08LCoWA1y79lpOBQuc=] X-ClientProxiedBy: AM0PR06CA0123.eurprd06.prod.outlook.com (2603:10a6:208:ab::28) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210508012717.1025788-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by AM0PR06CA0123.eurprd06.prod.outlook.com (2603:10a6:208:ab::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Sat, 8 May 2021 01:27:25 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: b0f91571-6b68-47da-9951-08d911c06f89 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWUr2JHLiAqcqkhUQ1DDaKHqKaETF5BwPeXRCh5HytqA+lnaOAvmrAii3i7uyiHAUG9fOeRwkT/7eGFXxtJQ9lL7zYvBwXDepy7yo55TljWpnZGBmjjUiy5p7eEYyhR/1SFueh5kaHDIIjvec6b7kdb0TfoQxqafOlPTNC/+UExygJkwXZtykUhTejKDuWYIXCGM88FM8qb9IcRrwU5+W8msgN2CyV0+vnvq8f3r6HDvo8jFY7oaD9zR9MEXirhoO8W+XXBHne01FHpQLQGch3Xugw0rm4izsHbM6CtlBRitTBrz45RjP2q/BKbsdTQr3XyKAGQjKeQ9Gpgy5QUXivqnSKM6r3ADAAtuSiL0c4AeVfoMZtMydf8Q6qEyfGDos7ajt7Yo9TFmLx03MRsi9SKu6CoIkl9KvCFqrpj5Le9PJpb4oq31pWkzlcp60yeb/J0CPGyhcyjm/KxLlbBvBXdXwpktFKRbUggBER1bZSuEAkOq2MGF3bagJWiYmmTobSypXAMH4k1b8dcEkzXfo7pDDNFiP/gRNe4XC5PB60t3zGyrm/cZRWjNpCz12KwfETN+NhX5idh/CqSihZaD9cS1gAUgUtgRQy2asp5Y/TK/Fk9095gN+m8UA09aLzMrAv6nSDeAnyprLPBXY/oVMkwrJGrWpwbTKLmNuUdEvB9G4Z2QPwFByT3ccuRDaqMEBmfjLsr1+sX5DO7tBBVB8+pLylnFiQzC0o= X-MS-TrafficTypeDiagnostic: VI1EUR04HT047: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: km9jAVagC8pF4MicxGMjnDl8gNDtl2dMjh9IeRGiKV4SGBdjD0Zs7RE6YnxjtiUu1HqIMCjvyxJyztgXlCMcAnO9Xj25LJxpEwBqnFGmWaLYlEHFrc/I2jZNfBwz7tQ7BZxHEz1UXQWzfLRBfM87it6MCKO4iH/hyIL7JRUWCpPuHaYSbN6r36vrGd7fnXZqAdpNcgQAqLwUwJb0+0zt18lgnP3czISp5SHb8Ri3qRP+/rYSUREjcN5dSxsOPGWiEZ2k91DALijUDk5qlhgPR00Yx0wTyW6+M+gOZdyhyQKbmUw4CH2+Z+5UBOE7X8v/PkOYs4iWV/aOs7MkskFZH36uNvBwCiA3OEijpK+IkJSj5yZ+rwih1WpaM3ZhmSyCzQG3WJsq1Dia9o2vtVWuZQ== X-MS-Exchange-AntiSpam-MessageData: I3c7QSWrnsOj6ZJYYPEdFKyzkU8VTb8Z0HF+uXbbMgGMWi4dDs1Vt+WpvF/rA23731MZLdgwV9exSEKdCELOA7i8Ooxs8ZBSR/GFpRF5sjWR1pd+gdgEnHhAhQMW/cRtMl/HTT40unkn8mOvr4oP6g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b0f91571-6b68-47da-9951-08d911c06f89 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 May 2021 01:27:25.4326 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VI1EUR04FT047.eop-eur04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1EUR04HT047 Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/vp3: Avoid code duplication when initializing coeff_vlcs 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: BpHI970GMlef Signed-off-by: Andreas Rheinhardt --- libavcodec/vp3.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 9aa84e83b7..ef443dbf22 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2408,6 +2408,8 @@ static av_cold int vp3_decode_init(AVCodecContext *avctx) s->fragment_start[2] = y_fragment_count + c_fragment_count; if (!s->theora_tables) { + const uint8_t (*bias_tabs)[32][2]; + for (i = 0; i < 64; i++) { s->coded_dc_scale_factor[0][i] = s->version < 2 ? vp31_dc_scale_factor[i] : vp4_y_dc_scale_factor[i]; s->coded_dc_scale_factor[1][i] = s->version < 2 ? vp31_dc_scale_factor[i] : vp4_uv_dc_scale_factor[i]; @@ -2428,27 +2430,15 @@ static av_cold int vp3_decode_init(AVCodecContext *avctx) } /* init VLC tables */ - if (s->version < 2) { - for (i = 0; i < FF_ARRAY_ELEMS(s->coeff_vlc); i++) { - ret = ff_init_vlc_from_lengths(&s->coeff_vlc[i], 11, 32, - &vp3_bias[i][0][1], 2, - &vp3_bias[i][0][0], 2, 1, - 0, 0, avctx); - if (ret < 0) - return ret; - } -#if CONFIG_VP4_DECODER - } else { /* version >= 2 */ + bias_tabs = CONFIG_VP4_DECODER && s->version >= 2 ? vp4_bias : vp3_bias; for (i = 0; i < FF_ARRAY_ELEMS(s->coeff_vlc); i++) { ret = ff_init_vlc_from_lengths(&s->coeff_vlc[i], 11, 32, - &vp4_bias[i][0][1], 2, - &vp4_bias[i][0][0], 2, 1, + &bias_tabs[i][0][1], 2, + &bias_tabs[i][0][0], 2, 1, 0, 0, avctx); if (ret < 0) return ret; } -#endif - } } else { for (i = 0; i < FF_ARRAY_ELEMS(s->coeff_vlc); i++) { const HuffTable *tab = &s->huffman_table[i];