From patchwork Sun Jun 9 09:54:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49736 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp1936023vqo; Sun, 9 Jun 2024 02:55:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVShhEzFsxIaM6wrt70Jb1D1CMS5GJf7fGi2WkH5UO9PC3CURJLUdJ9R939nYFeYmUlP7Ub8W+U0Jcbua2FzbeYsaNb16oXmv9vrg== X-Google-Smtp-Source: AGHT+IE8m/XgdGDx4MoFNPJcGhzZJWXJIewpVe5wHR+2SihvZ9k6LU4py2GlvTHMRkLXi4z5RDme X-Received: by 2002:a2e:9250:0:b0:2eb:e3fe:b394 with SMTP id 38308e7fff4ca-2ebe3feb507mr4682861fa.5.1717926929205; Sun, 09 Jun 2024 02:55:29 -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 38308e7fff4ca-2eae2277c4dsi13336261fa.126.2024.06.09.02.55.28; Sun, 09 Jun 2024 02:55:29 -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=mjazeEm0; 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 A584E68D7D6; Sun, 9 Jun 2024 12:55:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2100.outbound.protection.outlook.com [40.92.91.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ECD0868D7C0 for ; Sun, 9 Jun 2024 12:55:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=muHSdv0lE7URkdHJi9xvOi8iz86/HVa8qfA/QcsdHjnPGhccodmq0C0WRF/frQT2UC52gkBeTNCKCgpHFECRTsRMJOMMqeuhKHFVL+PBaP8jOJVIMxFnVvxAhPGrfojifY1TWI8KdOcI195AmQI+Aw7aCA5BqD3hS4LFjgG8ffRW+tzqNxiIpowKZQrijM+K4civUOjfRzODT7AgJObKzracgCixAIISf+aljGP3oDEmWpkVkNI3iamxIeagS9b2tkaN6ex2a2OWyEiLLFGKMrEbPjRvpfd8hQTyonC8iAh6wFmIcMWaWaEtuFs1sOihIV3wgB3UX6xk3UcWIWgMEA== 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=U6x2k0bUDrN70F+AVXcPXtzwkh09pnVGO7qypX4FlOs=; b=NnTiW/Saib50BUErFmJJ/tyatiqNW9B1zPTvR5IOFtwKrQqZNecPyDivndLXIvRp3lWMSqpiPgXvBKmgm0qOJwE9VhcdKCSdGtZz8r61VrEGNhG13aalRttEbE36RsT8k/BqTMo1NLTkbRGxRiK0nL3Au+yn4jxL+4HL9enxgbNJ3tVTJ9HY6Lx/Af4KL/5+DqjHY0go3aqjmNorRl5nWx/HjKKUAaZSgjXYldpCalMJu0lF0gjmp3/A1q5KQ5B4XNit9eV3iZsqb3fUGu+1KyK4iGPSSR4eR6fYwTrtY+kjSnQW9nVIL0h5U8bldYltmvcHS40uD8nDYsPGCkcupg== 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=U6x2k0bUDrN70F+AVXcPXtzwkh09pnVGO7qypX4FlOs=; b=mjazeEm0laCG+z56GDhhUTtICdxncgHOyQ2S0Vtz5PminDVacxZLBAgiwV19dSMQ50Q7w41KcQuP29Cv+frD7O5IVINQ382lGfOSARVEYcq0uUkGrakQ+vCZMK3elyRcYtkBQ9BIlikHHsOL5HTWoAk6BhucYP0He6sGAeRjXJ36PabUWQR+4TgjnHp8GCwRf5LIyqeWEf2navj3DWnQwpWF8U/N4KpiHVcePzPgKXOJR3RY0Y5KpK746GFpu139W3ejNBvNLQ2TW/26tcOjX/yX8xyQUo65Dk5/6YFhoPjgfPqECFCUJv9cxBrWvvX648p0JS5LNjgIyN/+kTRPjw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS1P250MB0553.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4af::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.34; Sun, 9 Jun 2024 09:55:00 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7633.021; Sun, 9 Jun 2024 09:55:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 9 Jun 2024 11:54:36 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [WJe8ge2A0Hoi9ucrnKc5wvptcdSavvlA0T/Q4BU9WYk=] X-ClientProxiedBy: FR2P281CA0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240609095438.3250145-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS1P250MB0553:EE_ X-MS-Office365-Filtering-Correlation-Id: f703032c-beaa-4097-f501-08dc886a3a0c X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: SLDeq23WAfhunpDGAVlsxaNDxmeuoHZ6xIdrCK2n80ocdPivtNMjSpo5vkbgSXkusJorbBgDtbIprNZ2XJC7XoKjtUkZr/owe9henp6iLtn03MQpYT4a17LkgoUPqN5CtwC4nfWj1PV4RI+tXzcL49HVOu916g4bFVRJdPFG4MZE8IoLMJt7V6RQJSmdA8XGlRH+WfuzFF0ok+MSQLkj/IQA7mBwGWj2vUdWcU4SV0Fo/FE5vsb3T8FfMf3FtLRM57AaH6qamdj/BVuWqGcTPoM+NAMp19T9MZF/GK8WXQkp34iTDfZk1jU+0n8kCwtN40re9fJSsxr6Ktg9QpKUyPq4H14yEXxr7RpybD8qTmOWvibVKpwVl/V/HVraSzoX46kTIVv71l5IGk8p1JC7xvjt3Ps32pAeizbklG3uqbw+evNGp+s2rwA3KZ3GwYMLzEtFpJ4Kaf0sP73NMWzaNJiVjoDsQH5a1D41fMSa9cM9131OOitcxOLcO/3jATBbBBJjBE2wMZAJf0m4Zzd0GnLoznoWh+CEbtLbquI8BZD7kaV2Hx490dvtdQH09EEMmJRWvJJmYeOUPgF6wA0ORS+Lc1vsFs1wjuEBkqomXjZn5H3IGO5l40sHt3IRni5x X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +XMYsG+phlkQvjUwWSYl7NIinRb1ITI15g5xJJ0y78SpBfu2pcMqpLsqauNwanjYZ0hnkc32xgu9BD0Aif445mXjs6yX/cA/qS8EcIQyuSADYcM04ZWhqXSdp7yYxfdDTNBlr5wWS2nRmhqdBv1Jnd34lqTm2zwjMDB5ATlPI93oDUK6FWAdek6i/F838r/uHiGdh8z9ugTnIHOrHRHSEg34kLsD4/V8LPg9VnvwgXcLsmJLQ3dOH5J5y8Trnxi1jPpd8/aWyNYWvdL7EYTfdYL+LUEhszCuTalLOe15/HzBvKGzH5Ce19VpDBmprTIRjlbjFO0pf54qQiuEwesXyxD6GPdjDRBQ/nszlrDsseu7Jc4sJjligyy73JMeJH1upNRfG8c4tydkFuVzkIdBG/baaVn9GMxq9pYOxmEHWAeySPf+lwkyezMaE1mIGAGcyNrd4V3Y5PGrGBMAJPCflxrx1rQdisqt7jOBj/ba6+du4n02kcnm4i3yJssK7aWZtA8WvcwfC0lwb+WEAFfeTHX8CT/Buz7zHimTYNZ6zcimrYxpZDWz9/s7E3O2o//oB+u3sge1oFfrbIxZTCs3f2vAJRMD3Tj+ih/ntUPlkgM/TwJsdupl8up4Hki0DNfDBYK2DeUby4mhQ6O4/tjjzAmJiMnT6n446S/6JJFKBDMrmIAppjPIO1hQ1cqs4+IKMCEAnr49Um2g0/uun8iv/rgdx95pJDratMFWoFRix4KnA72SNHeqi6nv1+amIWq04ZJ7zxCG/OhWHzO6T8xorFInvOdmJjmSKnv6ccyAXQhBE9IIFSzAAnTzjfMRdmx3lWU1TlVg4FgAQtzRZVRYay536V/WqgJWhQ9XHBo9x8j9HvMbmwz1IDoHTTpVq1J9m9g9gFgUfyWauL+/ZYUR4zl3imeTDzO1RjeQlWcjutQlAZgr/35+4RJ2TYuMIBjx+osYdph5G4SYEBd3klFVkOfyHFpvTFjQm4lINp5DTdrJxEvbauurdkn6hTQniClvr/Qpoo1uUURrC90xPZ1OLocsvf22D1nQK0GnVXNkOUH60gKxVVgp+YPUDCmib4EhOltwLXMlxSYvbN+hUEo91P2byUBkxQSx6Sp8dFfOPcsbjr4vEOSdnjlsoZUntcnMCeac3YU5c0L2wQ5KvzaQtP/Ua4s6Q6bNae5ufCb5kgvUuaGvnfxTtLEjOI9yN+h2iQozx1ToF1PYqX5wdUGO46NgVmN8lp02mXkYW1yibMzt0YnoiD0XiSb7G3e/mtEFh4x74C03MzkQ0j7FXT/eBQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f703032c-beaa-4097-f501-08dc886a3a0c X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jun 2024 09:55:00.5027 (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: AS1P250MB0553 Subject: [FFmpeg-devel] [PATCH 5/7] avcodec/mpegvideo_enc: Always set c funcs in ff_dct_encode_init() 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: 0+4/gsQoMdCQ Use the common approach whereby the _c versions are set first and then (potentially) overwritten by the arch-specific ones instead of calling the arch-specific code first, followed by setting the function pointers that have not already been set. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index bc36d4b5a6..7dd692c1e4 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -292,16 +292,15 @@ static void mpv_encode_defaults(MpegEncContext *s) av_cold int ff_dct_encode_init(MpegEncContext *s) { + s->dct_quantize = dct_quantize_c; + s->denoise_dct = denoise_dct_c; + #if ARCH_MIPS ff_mpvenc_dct_init_mips(s); #elif ARCH_X86 ff_dct_encode_init_x86(s); #endif - if (!s->dct_quantize) - s->dct_quantize = dct_quantize_c; - if (!s->denoise_dct) - s->denoise_dct = denoise_dct_c; s->fast_dct_quantize = s->dct_quantize; if (s->avctx->trellis) s->dct_quantize = dct_quantize_trellis_c;