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 5F24A409F8 for ; Sat, 25 Dec 2021 06:09:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 848D268B075; Sat, 25 Dec 2021 08:09:23 +0200 (EET) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067058.outbound.protection.outlook.com [40.92.67.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 59F1F68AFD4 for ; Sat, 25 Dec 2021 08:09:17 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d1vWZ0anczaPObFUJq8fxXKMn3iiw62ChwphOJkXCOnMZd5/+ZoDepm7nPp7GmE22BMx9YJPa8xrcZJKAvP2sr5c9WY1f92kSGQxxBmVFwSoq9e8C4YBQ6/xUz1PiLIN45LjhyAcUaYd2S33HH3xNe0kdmrHJSTxGOD47DjmGCnS/Ku0QpCHLTq5j8B9rmHp0OiGzCvOmWc5BID0ehmArPOfhdsMYmYHUD2qeMMWynpOQ69WRZFi5kscMZhzTBxXhAys0VEIqNkgAbAWw7vodxznVBw6/iUnM+e6QvTj7L2337iw8mYRBIje9yIMfoJf7BXxznHEh5M3VHO2ejwxKg== 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=E0GEbaPVeSOc9qE5S4+UsJ5ZqSda7APwf5YfqekSNt0=; b=e4So47xxrsGTz55m8AVbH3Nj8ZWYJXeDfPSFDym92oUBBKxUyzgX2eLbl2NnwHyVIHpqKQE8sdsDvFg6tGjEIpgRRmp3Ex7kVIMsiWOtXJJvBsVBXyTO3G+HGEp2Z1UvocnvGjFkKcWPS+MF93/EOQbbUkXIGy2eLjefVG4nNbpv1z7a4QTAr5lYUv7SWEkKJNDZS1l5KLNOtdF/GgBz9QLqUeNXgVStA0jKYpP0cn1JE1o6b7wF48q3YuLdQ1CRGxwduwx75JbaTAAKBzzeiS8AUATDpqtnNh5McyZyfwXGXlNPOAUlI5bPqj2RsfClmdg1CDlhtbzlU5XF+TONHA== 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=E0GEbaPVeSOc9qE5S4+UsJ5ZqSda7APwf5YfqekSNt0=; b=AgnB4VXQMFhjx50VmzWM9ATqI+pErvdZA64vae6QGbVOwqZ0stdLAsEv7gXLGO6S7VAWVwUhVgt35vdu40ZVmea5BUNgSLjeKrzb6IcEbub+RMbq3VHFmkpLh4X2IO+b0msc8iIT8U++j1MoghBzYUJP2RnSE/drS0+5iprbLyHFUKJNrOBpkmk/Wvvk49nLfGdJPV8eluBHDZm3uwlpJ6r62OSG+qCfGlvaSrAhfVD47ihfCgPBjXzoE5z8Ivp+nl/kfnW/Lpw+DPTxGsxBhSsUXmBhPIPN825XhJh1Jrl9YCSCKUbw6V/fw7w75mFN+fMY3iUr7BqTHIUtlZW2WA== Received: from DBAPR03MB6664.eurprd03.prod.outlook.com (2603:10a6:10:17d::22) by DBBPR03MB5445.eurprd03.prod.outlook.com (2603:10a6:10:dc::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4823.18; Sat, 25 Dec 2021 06:09:16 +0000 Received: from DBAPR03MB6664.eurprd03.prod.outlook.com ([fe80::8c52:d93a:8d07:9f77]) by DBAPR03MB6664.eurprd03.prod.outlook.com ([fe80::8c52:d93a:8d07:9f77%6]) with mapi id 15.20.4823.021; Sat, 25 Dec 2021 06:09:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Dec 2021 07:09:07 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [qVSNPNQ4FfXxOXAUSFJGI6oxZ4paWYAW] X-ClientProxiedBy: AM0PR04CA0013.eurprd04.prod.outlook.com (2603:10a6:208:122::26) To DBAPR03MB6664.eurprd03.prod.outlook.com (2603:10a6:10:17d::22) X-Microsoft-Original-Message-ID: <20211225060908.2345265-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 63d40eb4-eade-435b-32d6-08d9c76d1479 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWm3GLoeUntTG6KfWWWbWhlv3K9KUpk89qoLib1GdIRYOEPQWzxDevwhJQfhRXkUt1ZN6mFf6gJdMbbFLEF/DETtwlPUAXSt+5p2MqwhdAxKHuMPuPaba8lwDLEs/aYzTTNpt/jbWwnonXHunyhjI7JmuPotfcaROhZqlnnzBUoHZ35LDi76Uz6MBefG7q3M3/qTwI8CLv4yjRGxyIzwIFQVtSgLJjBWFhNN8i6pxpCEdQ24GjVGgbDCve6Z94M6Ikt+afiQWnoZpH/CwvgTFIUPd41sCyWyWSOFKj72k7BQ79rJv6mWppqQuEBomOtxljJYHU2a/lD30vHA23smbTTShIRD8ATe/2OAoHsna3ZjnEUDCer45PqPTD73EPdpOvwTOClCOikpJciXgDueWZaIoMBVP9tCLqG3d94HNOIDX6CCkSOqFSTuTJHp37b7ztHSFUAVPG9SH6e8KLyZmVuyk8CwrY/RiySgPP8DVdiu8tro+EEfEc/rWHK8XHcKybX0JzAQdGb/MZbqAdEw1/YX0QwvHctfqszndI/+N7Du1KuWuHIu0MR6VGCfUqTNxiatfZOrcZz7SdUo4eO8jg+225gGGM1vnYRtfeTJ9mexa2yawPjgcUf6FR6LEAAvbwU4dfj8tpMZUoclJqXOqOJ67vo/mJ8ehPUZevQe2a56DFa9ulFoIUPAUToya3+OwIXDafB8wwAV3V78u9PbIdYRzNr79NudSY= X-MS-TrafficTypeDiagnostic: DBBPR03MB5445:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7+MLIsnDEY7DYvdLwHfk7f+MnliEStQbZZ+N3ftWnpufMGt0hw++K7VAbZJKDMJHTDBJni8QbxmaKDg9rVpGF1iB0FOWlWM1UCx3UjgvfbUk9WCsEuUv3QzhYhiX+2n6rf9sGgps2pm+vdaLjZOCF8hoyjysxdJ7lPvBw/bxBqP/rHHAwUFYEj05cI2tBOno5l+RG5PmDXBygGU5YQPKFca4KHZZs9+JOOBlFeSiR66Tl13XHl3G0vLuntZ2hrg95JwVp/hxUP6INaQS+nCvedFqUvXbudu3KErao0zjqzhh6mO52QLbdSSqV/OOAp+XuJJ84y3NpVksnrckPeQcj/n9UPjHbHuiRR/LfwecL413TPTQV9Pzzp6XuTLH/7CKDHturae1AmVaYUpg3hwo46sqqs0POtu8tcJD/YgLYnLqLKmfi6wQioQ/M2kaV3t+oHfiq6Wlx3fxyivT462X6IJ4u0U4NZ0mEVzKMGOjGYjBl59UrX0SE49holQBwzIJXQuGbhuYbwl5d+VDdon55PH5tEa0wN20fyE7pr3tlmPa+p0ABwoy5Nc7n/E1DvoCMhLw28QndRbu920yTQojMg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ucBP1CPdSrX3t8d+DyaWC+fgHB0RM9Vp+DIZVsRHDw+NZnkfH8XQ/dP7iwUd?= =?us-ascii?Q?cp1dhNdmU8ORqo0Vf26SOmmzdYdwaqlH2SHfO99IgIeXnRbTbZ0gCsVDZzAe?= =?us-ascii?Q?m2ex07K660AfnZ53yD4fNtgiIBnl97QU9DFbdXMXtf1iaNhE9DPNUxfy+wo2?= =?us-ascii?Q?ToWJ+YjcLf7vP0v/9lNikxIYLO4uzUSPpa27NwTUZSjw7ndW8PG7E9IUtEL5?= =?us-ascii?Q?9m1O2bRlNunbNnEttHNYrUlvet0n2bajLbqnJzuj6ftyDTe0WNjwaWMy06op?= =?us-ascii?Q?+8Ws81eKvhyA4njMNEs9SWKqsoTsl0/JEjGbeHKToIrHalT4hweVhzKrhIW2?= =?us-ascii?Q?spFTTKpcb8WuitLcRZxRhAzApLVLLs9/p8KaKSjGJzwUU7AgIM/PAeHozLKa?= =?us-ascii?Q?8E1abDu7YwiOy9Dm4c6fqPPHh9quRobdYvYFLuJPMk9Q8C4J0aeDo2n+lJZb?= =?us-ascii?Q?FZMJx0+r2EPIDVCYpDAPja3niFYlhiP7R0obCPr9QX5IXpZx+hZpIwa4ioh1?= =?us-ascii?Q?VIPOdnZ+qoWWT4RT+JAN4CD3KEvYbPQS62Q62NRAYAHs/22c/JinqaCiLzyF?= =?us-ascii?Q?/F+Tb4oZvtO2Zz+/Fmg6CXa8shNJi3hOuyWG4nK7mYZ2fnQEZreHEuVrAVvc?= =?us-ascii?Q?qKFraRWFlCwgsiYhHuvO2eeg4UIjt90SfHdBWT+PoD6iWDlCPJVdKAD/x227?= =?us-ascii?Q?ey4aEhlZNsMd8YXbog9NBXsU0zPxi4El8p5whnKSh3jHoAwBRO50t3qwcCUo?= =?us-ascii?Q?EbwXW/R8GOXJpu/DNZguO43N3uW5vZR9AhODyFCeAK1dJspZ4wQRvt3TeQkT?= =?us-ascii?Q?nnw9ZvD0z/wOj19BzX/GcQrmMM/9m50I4/zFuDaSn3Vp9QJ7nnP1wCjbkfx9?= =?us-ascii?Q?v27pVyJtcfg/ONmDm8n+UT8gAKbAc+G77AUBgRZ0TbWFZhiQGfbkwREeE4Dt?= =?us-ascii?Q?ssmo3ZCYDEfb/akNSIxx2g=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 63d40eb4-eade-435b-32d6-08d9c76d1479 X-MS-Exchange-CrossTenant-AuthSource: DBAPR03MB6664.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Dec 2021 06:09:16.0672 (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: DBBPR03MB5445 Subject: [FFmpeg-devel] [PATCH v2 34/35] configure: Add new mpegvideodec CONFIG_EXTRA 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: This allows to remove the spurious dependencies of mpegvideo encoders on error_resilience; some other components that do not use mpegvideo to its fullest turned out to not need it either. Adding a new CONFIG_EXTRA needs a reconfigure to take effect. In order to force this a few unnecessary headers from lavfi/allfilters.c have been removed. Signed-off-by: Andreas Rheinhardt --- Moved mpegutils.c to mpegvideodec. configure | 26 ++++++++++++++------------ libavcodec/Makefile | 5 +++-- libavcodec/h264dec.c | 2 +- libavcodec/mpegvideo.c | 2 +- libavfilter/allfilters.c | 2 -- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/configure b/configure index 23ef2abc9b..f3bdfd2920 100755 --- a/configure +++ b/configure @@ -2476,6 +2476,7 @@ CONFIG_EXTRA=" mpegaudiodsp mpegaudioheader mpegvideo + mpegvideodec mpegvideoenc mss34dsp pixblockdsp @@ -2723,7 +2724,8 @@ me_cmp_select="fdctdsp idctdsp pixblockdsp" mpeg_er_select="error_resilience" mpegaudio_select="mpegaudiodsp mpegaudioheader" mpegaudiodsp_select="dct" -mpegvideo_select="blockdsp h264chroma hpeldsp idctdsp me_cmp mpeg_er videodsp" +mpegvideo_select="blockdsp h264chroma hpeldsp idctdsp me_cmp videodsp" +mpegvideodec_select="mpegvideo mpeg_er" mpegvideoenc_select="aandcttables me_cmp mpegvideo pixblockdsp qpeldsp" vc1dsp_select="h264chroma qpeldsp startcode" rdft_select="fft" @@ -2812,9 +2814,9 @@ fraps_decoder_select="bswapdsp huffman" g2m_decoder_deps="zlib" g2m_decoder_select="blockdsp idctdsp jpegtables" g729_decoder_select="audiodsp" -h261_decoder_select="mpegvideo" +h261_decoder_select="mpegvideodec" h261_encoder_select="mpegvideoenc" -h263_decoder_select="h263_parser h263dsp mpegvideo qpeldsp" +h263_decoder_select="h263_parser h263dsp mpegvideodec qpeldsp" h263_encoder_select="h263dsp mpegvideoenc" h263i_decoder_select="h263_decoder" h263p_decoder_select="h263_decoder" @@ -2836,7 +2838,7 @@ indeo3_decoder_select="hpeldsp" indeo4_decoder_select="ividsp" indeo5_decoder_select="ividsp" interplay_video_decoder_select="hpeldsp" -ipu_decoder_select="mpegvideo" +ipu_decoder_select="mpegvideodec" jpegls_decoder_select="mjpeg_decoder" jv_decoder_select="blockdsp" lagarith_decoder_select="llviddsp" @@ -2866,10 +2868,10 @@ mp3on4_decoder_select="mpegaudio" mp3on4float_decoder_select="mpegaudio" mpc7_decoder_select="bswapdsp mpegaudiodsp" mpc8_decoder_select="mpegaudiodsp" -mpegvideo_decoder_select="mpegvideo" -mpeg1video_decoder_select="mpegvideo" +mpegvideo_decoder_select="mpegvideodec" +mpeg1video_decoder_select="mpegvideodec" mpeg1video_encoder_select="mpegvideoenc h263dsp" -mpeg2video_decoder_select="mpegvideo" +mpeg2video_decoder_select="mpegvideodec" mpeg2video_encoder_select="mpegvideoenc h263dsp" mpeg4_decoder_select="h263_decoder mpeg4video_parser" mpeg4_encoder_select="h263_encoder" @@ -2880,7 +2882,7 @@ msmpeg4v2_decoder_select="h263_decoder" msmpeg4v2_encoder_select="h263_encoder" msmpeg4v3_decoder_select="h263_decoder" msmpeg4v3_encoder_select="h263_encoder" -mss2_decoder_select="mpegvideo qpeldsp vc1_decoder" +mss2_decoder_select="mpegvideodec qpeldsp vc1_decoder" mts2_decoder_select="jpegtables mss34dsp" mv30_decoder_select="aandcttables blockdsp" mvha_decoder_deps="zlib" @@ -2913,8 +2915,8 @@ rv10_decoder_select="h263_decoder" rv10_encoder_select="h263_encoder" rv20_decoder_select="h263_decoder" rv20_encoder_select="h263_encoder" -rv30_decoder_select="golomb h264pred h264qpel mpegvideo rv34dsp" -rv40_decoder_select="golomb h264pred h264qpel mpegvideo rv34dsp" +rv30_decoder_select="golomb h264pred h264qpel mpegvideodec rv34dsp" +rv40_decoder_select="golomb h264pred h264qpel mpegvideodec rv34dsp" screenpresso_decoder_deps="zlib" shorten_decoder_select="bswapdsp" sipr_decoder_select="lsp" @@ -2950,7 +2952,7 @@ txd_decoder_select="texturedsp" utvideo_decoder_select="bswapdsp llviddsp" utvideo_encoder_select="bswapdsp huffman llvidencdsp" vble_decoder_select="llviddsp" -vc1_decoder_select="blockdsp h263_decoder h264qpel intrax8 mpegvideo vc1dsp" +vc1_decoder_select="blockdsp h263_decoder h264qpel intrax8 mpegvideodec vc1dsp" vc1image_decoder_select="vc1_decoder" vorbis_decoder_select="mdct" vorbis_encoder_select="audio_frame_queue mdct" @@ -3246,7 +3248,7 @@ h264_parser_select="atsc_a53 golomb h264dsp h264parse" hevc_parser_select="hevcparse" mpegaudio_parser_select="mpegaudioheader" mpegvideo_parser_select="mpegvideo" -mpeg4video_parser_select="h263dsp mpegvideo qpeldsp" +mpeg4video_parser_select="h263dsp mpegvideodec qpeldsp" vc1_parser_select="vc1dsp" # bitstream_filters diff --git a/libavcodec/Makefile b/libavcodec/Makefile index e7f1f110e7..4b0911e9c8 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -123,9 +123,10 @@ OBJS-$(CONFIG_MPEGAUDIODSP) += mpegaudiodsp.o \ mpegaudiodsp_fixed.o \ mpegaudiodsp_float.o OBJS-$(CONFIG_MPEGAUDIOHEADER) += mpegaudiodecheader.o mpegaudiodata.o -OBJS-$(CONFIG_MPEGVIDEO) += mpegvideo.o mpegvideo_dec.o mpegvideodsp.o rl.o \ - mpegvideo_motion.o mpegutils.o \ +OBJS-$(CONFIG_MPEGVIDEO) += mpegvideo.o mpegvideodsp.o rl.o \ + mpegvideo_motion.o \ mpegvideodata.o mpegpicture.o +OBJS-$(CONFIG_MPEGVIDEODEC) += mpegvideo_dec.o mpegutils.o OBJS-$(CONFIG_MPEGVIDEOENC) += mpegvideo_enc.o mpeg12data.o \ motion_est.o ratecontrol.o \ mpegvideoencdsp.o diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 6a5bf51f5d..7f10026340 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -939,7 +939,7 @@ static int finalize_frame(H264Context *h, AVFrame *dst, H264Picture *out, int *g *got_frame = 1; - if (CONFIG_MPEGVIDEO) { + if (CONFIG_MPEGVIDEODEC) { ff_print_debug_info2(h->avctx, dst, NULL, out->mb_type, out->qscale_table, diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index a2c4e14b6e..1c2b28f450 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -658,7 +658,7 @@ int ff_mpv_init_context_frame(MpegEncContext *s) return AVERROR(ENOMEM); memset(s->mbintra_table, 1, mb_array_size); - return s->encoding ? 0 : ff_mpeg_er_init(s); + return !CONFIG_MPEGVIDEODEC || s->encoding ? 0 : ff_mpeg_er_init(s); } static void clear_context(MpegEncContext *s) diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 26f1c73505..f506ef64cc 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -19,9 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/thread.h" #include "avfilter.h" -#include "config.h" extern const AVFilter ff_af_abench; extern const AVFilter ff_af_acompressor; -- 2.32.0 _______________________________________________ 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".