From patchwork Fri May 17 13:42:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 48951 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp2886880pzb; Fri, 17 May 2024 06:43:42 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWDdYm08JJREronAGo7Jwrn/m8SXd5huQFizMg3+47Vyu3zf8JTt6wlhD977CsSjALQD2AAAzBVLmCdGn75DVQAx7w5qFBDoDp5/w== X-Google-Smtp-Source: AGHT+IEAA5qQVhfiVgHrglcz4l9bbgIW5re+C4SnvUEQZdp9EOGpCPjlBBzBBlkfBwdmJlGrkLz8 X-Received: by 2002:a50:8a84:0:b0:572:d1e1:b4b3 with SMTP id 4fb4d7f45d1cf-5734d59d528mr16556350a12.7.1715953421976; Fri, 17 May 2024 06:43:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715953421; cv=none; d=google.com; s=arc-20160816; b=XeSg9lVrHjQnHENs2eVVzOLlKp7u1FgUtToH64S5xik3Di3mhR3ASpiZv6nFTbKBou oGELLrGr2k+7AnLp89Urr50yo57xNyXOfdjA9zVIlBsSbjZdSaWHWWoakaPS1GeBObqD o6SIQCBI5wRhPYQkYZTP3QKBw6dPI752ruXGXrF7RY8EY5tSqLGv7zHo7qpxnl8KgEN5 skTDjim2dxT0dyZxP92CdMsGSKZXTQxacn+A9WKZEmwTqa/dfEYwNz1dMKsB5fgoHGtc P7wXgBVpYY/lhxQ9n1oUebb5pr75PyvDifLTGfddVcrLdDAI7q1I4Otp1zb7GRxF+hSZ +dUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=st0UlCvc168y632z1usH80Y0iRirU76OOJaq7/Juum0=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=O9WyCLy7buRMmsqrhUIQbpK3D8dvKwIDJdqbLilfRiMcdd2kxcO9tk7+5RQUvqN+MM w+uNknUhYXLv9yHJPJwn/6r7G5Oszw2FeHbMLKQ6oNe3d3tuzabxQgOlkBpwhJiiRN3t Yufm0aWwE/7f5OiXfc3Pf6KXmLZiE4JTeIIcQhmZcc26VqJZa070JLCFuGRJ5TQLW8uy kDuFF9BnUVcEjcxWMJIAR2cx16FOb7cI3UnfCoUaAtfgEHsaTLbgDgj+GlYeKavKepsg VgO7fvpKJeUbx/Klf+BdMQyv6jg5LBeu8holj8FzgdwC6R9921HvDdE3Yy1akcxYEEcr hfSA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=cjahLYTf; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-5750c3057e7si1840000a12.440.2024.05.17.06.43.41; Fri, 17 May 2024 06:43:41 -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=@gmail.com header.s=20230601 header.b=cjahLYTf; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B70DC68D307; Fri, 17 May 2024 16:43:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8051768D2A5 for ; Fri, 17 May 2024 16:43:13 +0300 (EEST) Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-1eeb1a4c10aso8291985ad.3 for ; Fri, 17 May 2024 06:43:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715953391; x=1716558191; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=siD+H8rEJdHLC6LG2E28hiLjUY7YegiL0+yaQBuNhJY=; b=cjahLYTf0yE7BjssvHkOUlO9JYMOZxUVZklx/nmesv/X0XTmhZKx1dYeTDAy6ubATa kpl8edzOcy3biVHoOVvMjvHASnhTUPtn8s/aPOiS4lqb7HtWmW45C+rn9NzBhP6ubmdN 6yKxy9L/B1YLZEzzpp3NCkD2bXQbqs0dX58ZVqMGmwtTLYdBI8kyaLr8dlBuK0eAfUzz LSR/LU/wbG341XfIgQfhuNJQItjVCm9MssRd9wVtORp6QA2Kz5RFqOtAefxM8UTnj4in MsES40nnOeBak3v1OWAxuXE4wwS881U0XALcqMl3Ii+ajiT3agBoVzgbytYqu54Qr0+h 9Eeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715953391; x=1716558191; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=siD+H8rEJdHLC6LG2E28hiLjUY7YegiL0+yaQBuNhJY=; b=I1Da3WNCNG6ijWlBA0Ema3xp2jS3Jr7rGApmwdpDOSKSqROtJ4+M64CepXaEX+aOdX IkzaSPpYyqrkKM3vR+TXtp1jllEedSIN+/IiRhsPV7H46NiqkLIs3caIVDECYKIRIL/d PDbVsxwnpVzAZPzkIVBjzk/cOt2c4OcPgMCxSaUBrqBYS621m9fCGtJXA9Cjmsd1Ij8X Wf1wDdT7Decvu+5jZO2UTU3yXe1nh+SLWZWzNLM0v1xxU+SzVS3DHi91+WCFCOv2nEIx f0wnr9waJVK9o4RKL3RN37+CDL7h5k9m0mGYr1I59Zx5kAfgXJcSMdMTZkoH4XaFiPyo iiFg== X-Gm-Message-State: AOJu0YxqSIf9AUM5HMqjgkD2Y+598EXnIpEtzJZcqzg8FKsmQpJHR21q 6XvU2zueT8fzfOxk8FU78KH2munTJZF0zqSc/q2+yyyXuQfHutui5nxd/A== X-Received: by 2002:a05:6a20:9785:b0:1ac:c455:c132 with SMTP id adf61e73a8af0-1afde10f54bmr21126724637.30.1715953391141; Fri, 17 May 2024 06:43:11 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0b9d15dfsm157145935ad.62.2024.05.17.06.43.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 May 2024 06:43:10 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 May 2024 10:42:28 -0300 Message-ID: <20240517134228.288-3-jamrial@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240517134228.288-1-jamrial@gmail.com> References: <20240517134228.288-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] configure: split ISOBMFF writer helpers into a separate component 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: QRKs1lW7KLi2 Signed-off-by: James Almer --- configure | 10 ++++++---- libavformat/Makefile | 16 ++++++++-------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 275fa59bfd..b16722d83d 100755 --- a/configure +++ b/configure @@ -2587,6 +2587,7 @@ CONFIG_EXTRA=" inflate_wrapper intrax8 iso_media + iso_writer ividsp jpegtables lgplv3 @@ -3611,7 +3612,7 @@ evc_demuxer_select="evc_frame_merge_bsf evc_parser" f4v_muxer_select="mov_muxer" fifo_muxer_deps="threads" flac_demuxer_select="flac_parser" -flv_muxer_select="aac_adtstoasc_bsf" +flv_muxer_select="aac_adtstoasc_bsf iso_writer" gxf_muxer_select="pcm_rechunk_bsf" hds_muxer_select="flv_muxer" hls_demuxer_select="aac_demuxer ac3_demuxer adts_header ac3_parser eac3_demuxer mov_demuxer mpegts_demuxer" @@ -3629,12 +3630,12 @@ latm_muxer_select="aac_adtstoasc_bsf mpeg4audio" matroska_audio_muxer_select="matroska_muxer" matroska_demuxer_select="riffdec" matroska_demuxer_suggest="bzlib zlib" -matroska_muxer_select="mpeg4audio riffenc aac_adtstoasc_bsf pgs_frame_merge_bsf vp9_superframe_bsf" +matroska_muxer_select="iso_writer mpeg4audio riffenc aac_adtstoasc_bsf pgs_frame_merge_bsf vp9_superframe_bsf" mlp_demuxer_select="mlp_parser" mmf_muxer_select="riffenc" mov_demuxer_select="iso_media riffdec" mov_demuxer_suggest="iamfdec zlib" -mov_muxer_select="iso_media riffenc rtpenc_chain vp9_superframe_bsf aac_adtstoasc_bsf ac3_parser" +mov_muxer_select="iso_media iso_writer riffenc rtpenc_chain vp9_superframe_bsf aac_adtstoasc_bsf ac3_parser" mov_muxer_suggest="iamfenc" mp3_demuxer_select="mpegaudio_parser" mp3_muxer_select="mpegaudioheader" @@ -3642,7 +3643,7 @@ mp4_muxer_select="mov_muxer" mpegts_demuxer_select="iso_media" mpegts_muxer_select="ac3_parser adts_muxer latm_muxer h264_mp4toannexb_bsf hevc_mp4toannexb_bsf vvc_mp4toannexb_bsf" mpegtsraw_demuxer_select="mpegts_demuxer" -mxf_muxer_select="pcm_rechunk_bsf rangecoder" +mxf_muxer_select="iso_writer pcm_rechunk_bsf rangecoder" mxf_d10_muxer_select="mxf_muxer" mxf_opatom_muxer_select="mxf_muxer" nut_muxer_select="riffenc" @@ -3655,6 +3656,7 @@ ogv_muxer_select="ogg_muxer" opus_muxer_select="ogg_muxer" psp_muxer_select="mov_muxer" rtp_demuxer_select="sdp_demuxer" +rtp_muxer_select="iso_writer" rtp_mpegts_muxer_select="mpegts_muxer rtp_muxer" rtpdec_select="asf_demuxer mov_demuxer mpegts_demuxer rm_demuxer rtp_protocol srtp" rtsp_demuxer_select="http_protocol rtpdec" diff --git a/libavformat/Makefile b/libavformat/Makefile index 211ccf45e5..1c4d9deccd 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -35,6 +35,7 @@ OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o # subsystems OBJS-$(CONFIG_ISO_MEDIA) += isom.o +OBJS-$(CONFIG_ISO_WRITER) += av1.o avc.o hevc.o vvc.o vpcc.o OBJS-$(CONFIG_IAMFDEC) += iamf_reader.o iamf_parse.o iamf.o OBJS-$(CONFIG_IAMFENC) += iamf_writer.o iamf.o OBJS-$(CONFIG_NETWORK) += network.o @@ -220,7 +221,7 @@ OBJS-$(CONFIG_FLAC_MUXER) += flacenc.o flacenc_header.o \ OBJS-$(CONFIG_FLIC_DEMUXER) += flic.o OBJS-$(CONFIG_FLV_DEMUXER) += flvdec.o OBJS-$(CONFIG_LIVE_FLV_DEMUXER) += flvdec.o -OBJS-$(CONFIG_FLV_MUXER) += flvenc.o avc.o hevc.o av1.o vpcc.o +OBJS-$(CONFIG_FLV_MUXER) += flvenc.o OBJS-$(CONFIG_FOURXM_DEMUXER) += 4xm.o OBJS-$(CONFIG_FRAMECRC_MUXER) += framecrcenc.o framehash.o OBJS-$(CONFIG_FRAMEHASH_MUXER) += hashenc.o framehash.o @@ -260,7 +261,7 @@ OBJS-$(CONFIG_HEVC_MUXER) += rawenc.o OBJS-$(CONFIG_EVC_DEMUXER) += evcdec.o rawdec.o OBJS-$(CONFIG_EVC_MUXER) += rawenc.o OBJS-$(CONFIG_HLS_DEMUXER) += hls.o hls_sample_encryption.o -OBJS-$(CONFIG_HLS_MUXER) += hlsenc.o hlsplaylist.o avc.o +OBJS-$(CONFIG_HLS_MUXER) += hlsenc.o hlsplaylist.o OBJS-$(CONFIG_HNM_DEMUXER) += hnm.o OBJS-$(CONFIG_IAMF_DEMUXER) += iamfdec.o OBJS-$(CONFIG_IAMF_MUXER) += iamfenc.o @@ -349,7 +350,6 @@ OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroskadec.o matroska.o \ oggparsevorbis.o vorbiscomment.o \ qtpalette.o replaygain.o dovi_isom.o OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o matroska.o \ - av1.o avc.o hevc.o vvc.o\ flacenc_header.o avlanguage.o \ vorbiscomment.o wv.o dovi_isom.o OBJS-$(CONFIG_MCA_DEMUXER) += mca.o @@ -371,7 +371,7 @@ OBJS-$(CONFIG_MODS_DEMUXER) += mods.o OBJS-$(CONFIG_MOFLEX_DEMUXER) += moflex.o OBJS-$(CONFIG_MOV_DEMUXER) += mov.o mov_chan.o mov_esds.o \ qtpalette.o replaygain.o dovi_isom.o -OBJS-$(CONFIG_MOV_MUXER) += movenc.o av1.o avc.o hevc.o vvc.o vpcc.o \ +OBJS-$(CONFIG_MOV_MUXER) += movenc.o \ movenchint.o mov_chan.o rtp.o \ movenccenc.o movenc_ttml.o rawutils.o \ dovi_isom.o evc.o @@ -404,7 +404,7 @@ OBJS-$(CONFIG_MUSX_DEMUXER) += musx.o OBJS-$(CONFIG_MV_DEMUXER) += mvdec.o OBJS-$(CONFIG_MVI_DEMUXER) += mvi.o OBJS-$(CONFIG_MXF_DEMUXER) += mxfdec.o mxf.o avlanguage.o -OBJS-$(CONFIG_MXF_MUXER) += mxfenc.o mxf.o avc.o +OBJS-$(CONFIG_MXF_MUXER) += mxfenc.o mxf.o OBJS-$(CONFIG_MXG_DEMUXER) += mxg.o OBJS-$(CONFIG_NC_DEMUXER) += ncdec.o OBJS-$(CONFIG_NISTSPHERE_DEMUXER) += nistspheredec.o pcm.o @@ -526,8 +526,7 @@ OBJS-$(CONFIG_RTP_MUXER) += rtp.o \ rtpenc_vc2hq.o \ rtpenc_vp8.o \ rtpenc_vp9.o \ - rtpenc_xiph.o \ - avc.o hevc.o vvc.o + rtpenc_xiph.o OBJS-$(CONFIG_RTSP_DEMUXER) += rtsp.o rtspdec.o httpauth.o \ urldecode.o OBJS-$(CONFIG_RTSP_MUXER) += rtsp.o rtspenc.o httpauth.o \ @@ -727,8 +726,9 @@ OBJS-$(CONFIG_LIBSSH_PROTOCOL) += libssh.o OBJS-$(CONFIG_LIBZMQ_PROTOCOL) += libzmq.o # Objects duplicated from other libraries for shared builds -SHLIBOBJS += log2_tab.o to_upper4.o bitstream.o +SHLIBOBJS += log2_tab.o to_upper4.o SHLIBOBJS-$(CONFIG_ISO_MEDIA) += mpegaudiotabs.o +SHLIBOBJS-$(CONFIG_ISO_WRITER) += bitstream.o SHLIBOBJS-$(CONFIG_FLV_MUXER) += mpeg4audio_sample_rates.o SHLIBOBJS-$(CONFIG_HLS_DEMUXER) += ac3_channel_layout_tab.o SHLIBOBJS-$(CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER) += jpegxl_parse.o