From patchwork Thu Oct 7 23:41:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre-Anthony Lemieux X-Patchwork-Id: 30975 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp304618ioa; Thu, 7 Oct 2021 16:42:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzXBarEZcEl0XSse9hiyv9dRL8Qpzj/O1hTA+V8Q1DkySpZnuP4R3aK21tuNDDHc35bejYX X-Received: by 2002:a17:906:6448:: with SMTP id l8mr9475408ejn.301.1633650159112; Thu, 07 Oct 2021 16:42:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633650159; cv=none; d=google.com; s=arc-20160816; b=d0tqEJNscU8JvKb/NZoXLvqlHHwBbya0RT/0waLyFTajG/UdrvOdt4f5PPx/GwCxaU BAAmMQ29V/prIv/rP2wylmhTD7V46+IqR4wTCYrR5syX6kG5cbk+6bXYqmbOtNqS2BdH 0mfrXybblkqxuifvAozizqdLLbnqC4tmfEGHcbkcrVbn3wFVAWUk175rD78tLdA1HFoc LycpzAVxxITI2J1AkmvB5fZNz107t/11a2FGPTn0FS/l9lXrR9Nyr5OHW8A/RLdSh3kz t8iEthJpCzVi4hWr+0erp+VcKx1OSdy0CVzCGZyspFKS/EFI+2Da1iF2cU73fjLKafyc Bmtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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:delivered-to; bh=R5zBaPQZ01rtZ5NiEUj+hzxeBY3L1A9RnPoI9fJWrI4=; b=o8ibwKEoF+qHxfE/oaSW4zRIYx445IeGll+x54MfK38Sfxwo8Lo/sEOtbMpeGptJ9B OpFvzilnv3ZmXdjXjKGSQWS5KXm8Jsa932AyHR+gJqiwxpHntlF4I0iS8ijkcq8eitqS Kw1XQQVv9ufEzunJjlZ3qKU0AQil3wA5aRiRQMel9DDaBpcy2/a2N02M7f8zom2U2yQP //C1rm/5Lc0m1SPIIljWJ7EqvWR7er1BtnXSYZ924xewzQ+88UY86BADxprhk+KNOR4T SuL4AGTFmmFMoINShpqs9r+yvNaJevic0jyquWsH6z1bUyPeTdmJqWPLvg+QkIL6/AZs XdLw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b11si1079104edm.525.2021.10.07.16.42.38; Thu, 07 Oct 2021 16:42:39 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BECAF68A57B; Fri, 8 Oct 2021 02:42:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9FBA268A447 for ; Fri, 8 Oct 2021 02:41:56 +0300 (EEST) Received: by mail-pj1-f41.google.com with SMTP id pf6-20020a17090b1d8600b0019fa884ab85so8127696pjb.5 for ; Thu, 07 Oct 2021 16:41:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SiZ9IcY6j8NP6rj7BDHkJmXzvpKTFCoWDAQ5OzZYv4g=; b=dreqT2/nKA13oxqdc9/sIxbzoxiC8dWGVSan8BgQUrepCstzPgRiwSgSi4qkfkiXJ4 lK5HNfUortBchyCsT9G22H6EE4P1Jqi8/2D7mH/rsELXAmy8HCxoL9fgSMuAN3YOyOex yD7TsbCwTdFF6BQbH13JMiSwnKB5T0HTIUsTQV/7Eg4xDOpAJpUS/f5oouG9br7aLye3 luMCTzQ80Y6ZEq8Jj/zOMivmu9lXegHay0i5oun/3J7rhI2FIlpIF2eHBV2po9qTPAfI HjfUT/Eb4mQGxKNHIYpfMPnvdB3NcRKm5BVFEpy/Am8rYl51fnmQosR18TqSnFm35H0S vhDg== X-Gm-Message-State: AOAM5302VloIPosu8wCizfXDokEBaRbQRinl1U8fE/ESDs0CLuTxjea5 tlMJipidjMDJoU0bhN5K4Nb+Ng5ihVE= X-Received: by 2002:a17:903:1208:b0:13a:8c8:8a33 with SMTP id l8-20020a170903120800b0013a08c88a33mr6699161plh.89.1633650114669; Thu, 07 Oct 2021 16:41:54 -0700 (PDT) Received: from localhost (76-14-89-2.sf-cable.astound.net. [76.14.89.2]) by smtp.gmail.com with ESMTPSA id c24sm422182pgj.63.2021.10.07.16.41.52 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Oct 2021 16:41:54 -0700 (PDT) Received: by localhost (sSMTP sendmail emulation); Thu, 07 Oct 2021 16:41:47 -0700 From: pal@sandflow.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Oct 2021 16:41:26 -0700 Message-Id: <20211007234126.5353-5-pal@sandflow.com> X-Mailer: git-send-email 2.32.0.windows.2 In-Reply-To: <20211007234126.5353-1-pal@sandflow.com> References: <20211007234126.5353-1-pal@sandflow.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/5] avformat/imf: Build system 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: Pierre-Anthony Lemieux Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Wo3qJdyrlN4D From: Pierre-Anthony Lemieux Signed-off-by: Pierre-Anthony Lemieux --- Notes: Modify the FFMPEG build system to add support for an IMF demuxer. MAINTAINERS | 1 + configure | 3 ++- doc/demuxers.texi | 6 ++++++ libavformat/Makefile | 2 ++ libavformat/allformats.c | 1 + 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index dcac46003e..7a6972fe1a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -433,6 +433,7 @@ Muxers/Demuxers: idroqdec.c Mike Melanson iff.c Jaikrishnan Menon img2*.c Michael Niedermayer + imf*.c Marc-Antoine Arnaud, Pierre-Anthony Lemieux, Valentin Noël ipmovie.c Mike Melanson ircam* Paul B Mahol iss.c Stefan Gehrer diff --git a/configure b/configure index 5e630e6e5d..9fbffff217 100755 --- a/configure +++ b/configure @@ -297,7 +297,7 @@ External library support: --enable-libxvid enable Xvid encoding via xvidcore, native MPEG-4/Xvid encoder exists [no] --enable-libxml2 enable XML parsing using the C library libxml2, needed - for dash demuxing support [no] + for dash and imf demuxing support [no] --enable-libzimg enable z.lib, needed for zscale filter [no] --enable-libzmq enable message passing via libzmq [no] --enable-libzvbi enable teletext support via libzvbi [no] @@ -3364,6 +3364,7 @@ hls_muxer_select="mpegts_muxer" hls_muxer_suggest="gcrypt openssl" image2_alias_pix_demuxer_select="image2_demuxer" image2_brender_pix_demuxer_select="image2_demuxer" +imf_demuxer_deps="libxml2" ipod_muxer_select="mov_muxer" ismv_muxer_select="mov_muxer" ivf_muxer_select="av1_metadata_bsf vp9_superframe_bsf" diff --git a/doc/demuxers.texi b/doc/demuxers.texi index 1c9575b2e8..37efe6ce1a 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -267,6 +267,12 @@ which streams to actually receive. Each stream mirrors the @code{id} and @code{bandwidth} properties from the @code{} as metadata keys named "id" and "variant_bitrate" respectively. +@section imf + +Interoperable Master Format demuxer. + +This demuxer presents audio and video streams found in an IMF Composition. + @section flv, live_flv, kux Adobe Flash Video Format demuxer. diff --git a/libavformat/Makefile b/libavformat/Makefile index c45caa3eed..42ced953f6 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -284,6 +284,7 @@ OBJS-$(CONFIG_IMAGE_WEBP_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_XBM_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_XPM_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_XWD_PIPE_DEMUXER) += img2dec.o img2.o +OBJS-$(CONFIG_IMF_DEMUXER) += imfdec.o imf_cpl.o OBJS-$(CONFIG_INGENIENT_DEMUXER) += ingenientdec.o rawdec.o OBJS-$(CONFIG_IPMOVIE_DEMUXER) += ipmovie.o OBJS-$(CONFIG_IPU_DEMUXER) += ipudec.o rawdec.o @@ -693,6 +694,7 @@ TESTPROGS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh TESTPROGS-$(CONFIG_MOV_MUXER) += movenc TESTPROGS-$(CONFIG_NETWORK) += noproxy TESTPROGS-$(CONFIG_SRTP) += srtp +TESTPROGS-$(CONFIG_IMF_DEMUXER) += imf TOOLS = aviocat \ ismindex \ diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 5471f7c16f..bad4494981 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -211,6 +211,7 @@ extern const AVInputFormat ff_image2pipe_demuxer; extern const AVOutputFormat ff_image2pipe_muxer; extern const AVInputFormat ff_image2_alias_pix_demuxer; extern const AVInputFormat ff_image2_brender_pix_demuxer; +extern const AVInputFormat ff_imf_demuxer; extern const AVInputFormat ff_ingenient_demuxer; extern const AVInputFormat ff_ipmovie_demuxer; extern const AVOutputFormat ff_ipod_muxer;