From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 8C5B44AB2A for ; Wed, 12 Jun 2024 13:50:15 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9CF2D68D91E; Wed, 12 Jun 2024 16:50:12 +0300 (EEST) Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2085.outbound.protection.outlook.com [40.92.50.85]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 155B968D918 for ; Wed, 12 Jun 2024 16:50:06 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ECMUW3wQCmLdiED+jjzY3q3GU6FYIulFiqBWi3T3LBO2vHSIUu3eIF6UU7TssVDl/HY9IDiiXS1ygVWyszAyMa+ANbbvBjlDA3+wz938Ol1eXZCm9oQ1aPHLBRtHQ3xIAM+tUhz0w4w2MShjaz3euAY+gSNyUPbGZztR4vQf85DP49DFo57t04Rhci9AAvJxGLmdythb9K4UAmuzGHLs/EAfj/63FP89jAU9xjpYcIKZaBxq2ywe3juFI1ufS8JtaoDQeZnBjBZsNOdo7CZ3AkTY2dl3hW/KdfW8q6LUMD50x0jtqzd5PC1uoUk3xERbaP6xc1Mc1We0J/d0u0upOQ== 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=fbUGyAeou3UFuuX/d4UefJvDgZEC0u9s8V5Iin3nOhE=; b=C4NF47SWaJr/ENuqh+FCtyvT9qEtEt/qPVLazMqouXUQ1Qn7kMzJfNNMzqOlgc+Uv+X9Qs/49mEs56S4dTG+wbKO3wvE6whwqxJMpt5m/0piz6r2vG5cp8GEkX94/41XgJ/MYuqw03LD7pDSwfx7WO/bSAlY8U+sgsOA81qjWUD1rEL/YmBU/B6Cb8K49DEXuauKu61IHNCk6UJYcjzzbBsTHxG2LshdGFFo4W4np/GFFMrTHwEY8K4+FL1pFFhU1Aph9GBFV9FPRHuZuaC5spWuqu+pmp+U2iEfu1Na7jZVlYWULOY7l9yqKAmnBAvKDd6Ud5Mh26bmA+QER9Z2Pg== 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=fbUGyAeou3UFuuX/d4UefJvDgZEC0u9s8V5Iin3nOhE=; b=ot7VtW8WMZXGqiZGlOk2sHwa3kKXAHqRSOKyZqnDvWw26/4k7g4nWItc57eRutvuEQr8iTzozRHW1S2q1r/btaDJvTNxnA2Jy6jR88LyfozuAYqPt3SFUGjlusKDh0gtBPaTbGHzLcZxiTRQEKMxtSbB8PK3yLv4GOYsa9pdGD3BNIfhsciI8HQdfikFcPKJuHsXa/RQUeZ2/gPw9OkDDi/RHyaNJcr1dVpCc4DVt4sCE3FyC47H+dG0EK5BqlSkKvvL9n+V77iQ3Ue9njcoSwwNELP+N1sR1z2Gh16cexrhlaUG8zNIkwo05GK8N7HUZEfFGUaGoUCXzKoQfXuFVw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0054.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:359::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.37; Wed, 12 Jun 2024 13:50:01 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%3]) with mapi id 15.20.7633.036; Wed, 12 Jun 2024 13:50:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jun 2024 15:48:00 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [+JSwatTmeJSGRDwBWOeVINy0nxuN+OFrTxAxGwMwkPc=] X-ClientProxiedBy: ZR0P278CA0189.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240612134853.2102377-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0054:EE_ X-MS-Office365-Filtering-Correlation-Id: 19e5fb78-95bf-4bae-70d0-08dc8ae68e2d X-Microsoft-Antispam: BCL:0; ARA:14566002|461199020|440099020|3412199017|1710799020; X-Microsoft-Antispam-Message-Info: OVPdq4bah9nNUmLt8F3NhMOzHv0bxjZx77hF2XCMlDt54IdHCqFxIlSzssXDkyX2IyF65rrSOMpStp67Kie6i8XU+bMQw8jx6DISA0glpVNdPBhzMW7/Uc6QMkwFxUcnm6L9k5fbsAoazvD4vxOhfoKA4a2aJidomGojMR1GMC8rheQwxdJC7JxQlbyXYQnpKMVkzWWcC641poo1KOWndZTxN8f7JLhFD6TVi0UpdeR9weVcw53C4f0otcX/QfMpbkAC/0NhRH0RsjADeC7F+UT+G4j50f/4HraVrQxlpS1mabcmCSsT0VyDmFDeLVXXWNktPY7NClI/Cz3XQu5QUNpVJy0qYbxrU4637jrK1iPG6Yul+fgVoY+LTNGF0X5xkabq34f39frieBU9hlUYFGHSY+SHTXTf8hoFABbuDu8kWdwh0Nlq9pjRiH809+P5wBNj2TgJBIUJ61226CbtX1JgCoqsPKLi8k3QWTrAuGyor8eIj567t+KM35Td0eMf7rpsJpawW+ZXr2lcBoxIxjpbilC8iHxvvQa2EaWzLqzKtnLtmDfDb9ZPhiWqbwyLA3/PnkWPpktTcxrzZKNfxH3jI4+LWPketV2nf8BrRtF893lR5FuqgqvKJhxZFxN+ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?wM3hH8w74m7mwwJpjcCh90mGxldenNBtsz0FbjTiagT5Z5y6bnMTsLOyoJTQ?= =?us-ascii?Q?N31AEk+csP4vGt8KrKmlFF/JEGB6D+z/MJo5jSdidWP0mJr4yBwcYerGoib5?= =?us-ascii?Q?kVwsoqV+3HnumZVxTmkIuS2BpBDIkFnaY+yFC+9CWqe9CZgnNperkGU0Mxrs?= =?us-ascii?Q?aQ1azEF01JU4EBK5KUKidFNPxV+hmi+mW45Qcl5bu52qacnhHc6NFngb7kKd?= =?us-ascii?Q?qMSrwCiQbzRR9F4A8XXAg+PUwCpesvll6y0Pesj8+54e9+vbdmtyNtPoMilL?= =?us-ascii?Q?QcpkIg8yLCyMYAjXdt/on6M4uaeWtOKeqY+FX+5aNxOcP2vcVq0xqnEWDLHQ?= =?us-ascii?Q?rXcjW2gTzVdWHSKFhKqWiNfKrZPKovE3PTx7YKgUZ0E6nwxlyMEObzy6k0Yd?= =?us-ascii?Q?qpoIQ7JLnpFH75CnRPPAPJAnii/VbNzfWiqjPMqKdQ26gcg2Sk55ukijN5NT?= =?us-ascii?Q?G7uX1wDUdEBWRDbc0Ry0YIMqXtKinV/jnpwg0vQF/IBuXcOCYvucFAO0zB6w?= =?us-ascii?Q?xferJtq/WdsKVzdnrRnzVee2oHckfI6cyaJGyX5L7jrqiM61oVEF/c1JFuxC?= =?us-ascii?Q?511hyAx/6cxzPyjBaPwkggShD5meeE5ALZHMb41ZGU93243Noes79NkoEuwP?= =?us-ascii?Q?Sjyq1CDcJwnKnh3sLTnwS5MRvm0HA9plcgEa612mcTRO8tL1bp/09qJ5DvsA?= =?us-ascii?Q?JThwAXAcckPOoR08PbHGpwOnVgfyjayNm5kciJxgyUwcJ/F6z7rcODiGNqsd?= =?us-ascii?Q?vWRC3z3n3PulvBYekbpD7D9zm9M938FeLK8chAHXVNg9INoa+2A72C9Dg6Hi?= =?us-ascii?Q?iGumhfgWxLiCs5Z7H6wIZBrmf8NdvtRYGUgQ7VzG+bvaVpwxNgKiJw95I31F?= =?us-ascii?Q?E+dv3DPkD1F4uDyMuLNsYFIfElU2X4vsGeuJMWrYifuIJhSbmC7Yw7vv92QA?= =?us-ascii?Q?nfJgsdXfLh7dtSCgzT954p61Z+7FBYyAnJYtHXShJre+37RDe7kigEqDiDk1?= =?us-ascii?Q?uE1Q0DfYT3k1kMyWSKYD9tEvuumfSeTu5R7Qg16572Vq8SUIpfcS3ViubnPq?= =?us-ascii?Q?Wgy8KDo/U/UpGJ4igYlGJPrcz6bJOG1b9SEoIUHP6AJ0nRwE0SPegTL/qe3s?= =?us-ascii?Q?BUnMCb3Omp/DMZYMAwZIOaLaEKvBqRTuCbQqCxQgFhzxLyXgJKLekQo2m/0t?= =?us-ascii?Q?pcD4vor1bsxzpyZbRQ4Xb4jedbTkYgcn6CH+LGf1lCr587/jyxkD5FlIMRCI?= =?us-ascii?Q?BaYc8D26BT739YZrR2JO9XAVBtngSiIDvpbEy4Cgvg=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 19e5fb78-95bf-4bae-70d0-08dc8ae68e2d X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2024 13:50:01.4280 (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: AS8P250MB0054 Subject: [FFmpeg-devel] [PATCH 04/57] avcodec/mpegvideo: Set dct_unquantize earlier 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Set them in ff_mpv_idct_init() so that they are already set in ff_mpv_decode_init(). This is in preparation for avoiding to set dct_unquantize in every ff_mpv_frame_start(). Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.c | 54 +++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index bbee9a5f61..27f7ebf933 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -273,7 +273,7 @@ static void gray8(uint8_t *dst, const uint8_t *src, ptrdiff_t linesize, int h) } /* init common dct for both encoder and decoder */ -static av_cold void dct_init(MpegEncContext *s) +static av_cold void dsp_init(MpegEncContext *s) { ff_blockdsp_init(&s->bdsp); ff_hpeldsp_init(&s->hdsp, s->avctx->flags); @@ -291,31 +291,6 @@ static av_cold void dct_init(MpegEncContext *s) s->hdsp.put_no_rnd_pixels_tab[1][i] = gray8; } } - - s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_c; - s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_c; - s->dct_unquantize_mpeg1_intra = dct_unquantize_mpeg1_intra_c; - s->dct_unquantize_mpeg1_inter = dct_unquantize_mpeg1_inter_c; - s->dct_unquantize_mpeg2_intra = dct_unquantize_mpeg2_intra_c; - if (s->avctx->flags & AV_CODEC_FLAG_BITEXACT) - s->dct_unquantize_mpeg2_intra = dct_unquantize_mpeg2_intra_bitexact; - s->dct_unquantize_mpeg2_inter = dct_unquantize_mpeg2_inter_c; - -#if HAVE_INTRINSICS_NEON - ff_mpv_common_init_neon(s); -#endif - -#if ARCH_ALPHA - ff_mpv_common_init_axp(s); -#elif ARCH_ARM - ff_mpv_common_init_arm(s); -#elif ARCH_PPC - ff_mpv_common_init_ppc(s); -#elif ARCH_X86 - ff_mpv_common_init_x86(s); -#elif ARCH_MIPS - ff_mpv_common_init_mips(s); -#endif } av_cold void ff_init_scantable(const uint8_t *permutation, ScanTable *st, @@ -359,6 +334,31 @@ av_cold void ff_mpv_idct_init(MpegEncContext *s) s->idsp.idct_permutation); ff_permute_scantable(s->permutated_intra_v_scantable, ff_alternate_vertical_scan, s->idsp.idct_permutation); + + s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_c; + s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_c; + s->dct_unquantize_mpeg1_intra = dct_unquantize_mpeg1_intra_c; + s->dct_unquantize_mpeg1_inter = dct_unquantize_mpeg1_inter_c; + s->dct_unquantize_mpeg2_intra = dct_unquantize_mpeg2_intra_c; + if (s->avctx->flags & AV_CODEC_FLAG_BITEXACT) + s->dct_unquantize_mpeg2_intra = dct_unquantize_mpeg2_intra_bitexact; + s->dct_unquantize_mpeg2_inter = dct_unquantize_mpeg2_inter_c; + +#if HAVE_INTRINSICS_NEON + ff_mpv_common_init_neon(s); +#endif + +#if ARCH_ALPHA + ff_mpv_common_init_axp(s); +#elif ARCH_ARM + ff_mpv_common_init_arm(s); +#elif ARCH_PPC + ff_mpv_common_init_ppc(s); +#elif ARCH_X86 + ff_mpv_common_init_x86(s); +#elif ARCH_MIPS + ff_mpv_common_init_mips(s); +#endif } static int init_duplicate_context(MpegEncContext *s) @@ -718,7 +718,7 @@ av_cold int ff_mpv_common_init(MpegEncContext *s) av_image_check_size(s->width, s->height, 0, s->avctx)) return AVERROR(EINVAL); - dct_init(s); + dsp_init(s); /* set chroma shifts */ ret = av_pix_fmt_get_chroma_sub_sample(s->avctx->pix_fmt, -- 2.40.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".