From patchwork Sun Jun 9 09:54:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49734 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp1935936vqo; Sun, 9 Jun 2024 02:55:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVhk7hqpSq5FEjPXj4j5/VkS6VZq+eHzolKnkAagYa2LHXHCw5/R+bomRwxAN0rS08d9nvNzwFoifSaSPEbb1bJSDQsTgyyfgQKJQ== X-Google-Smtp-Source: AGHT+IFERFKTQc0MfYEWGRFC2iPB6QhuzwdBYNVwamEloZk7x4ZcmMhg/N3eJqHWB8/89brn7lKI X-Received: by 2002:a05:651c:1502:b0:2df:ffc6:1a0c with SMTP id 38308e7fff4ca-2eadce23f04mr66948841fa.2.1717926909050; Sun, 09 Jun 2024 02:55:09 -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 4fb4d7f45d1cf-57aae22895fsi3574375a12.366.2024.06.09.02.55.08; Sun, 09 Jun 2024 02:55:09 -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=ub0pSgNE; 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 6FB2468D7B9; Sun, 9 Jun 2024 12:55:05 +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 B564768D7B2 for ; Sun, 9 Jun 2024 12:54:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YAJ31YDt0ph0b4u6rtLdHI4wLc21UCb+Ju1ZffRe2jkPvuUPaBAFKYRFvFkujeVCH9NXaBUyVP7WKebAzczcj1328CAYq3j9UbBoq4hytfBeC3NNWcz86mRCA6wAZIZ8OzrYLWpF0UxZ+8YlvUpz1tcaoLga2/SfhHjYKSu8ARO1fsjBVVLUHz9UgCqsIrlJ38Yo3Iu2GKpppAEIqFYEz7Ou0gWl30CYQo7UE49m52b3X87lGsAuAEAAUBQYlGDyEpQ2r8zIFS8XzyVPeknh+jlClFYr1HIKc+fOfoY0JcjTu9g4NE+FALopvd9pUCvootasBrUWA517kun728Eiug== 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=w9w9xhZyT3vYZl7fIkX2r77YBKpFaFGwJlRoaTI2Q+I=; b=fqE80y+ZsQ5zNzmViWCrvXYOp9uyGOyZoOeYJ7DQ6XKcWnAR8k8rySZWvydC/tehFd9MoGLevqbg3XF2y8pnCj7ggZkZW+u4Lc7GjjMSF/PFtqkx44Sq/vjKVwriqTy2NpkGz5xXSqBCxnxch6yTXtp5WhHnp87I+KJoVaic7WHfxBrBs770QeP2tEmRAmfV6FfURiv9VffhlI98vkXIGJcSUlTv+0SXeszClmQFB3OjHa8XjLUy4NZzqZm8WNMjAKJgaRRoUHIRtOgzVdgKVp0ZHVl9Q8a9xzus8Bfn6UDVMbVcMHNQ8fgr8ovy6YkHs5C4Kq2pi1shbqyVQA1PvQ== 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=w9w9xhZyT3vYZl7fIkX2r77YBKpFaFGwJlRoaTI2Q+I=; b=ub0pSgNE5tQ9V1Zf05Ig82IVY8ljm4gG+e9WaaL0z+Z+GIioS9KQzHu4aE9qQxJMsyPK3odceQ6BwhCFQfJnI7uGb9xGHCOdr8AhDICOQDZxta0LfYxqfILaXFXpp0jL/rbiifN6n2kyWcFl8NfAQ+WIr+CWxMVWlFJIClVZvDeGhxxw0UmxSt3I/A6QX5V5s+BHukMUVITGHpas9Q2Qn3xE3zhOEpEOiF1a1Fu6GK5C/hEZE1BeHB8+IffcUs2YkTLgFlB2ewjGrMK9NpF+JsCkbmZ89YcYrdpnDWijJ3xr2r2ahoHa7kfvXRQwjNIXtt9o5MVaUpT5lDt4dLfaZA== 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:54:57 +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:54:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 9 Jun 2024 11:54:34 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [zpKsXLDOzpQx3m3j7MBgQKJgrYPud8TkygX+2zAt9B0=] 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-2-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: 8e7fd145-8527-4aea-e9db-08dc886a386f X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: P3cDPi6tzcl9Ego5Nn5OKueqA6EuIMRH7Ip6TPWzDRV/YNklRM9moYGaTMl6OmOtJuKdjPKmEahUjmT4yg8LQ7yn5in7p7NwB7XlErSBfSCP9j8l5+Ovnt5UklnFOn2WE3VJh9yHVfc11vMCEdZ3riV0KE8Pec18djqORvilTOgTcvU6qvA4ZKPPpm7V9WIkxVrHKtG7pw4QimQujqs2InLxEBe1nhmqeJFXzTMlxKd+LdFgqk4OetbVOEnbyRI5rdAif5UEmjXVfjkyv9WQiIBguORk3ohJ4p41uTN8WfcxYjhIp4OwLm3JnVus7fFT5uetw7c+CUegx2uGSEOGYBjAQp9pNJXxSK5GWLiU85flNbmjmYNXh6uAJ326m9c4uL6UYwB1X6NOmHXCBHwXNr5A9MDP7cMuX+Sv1W9uI53eCnFAM2dn8CDo01E348zxjUdTIzmQRIAY5VTpQwllsn8iydfNNzjioBui+NUWfty+tJSzbqcLGOfmR1OKDkncBQYl5g+ttFfR0JeN7lGyD+KNS0wi61gHy6+yQKMw8YEdR6/5zH78OuiYBSWG4AqVaitirlvdq6/7A0PkLAfYP/ciTUka8SNrKT0T4ZmVSplNuxLD7jUJHXhcaVExsqBa X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EVExHU65KcHBcIXPIMF2TG6L4DcnKDbariTRP+W5x19KdeXclXzQbcpt2ilZ073iQOX8SXwG9XASMuHZNoyisqBUXh5ei8nSdTq7Z08N+f+5VSuHTBdDGI30SWo/b2yANgX1kypT2NH5FfKUIDR2xmJGAT5Ty/DOoL2bV70fFwv7dwojmV6yIERFGqPL3D35gU93IqDJ0ZyJQCkq+RAJkKJvlxQDHLGX0qIZYCp/ojf+TuFNxAQ03UtsYoLS8ceEjinMQXZAEfsps5aZv5170xDMXG6d8NsPB82dtuY6uzh8rouOlT3qA7Hkt2AZu8wTAATzvfmrTaCGIPvH4HRioW4EC01BkjNkyQmtKQZEAeXgb48mACebK24j71taTqOM98+BJZpw1bxMuLEbGu8aNlkk958+2J9oK16ZJacWMgmgH0Noq8Sxo3OS4BXGbc79G18Uw+6TNZCNo8urvp024uP4qPYRxScb3zcQeMvOiYD3KEH/BAro7eWWChLC9e12ByzaZ6DQLDp9vjAWBi21mcS+GHB/qy47fRcdPvlc6dhaTetPMGPNnQHZ620AkSVuaRfRsjI91dOpF+VL26ds3iwhqTQgYdzfzR/go1i/qFAg+DSOtO5nNAx3D3gquJlquom2iDUze1xkzeX5o4bOs/NWcf0e7GGH9xNWPo/XDSR3mWyLzp18MNXx/gEBV5W5reINkSsyqxsOrLQBK76882qY0QTIUYVIpZV/N84g9hlJs7eBHhd2sYHB49WXvnCRmvVf315ICmngHEMHloLp5L1l34QiZn16XzpfW0I772PGjlXPdiAFhmg/6GHhzul2UjolL3XFc/MOBj35PxZGQ1BjjE8gLTLj2s6QBhmxyd+J4pOFQm4Fbyfp8JF7ytAsqONayNsL3q3Bjvjjo8xppeZ7LEQwYGWY9Oyfp9L3tZ7j6hpbw4zsp74ahxHwLdo3pWP2e+LV3IxYF6gJKt9aAslO0jv58UXpxVQkFTc3zNogQjpsEgvECAWCoRPSqV6GjvguKW9TN0QJfOOdhyQlZp2CLyQxlgAV6LZ99mkatuauHOQtWY94MSg9X53DmdcS8zIJy3gKM3S3udk10DLz3CsN4uLhxhi39YbFZ9Wh71ybbXMj9FyMtvN6dAvglzQLjtQjNGHcaATj71t8d1hHGuXSqNP9ghIBP3zwuNeB6GGSGM2eiMewJ6py5viI1vQpylcj5rG6G8dc9Z1ZPmZqtvdY0cLSGM+pLofqfbRVGccNXaYD/xXBbTZWhbGVjABU+Gw2/cb45TVcSmV+3L06FQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8e7fd145-8527-4aea-e9db-08dc886a386f 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:54:57.6243 (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 3/7] avcodec/mpegvideo_enc: Move initializing H263DSP to ituh263enc.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: X3+kbl4GYveF Signed-off-by: Andreas Rheinhardt --- libavcodec/ituh263enc.c | 4 ++++ libavcodec/mpegvideo_enc.c | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c index 97abfb3f45..72c2288ebe 100644 --- a/libavcodec/ituh263enc.c +++ b/libavcodec/ituh263enc.c @@ -42,6 +42,7 @@ #include "h263.h" #include "h263enc.h" #include "h263data.h" +#include "h263dsp.h" #include "mathops.h" #include "mpegutils.h" #include "internal.h" @@ -869,6 +870,9 @@ av_cold void ff_h263_encode_init(MpegEncContext *s) av_log(s->avctx, AV_LOG_WARNING, "Clipping lmin value to %d\n", s->lmax); s->lmin = s->lmax; } +#if CONFIG_H263_ENCODER // Snow and SVQ1 call this + ff_h263dsp_init(&s->h263dsp); +#endif ff_thread_once(&init_static_once, h263_encode_init_static); } diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 45b6fdd3f0..c9cb4c2e64 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -296,8 +296,6 @@ av_cold int ff_dct_encode_init(MpegEncContext *s) ff_dct_encode_init_x86(s); #endif - if (CONFIG_H263_ENCODER) - ff_h263dsp_init(&s->h263dsp); if (!s->dct_quantize) s->dct_quantize = dct_quantize_c; if (!s->denoise_dct)