From patchwork Thu Sep 23 19:29:31 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: 30522 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp778790iob; Thu, 23 Sep 2021 12:30:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzIXFeoVSySdeCQDpvOLev4afBzC3xl78J2nAID2dzkxuKFnembPFf79c7ADW/Qqb7vyjuq X-Received: by 2002:a17:906:49d5:: with SMTP id w21mr7130919ejv.30.1632425438916; Thu, 23 Sep 2021 12:30:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632425438; cv=none; d=google.com; s=arc-20160816; b=VxK+dd1xKlpDNWVbBBonisGaUeSHFvBJ4y6B+tNw2N4voNcOTd//r2F2WJv6NlwxEw k2c/5GRYQHgchooF3dKrjHUsJTjKemY1UVhlDEuzm76cYVjx2TIhSevtQouUA3/XpDcv 2LNmdo5CdTpOBLU9ijIdTNuOijqDPtG0eXVUjSi0UhucPZM4lkOJNRDL8GVvbFOOTfo+ N2KdFm+uTSCwmnI0HleZha1oAhS7dV1VYiExi9mF+xsVI1uOGhDaWUODPfrofmXwUDIi GJLqrJaoUpXVHiL5amkqEumbP+VhcgQtKygYJtzIz2to01EpNN7EJSL614L0XiMYZ4tE qmlQ== 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=5crO9s+7C/r7JUam8sml2rLkAbeR3r+26YhEmOtpyVY=; b=hDgZwaRDA0c8l6sE1l8xuygeJMEvEZGMVGHusDvGpSRh2uGgz+z0CK6aPxZ3fqc2FK pXWXwzf0dSfo1Ewan498uriBrgShoZiS5yV/dRSMetn80lDAV1WNysrFtzMFg6eZkO7K o8fPFn+EFTSdERSJKRyLcuTqO48d1Zy6QfnYlK9kWy3P90lJL1A4VMzALjT3WQ0BTuNl ThR4cwJ6RBJK9u8LgZoMSQVb30UvN1h3uhebhnIlDOtAvD3gshkFs5ysKIv1NslD7nVE MLyE8eDYOB8x0bpAl3Lrp/hnkFkG+uuynoGg4TN3umn2I2CZelMSeJ1HMRB+ZgobTF7b l63A== 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 hk18si6797879ejb.238.2021.09.23.12.30.38; Thu, 23 Sep 2021 12:30:38 -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 978AD68A048; Thu, 23 Sep 2021 22:30:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 77BF0689F8C for ; Thu, 23 Sep 2021 22:29:55 +0300 (EEST) Received: by mail-pf1-f181.google.com with SMTP id q23so6624962pfs.9 for ; Thu, 23 Sep 2021 12:29:55 -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=yfU754xqW6jf8QG8fK4+JKhrnDgHuIiFGge+9WXZslM=; b=U5LonOEwBqFqKeUOXpl/kIjhzxB9Noyre9E5R0N2kywTxg4SixJC4Dme07yvMssXvm Wjr8jWfb3FO2fyuZRBymDI3aH8fT+wXN1mrZ6SPFCLGV6OwSm4HTIQ5aPmMmQv64gB8A 6+SIfF48QHJdHgFaPbcTNi++z7WfSp2HshB9VNoqvVYgQnLUcxuY5XTfTxNH3srM9vig nTQrXODVA/bbtKPM1yjk7EUWzxuzpyAdMo5hUa22fGCLeN9TOCgRiw3xhkG2iG6dHb5G EMkSLVsFtjG9JILErKLNt0nR8asienBOTh8acrdAG11rzya7787mO1YI2Eix1dioU00t MSyg== X-Gm-Message-State: AOAM532VeDQBFr5d7dEE5ScEEbB7sq/swMM0QObBUtv6xkH+MZihesj9 zBGC8YPJGroUMru4cbvF4R3TlPCjAg8= X-Received: by 2002:a62:6482:0:b0:433:9588:311a with SMTP id y124-20020a626482000000b004339588311amr5975428pfb.9.1632425393523; Thu, 23 Sep 2021 12:29:53 -0700 (PDT) Received: from localhost (76-14-89-2.sf-cable.astound.net. [76.14.89.2]) by smtp.gmail.com with ESMTPSA id kt19sm9573862pjb.52.2021.09.23.12.29.51 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 23 Sep 2021 12:29:53 -0700 (PDT) Received: by localhost (sSMTP sendmail emulation); Thu, 23 Sep 2021 12:29:44 -0700 From: pal@sandflow.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Sep 2021 12:29:31 -0700 Message-Id: <20210923192931.24829-5-pal@sandflow.com> X-Mailer: git-send-email 2.32.0.windows.2 In-Reply-To: <20210923192931.24829-1-pal@sandflow.com> References: <20210923192931.24829-1-pal@sandflow.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/5] [IMF demuxer] 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: xnEVVDUafJCo 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 231d0398a8..c9f815296b 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] @@ -3363,6 +3363,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;