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 215DC407BB for ; Sat, 29 Oct 2022 16:47:00 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0EC2468BC47; Sat, 29 Oct 2022 19:46:58 +0300 (EEST) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073042.outbound.protection.outlook.com [40.92.73.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4AB6168BA40 for ; Sat, 29 Oct 2022 19:46:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Dg1dJM+SGdLlT07/f9J2YPQF6/lwuc0hZCdPBhZPK3jYFaSploMDGMW9YUwYvTNW1wBIQ+HAVoybqTD6Ub1rn/4Gemcp2BT4URm4QlAM6NoZs08U7u9URsslz2X1X2H7DQoANK6g70sw2CwqMlb28DfQO4p86Mx3P9Uu8nNxzNmWJ2KCg4gM5U724NayP8SNDyH2rUAEhyxwmbSmdsAy5G4SRG5duoedHItV2lwWOfMnWNOtWj+lDdXocmNqavsQYAibM8AAMYOoBnTxzAC88VXiiunlKHXHojuAd1XdfYZR9GJIjdVpi6rwqBye/n1agDTwnlV3lBHYyi1VcbmKhA== 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=IR6LHW93lQ0HyJiVRJNjkSCP8UFXC6orzisvMmV6Be4=; b=BazaWPDcWawnhyoEEGZYC9BVVvVjzTbtV80nZVqSzcQfNtJyOtWUM6qvHS0rTS/oCnXtPuHCXbuT68j9PbMBXOyj5D31tUwWHenoXhRTeT+k2nCK3BTw/n2UjLRZLuCqdWCjxPOGUW9HraJ225LHl6vRZQ+y6l8Pwhf57kFPaUxmIcVv2zb54QRMctaMTVIJRcI9JJoJI7DNa1oSnYrWWk6aX44D3enI6tyvbG7UXZS6Kh6p56B+V+4k63I+uhoHvm1VDk/5gPPfks0ebm0LfU21Jn2R3y3e8SSUBPDwD7uZ+GbvaS8jmvsdjlkyssq3tNXWgM8/T1+//zl++vThPA== 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=IR6LHW93lQ0HyJiVRJNjkSCP8UFXC6orzisvMmV6Be4=; b=bAXk0btuk1nQx/3//asQ2tYmF8Z+HK3ahUabvqH3c15q1RNRiKvua22MeEBgzSm7H+iTEEtsgbpa6/xkFrBbnt8EOYPLLL5364jWTR5tNM114JZLVedJWskMpPcw7vmaNTWh9LWkv37gGBuvXzGk/py8uOT3P9Cxa7qQKGJ0yePVnx7fpTkxnK+rFbWIB3lasWk95dMujeCQIX52nLdAIR5jtu54WHnM+kj0ZzcWyb0qwAElKfzF1yLb5TVVRBEPn8KcMSPwWpUwirLRRG2xZSGZR2vbRLaHoykoRafAW0iDwXQ8KGzdOStBDgORYCrLXa/5UGqNSQ/xPBNs2MAMWQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0233.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:378::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.14; Sat, 29 Oct 2022 16:46:49 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::2fc7:f931:a7e5:242c]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::2fc7:f931:a7e5:242c%6]) with mapi id 15.20.5769.016; Sat, 29 Oct 2022 16:46:49 +0000 Message-ID: Date: Sat, 29 Oct 2022 18:47:00 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [6ymVGpnvwb4sgZAYEZRZofplYb03QpgsBJimOm571BU=] X-ClientProxiedBy: FR0P281CA0105.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a9::20) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <15773cbb-d30c-898d-de56-65536f655ee2@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0233:EE_ X-MS-Office365-Filtering-Correlation-Id: 635b3018-7c75-4e4e-f066-08dab9cd2c82 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QW5ljx84aUaOcMxGTVtujeFLA3xHh348tjEPHRZugqyzbFel83Si6EM/Rz1amAXNWAaSSGyuJUKvSvg1IySXnfNUiaazw2GkUnjL6khzUQkzwp7oudIlTuTs6fw6p4sRKE5irJsJmbTYg9cerfyRqfw01mtxT5FHkmKuPs11+yIH+fpFtAxaUNehg4p6JHshX9+0BjTxOMUJUbXSrHgDKDqRPXuCCD+RMwWFT8U1HHLBu+Mrs/OgGbaIbhHC/9RM+sZ6rsNgcG7Fpyy+pLYXiituQhBQvZ2uAq4A5eqoFZcxnYG4cQFFu5F8kvua6OGnt42V/VKl1Yw2GeQQzeUErBtOW1KlicBmSSteuSbvuYd8Y94TZ7ECuj0IYcAM3KwlbZOjIPtPH4U7heyPXMXrO/B8EyamIoP8zjs+t+WCFNdxUHlvrP3xd9AGxnZmTutD2RFcblAhRu8dJ7UsRfQDAyNW2tj8HFBAomYx+Qnj5fEJLeqRr+aHA7xrqafSAT8nCPSz+k/jWRILwpNLKS2WdttW5lNgZ9Iosu/n8WSCnznG0wkMpFIYov3Q1bkK8938gGlEfev8JbWbgEeuOp8sm1mhCzjVM9FQTMQn7cm8kAXZ4/hpEMN7UcifchuQJxo19fe/eRAQen41T2d3G1/AKpcw1WePELfAD1gfOW7jYq9p30iUZ4/NLwpoFfqVzvUk X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?S205SUc3dHRTRVM1VjdpVTRwQWVNRldWRG5CcEZMck5XMSt0YlBGUHFsNjRw?= =?utf-8?B?RWVxN0tIR3VTbjFLYk91WUNMMzkzN1h4NHhSVU8xOXIvVlhQKytIc1BVN1hX?= =?utf-8?B?MitIb1VhNFBKL1RWK05jSmFhVHV0YjViemZWaEtaSFNCSkRaaE1jVStWUllR?= =?utf-8?B?V1Zia2pmUHFObkp6ODlReC93N0NZOE5iZEhjTURXa29WcHlwU2FMc1pVNzRx?= =?utf-8?B?NVNiUGswUzRqQytwa3hBK1NoZGhnV2R5RUJHMW5FK0tzdFZITUN6MDZnSGIx?= =?utf-8?B?T2p3amVSa0dGUExqcDRjNndGSyswM29VeFN0ZnZGR1AraEQ5QnczVjhsdWVU?= =?utf-8?B?aEkySTBCY3hsZlkrOGZ5NjRqTUdqaXhhOVNxaEQzdm5hNHVEakVoZnpnV2ov?= =?utf-8?B?Y0FYK0JKNTUvUVp6cEc4RUJYbWE0c3FBOGtabkF6TDhJQWoyUzJmTnREZ3Y0?= =?utf-8?B?YjlPODZkb0N5MUdwQVFRRHhFVmhicjRiMWZKc3N6Z2hidlc5Qlc5YzRBYzJI?= =?utf-8?B?bGxtWTltTSs3bHF6SnpZanlNc2t2Zlk2ZGZrMFVtQ0dSOUJsak1ZeHI5azI1?= =?utf-8?B?WkM1K0lVdzRUY1U3WS81VzVIWmgyT05GUXlwSUt0cmZMZEFQbzc2RG9IdCsx?= =?utf-8?B?enZMSHpsSDR3M21vQzQyeldEWFQ3MUgrMFMwWEJKMG9WazVPMFdCeWtEaWNr?= =?utf-8?B?R21EbFgwdE1oZXFDeVF1YThENCs4MnNWSFdEbmRDcjlkL2dSU0U5YzJJaDhq?= =?utf-8?B?dm5xTm9XY1JMOEEyeU5DT09xcUNYc2V1MkFEZkZpUXV5MVZ6MFpJejFFSXps?= =?utf-8?B?TkdQTFlLbG4wWFZ6MFZDbzhzTFloTTFBM1hLWWVBL1RRSlJVL1BqT1dCdDB5?= =?utf-8?B?dWV5R0VVOS96cGtpanhYNDJaZUhPNXVoaS9TcGJzbFk5VkE5bWV0M2NNM2xD?= =?utf-8?B?clo5bkxDcGJWY2VJQUt1b1FTYUt1VXczR2RJcTlramNQU0cvTURmaDRxNHdC?= =?utf-8?B?SDg5WUlFQmNvZVRZb3RDVHlPSHh3WHNjb2F1MXd3ODMxVmE4STJFSjMrakVm?= =?utf-8?B?NjBvWkNBRkZGaWhrdkQ0RS83dVdzakFUQjUxZjViODJKcVhVMXFqSHpLQy9V?= =?utf-8?B?RGNyVGVkSnAzRk1qNDBZeTVsZ1dmazA3OU5IbUxyb2p6elorYWZRT2s5a3Jl?= =?utf-8?B?OEpsQXNqczR6WlRuUUVBTTdPYUpZV2trQTVqdUJzZzErVVByclZCa0loRVlo?= =?utf-8?B?cVdMRWtSRWN4RGZtaGp6ZFFONlBPS2F0N0kxSWZINDhNcmpnQ3BTdUJPY2M4?= =?utf-8?B?MUttcUU0YkxXOHVwcDc5bkYxL2VwaWdPTHFnUDFWQXFlVUU1Z1A1c3ZsU0ow?= =?utf-8?B?NVRjemwxVkhIZ0NhOEM4eVRJdnFpZW1JMUo4RUQ3dlBlOUJqYVhqZ3ZTUlNV?= =?utf-8?B?QmtuVkF3VmIxbW1UWkxiaWNtQ2c3Wi8vT3RJZ1VsTWRaV2hBTFk4WVV6a1Ba?= =?utf-8?B?dTFxQTlFMHRzTXJHV0lOY2RmaytQOW9pWURtMHBhN3UrSHE1OXEyOS9aMVh3?= =?utf-8?B?U0crVnBDRUhCRk9Vay9NZWIrYXBBUDJMUStkK21FN29PM3o0bzd2bDhrUTMw?= =?utf-8?B?K1g2SmllcDRqWEdyUS9DUVAvWlByZEQrNWQ4VzQ3Z0krOC93cjBEWVI1SmNZ?= =?utf-8?B?dDRDL2FOWVd3amRELytxcTE1ZEttcGhCU2ljZ1FsRHYxVEsreWxpVCtLd2M1?= =?utf-8?Q?dj6KbFlE3rTkMGcL6wuDGhALquTOoYKfMYnJg8N?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 635b3018-7c75-4e4e-f066-08dab9cd2c82 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Oct 2022 16:46:49.5683 (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: AS8P250MB0233 Subject: Re: [FFmpeg-devel] [PATCH] avcodec/mpegvideo_enc: Initialize dct_unquantize_int(ra|er) only once 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 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: Andreas Rheinhardt: > For encoders, mpeg_quant is an option of the MPEG-4 encoder > and therefore constant. This implies that one can set > the dct_unquantize_(intra|inter) function pointers during init. > > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/mpegvideo_enc.c | 22 +++++++++++----------- > 1 file changed, 11 insertions(+), 11 deletions(-) > > diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c > index ce363a585d..0b709974a1 100644 > --- a/libavcodec/mpegvideo_enc.c > +++ b/libavcodec/mpegvideo_enc.c > @@ -880,6 +880,17 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) > > ff_dct_encode_init(s); > > + if (s->mpeg_quant || s->codec_id == AV_CODEC_ID_MPEG2VIDEO) { > + s->dct_unquantize_intra = s->dct_unquantize_mpeg2_intra; > + s->dct_unquantize_inter = s->dct_unquantize_mpeg2_inter; > + } else if (s->out_format == FMT_H263 || s->out_format == FMT_H261) { > + s->dct_unquantize_intra = s->dct_unquantize_h263_intra; > + s->dct_unquantize_inter = s->dct_unquantize_h263_inter; > + } else { > + s->dct_unquantize_intra = s->dct_unquantize_mpeg1_intra; > + s->dct_unquantize_inter = s->dct_unquantize_mpeg1_inter; > + } > + > if ((CONFIG_H263P_ENCODER || CONFIG_RV20_ENCODER) && s->modified_quant) > s->chroma_qscale_table = ff_h263_chroma_qscale_table; > > @@ -1723,17 +1734,6 @@ static int frame_start(MpegEncContext *s) > } > } > > - if (s->mpeg_quant || s->codec_id == AV_CODEC_ID_MPEG2VIDEO) { > - s->dct_unquantize_intra = s->dct_unquantize_mpeg2_intra; > - s->dct_unquantize_inter = s->dct_unquantize_mpeg2_inter; > - } else if (s->out_format == FMT_H263 || s->out_format == FMT_H261) { > - s->dct_unquantize_intra = s->dct_unquantize_h263_intra; > - s->dct_unquantize_inter = s->dct_unquantize_h263_inter; > - } else { > - s->dct_unquantize_intra = s->dct_unquantize_mpeg1_intra; > - s->dct_unquantize_inter = s->dct_unquantize_mpeg1_inter; > - } > - > if (s->dct_error_sum) { > av_assert2(s->noise_reduction && s->encoding); > update_noise_reduction(s); Will apply this patch tomorrow unless there are objections. - Andreas _______________________________________________ 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".