From patchwork Fri Sep 30 02:18:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38474 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1399180pzh; Thu, 29 Sep 2022 19:19:18 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7JGsJMPKRQfr/0wbmbLuGKc5Et7FeyROxjOqNY8W/w1hSZGjGVoOU8ZjML0K82p5pMiGLH X-Received: by 2002:a17:907:a47:b0:780:6883:2a37 with SMTP id be7-20020a1709070a4700b0078068832a37mr4819807ejc.219.1664504358282; Thu, 29 Sep 2022 19:19:18 -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 p35-20020a056402502300b004581364d014si1084552eda.380.2022.09.29.19.19.18; Thu, 29 Sep 2022 19:19:18 -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=hnh7BSdj; 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 DBDF768BBAB; Fri, 30 Sep 2022 05:19:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065014.outbound.protection.outlook.com [40.92.65.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F212C68BA9B for ; Fri, 30 Sep 2022 05:19:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JRDJrlV3sqL3K2/MB0vLyxXB0pnmHAU5P6pRB9KvOdooN+d+KJtsgG4rCBEWFnn2S13juomGA49Jgv6ZlsJ1jbcQEOKc9CMnT+gKXz25hnrh559RuX0+B54M63vBIGuVBF1n5/nKKUucvlEE1ulzJl5O6xsxsUkuoMnmqFSIpvU0TpSoe3wSY9RKdloWdNcDCGarjdjCdb6+wfw6/puYKYDUkUCSgEcZyZgWIbzfKuYEbSC10pRStt8jxDs0jd9qeaAkxCQoqA0yC1ynO7vA9kvuM1H5E7uUTpCTOGQq3LTZFLHq2Ty/OlCmtMx0sunlFQ1ElN6hOnog1F1A0dI7/g== 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=g6Zdxi28a385PR/7Twkif7yxsOCmjg052gl0fwPzPJw=; b=iXSRR68hzK1f2kfVZ6NO3WKcjVykXIab5HVozLzuffb1e1L+54+v0JwgiddkWzknjdWxmI7mqGkA+tyZJ/nqD1Q48OdTIHWQ6nmgDVz+NuGH4WsqUgKbA//uqXcCehs7AsmNKEBgdW8LFdqdZN2Tec/ZEcfenhKeszDAU9k+y28QDG8420YNwJrl6XJ25YZuT1lxkE/SS+9rFcebNdIzUZNkneb3zCWI8YDFQy6RUCimBQlKq6taXkk+fjtjJea2haOyTfmblkt4if7cGkNUxB/PLW8LNk9DVUgodb6kTYYmsZfREop30wnpSpp8agW3d12zz53yKrL56sowbSAOcw== 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=g6Zdxi28a385PR/7Twkif7yxsOCmjg052gl0fwPzPJw=; b=hnh7BSdjS3qUXWCFnRB+NDGY6DEKycacQIOmufuE855JkfPU6TEhRR/Pn73gdohrjW1tsSvxArs84r0PXv/kh86DGkud6FcfVa4jsSr7AkrBucsvfcNnWdrAWtOtcgWJW+blYXVi8EJm4C63hN9QvTDZSyDFoskPWAqV9+cMpGVx45X7VbpDDjCfb+UWh4de23Kne6x6VKjodvpZKlDx32ehRIL/F0Mpbd3uiLkKpS6/A6ZEJdrTnkYyb/Es9AqU4qb+VIsAspOH8HSF3XhZ/AFXgH6X+NO5ogSSTCWYW1qcLsualxU8I8UvHZtIRsBVGa+aw0hUsa6K2F4YPJ9cGw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PAXP250MB0422.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:285::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.23; Fri, 30 Sep 2022 02:19:08 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8%9]) with mapi id 15.20.5654.025; Fri, 30 Sep 2022 02:19:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Sep 2022 04:18:52 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [K6ZM6U3xIUgM8X/aeQw/2crxd5R8MN5041QEk9pWCVc=] X-ClientProxiedBy: FR3P281CA0167.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a0::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220930021854.3048208-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PAXP250MB0422:EE_ X-MS-Office365-Filtering-Correlation-Id: 92ed224c-e450-4a5e-5064-08daa28a27cc X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmougXX/gXRJ/glWGV8cWqURuMfy2FVtIFV3rSdtHBzFg6aSLR939qYxf/QCsh9rGw+2Dvr6s4QzgDpaihm7m8oUahXpu+qmF0HXisVhOnDwzkAymjussRIecSDLbFjI9kucAItWwK5+VCSTwHXBwtVl0sTwTTT0Nod765VRcwtaU+gUVJTTfPm8q8D84it/fHRs0784TuT5DR1aWSJO3qG7R22rNQ+yCzXkEHq+aI7tqnaAOwWVKzI8RMd5cgrtirAd63KtJTetBiGku8JuD9mUW3jalaLFjcUVScoDnjLc1sN9DR4RL9pUHIq/BuM4FKt5sfik3JA6RN4/IfzEYVvkvTtkzOY9uQvFTgZ2FtLgu7kbiJXwc7C34NYO0J19Y3tdFNY799c0JSAiBpA8XJ3xC4MyKokHVeCnlNIaeG4yOBiAhR2Ac99awva112nktMNLMO/s64uHdR+Kb0MWFlXAX3+sbdnE84620kMDmb08JOy7AXPdaq+D4jqqsAO50PYvB8CKBc7wi5KHNcwjnMxg2LXGBWNyM35xpnDjxb5KwAE9UxkHYQEU4zCZo9veIVfjnNTNrFrN0oku0N60LCjo1+kJkER76/6Xdl8SL1hqxQLmJWF3OMvuneM1Y4Wl/KAh0ckUw2T9I0Z96qXzlqFzV4a0PzUHsYxVAQS/rFUtsJghFDYXGCH6xLvMAOiLStIA1Cg0tq3X0aofBP+UBlBx1NtDFWKZSJdSsO+jUp1hRVQNyylRfP9P4CUPPw1xHY8= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Qh61p325zA5uJNzFrlpUZyWEp80Uu6pCI/uR2g0mJardm1n6gbpwZCTikJyLvtj/G6gWtAGeNelYZ3I7LRN+GInGyXk00EsKrcFknzzbm1oNQAq31noRxuHtUw64rnfIIVqR5lqxg9keogq3gLzOD38tQWifG5r+6eQjkKPK0vDppUwZA2CMIJtmqka/iBJa/XO/46/9mJCcf7FUjAlwcut7HMpdgjGozdYO8Oh8sW83L/eSZ4YUM/PyPtTZoFyuIObiIvU42JS8bH8zqGdSt4XEhUg+XV0T0Qjw8TzFUo8rWD7svd1xiNhXu80qXt9X2Eojl/n58jxHQTTkvWgfxWWBYMIcJQPOQny1Zo/8Mqht/8YApTBhg95ZIzvhdDwwIQLRxxNXWfU3V5WdmIHJnwKUF7ewNgS2mAMH7W5a427mthV3yIq9Xr/vWRvf8+TBnRJxkcFSwbEzmuwOn4J4CKg+uF+U1B2K9kASSHB7L9d6MzmZDbpOn2T9PI5bgP6u//GoolQmxEtTzBfDSEkLXuYSDzlq7jjBTQYHufZg56UzM8fIjJln5e9Bh7Vihqnx+VR8P9WYFWN4MjJdBuYu2knUQ2BM7LtC9B0z6nTo7MtxGdbzylPQzBLuizkigM2JkaPoD2fPSAOddjMd5N/LZg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PgRod67+mciv87/H3pEv7XHzlqfmczW4PpX/GOq7oxYpr8R+DC2WPK7SGzoJvKU4Sea0DW/a3yE94k9cV/6XDGrpXlnGafB2dV6ISZosMlC8kIgwQRn7/5WH0QtzjVSfyYydCyvkLYSYGI2tPO4iL847g7hPEJdne0beCHO0BZrRQC4ORT9dSRVnGbWOvmBtbdLFH1Wnn91sl4ZTCJPC+h6pK+GeYWIiqe53fywFytTk3e6fg8pphJeBA61AXUT3GmGEGDR2wxG38H23iiW4xgiAwIaiOVNC3/y1xLd65p/Ee1bzIfiYRNMENIbx21Z0D14n19yYJi5+JQeu9iQ8ZGRDwpoEVaRuZcI2bRBPLVVsE7xk457Qe475KnciT6r7rDAZV5XhHfWHMql4/9H5Aud9k/73xWB1pnL8yUM4eZElmb35bArkQkgB8FN/EvdNh8xNoiUsGeNoy2FazpXOafroL3ZNXHwWkmrxf6L0EbuvIXGgS+qXMFX6ot4Oj2Pg9vDcIHenoCZWsgO0YCqShd1UP0IwDXaw1dlSffU1DX5K0jBmwaud97HM56/9jh1Pqdvt9W53h7/7hY0wlOKYtAo/aguhklg2+j5s9Zew9EWmuEwa9AMG4I6jJNYS/MimgkFSIwaD9FbqDOgbEwQ/0+BqjGrvJY3WF6PJL+lCda1Muz1CjBQB/teswLeV3+/jSS79ANe0MMZAGW3TlyuIeF/5H9iC3NSNso/j1kS0auWFS3KfJ+9gjZ8To6rZXeaLyfOVwZEQmkBpGnUwsGFPKT6+j1L8ySJT27CeuddVuHxmpqFsFKLH3JD9qPXVAq9SbJb7Nke8CS5jip+27LH804lLGGIXGWxmN6rI4fWAx/QkMmCQcyGUwFsVpWfYAkMWyH+kuDHHpbfn8KmP0ONqKfiuxVRf0qWKAVL3l/dt+ov2T7aL12jOLcNfPn4KE2p346sILpbnrITBPQylOBjujiSQhN1G+NLAK2LcCnbxXNt0nbTrsvE+84ejKYpEikbSCfxdGiXahNYT2EC32h8lNXmqCTzrEt0vylxeZ/Cbc8IqW5vY4SRc9lMONVlbxeBdV04gryZ8b35RFN2SmYZyMxzxl0K5Sf8ma7G8HEdRGqElojh6D6mPd+sONzutQ7ed5ACoFukkZK+n5jKCsOnrqTHrymnq3AjKdsIssjTDl+c/s0oFUTYuadrImBH2qkpd3RFCc6sidySlbF1LxdBV1uJ1swFmJCLB5MbHNcV9j4k9mq0L+Axe+lOcbPdFzmuq0s8f/IsxRZ8T6FE39qER6Pm5Lbtl5Wf8qm/ouFOz2oLHTDlB8zuHgFoyoE8TfSPT X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 92ed224c-e450-4a5e-5064-08daa28a27cc X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2022 02:19:08.4952 (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: PAXP250MB0422 Subject: [FFmpeg-devel] [PATCH 3/5] avcodec/mpeg12: Inline ff_mpeg12_common_init() into mpeg12enc.c 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: 6cEW5dUG8JFv Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12.c | 9 --------- libavcodec/mpeg12.h | 2 -- libavcodec/mpeg12enc.c | 4 +++- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index d78e25a777..7f2aaea7c0 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -36,7 +36,6 @@ #include "mpeg12.h" #include "mpeg12data.h" #include "mpeg12dec.h" -#include "mpegvideodata.h" #include "startcode.h" static const uint8_t table_mb_ptype[7][2] = { @@ -100,14 +99,6 @@ av_cold void ff_init_2d_vlc_rl(RLTable *rl, unsigned static_size, int flags) } } -av_cold void ff_mpeg12_common_init(MpegEncContext *s) -{ - - s->y_dc_scale_table = - s->c_dc_scale_table = ff_mpeg2_dc_scale_table[s->intra_dc_precision]; - -} - void ff_mpeg1_clean_buffers(MpegEncContext *s) { s->last_dc[0] = 1 << (7 + s->intra_dc_precision); diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h index e0406b32d9..b323728a33 100644 --- a/libavcodec/mpeg12.h +++ b/libavcodec/mpeg12.h @@ -34,8 +34,6 @@ #define EXT_START_CODE 0x000001b5 #define USER_START_CODE 0x000001b2 -void ff_mpeg12_common_init(MpegEncContext *s); - void ff_mpeg1_clean_buffers(MpegEncContext *s); #if FF_API_FLAG_TRUNCATED int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size, AVCodecParserContext *s); diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index f636afe42d..01cfd1c1fa 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -46,6 +46,7 @@ #include "mpeg12vlc.h" #include "mpegutils.h" #include "mpegvideo.h" +#include "mpegvideodata.h" #include "mpegvideoenc.h" #include "profiles.h" @@ -1133,7 +1134,8 @@ av_cold void ff_mpeg1_encode_init(MpegEncContext *s) { static AVOnce init_static_once = AV_ONCE_INIT; - ff_mpeg12_common_init(s); + s->y_dc_scale_table = + s->c_dc_scale_table = ff_mpeg2_dc_scale_table[s->intra_dc_precision]; s->me.mv_penalty = mv_penalty; s->fcode_tab = fcode_tab;