From patchwork Wed Oct 20 14:53:36 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: 31171 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp1564463ioa; Wed, 20 Oct 2021 07:55:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzxHZyHrycn7EMOOZxff0vTSGNwK2FHC7CGb+uSe2oAmIa5pTx7e0Z/Gbq6RnjTahYeHTGi X-Received: by 2002:a17:907:9908:: with SMTP id ka8mr100780ejc.164.1634741730866; Wed, 20 Oct 2021 07:55:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634741730; cv=none; d=google.com; s=arc-20160816; b=NdtOQVCGQz5ExZIl+3mMROSzCyM6182P7uVLd8EF5mH0YYSfPtv+dFru9AAd/G3Vqx 4hUguljR7RiyMtS552Plp/91CUZOXa0OXlkbb0PZ4KaWoXmKbL5miea+19ucVujSU2jU qPXGK2uhwf4pEQwZFJUSJ30STARI/pFATNL08dVGaY15xFu1f6lYkgUNaTMWd/cuLrAn wDltmn9tGaZhl3sCkQXS6pNyEB30cI2S2lb+yR1JpKckwYynbFm8soCORIeK584Wq3mw IvATJaHG3/DUJ1TtryPWbsli6AaeWTZqkByqAlqBfqWNB6p+QMQl90qBz1Eth+M7m+3+ 6lfA== 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=uiK74Mwz1wWwGr9KZd+Dd0+F/CdYk8WaN9NTUouI+3o=; b=rMGkVoHaL4sEy4wFWMEFmGcGJu1zJCf0/Q+FoiAO0zBCV/rbiyM1oJWBOuT5GipwhQ VPBhaL8Dffka2CX5cnwawUY+Bfdtes4glfBz7joToNmDloPee6ZXEUNqtoHBojTzmdsB 1H9OUL6njKae3vrOQCmY/n9szIIfLdJHpKpXdS3dQdpREs5LDfKRLr311JGuklpZSbT5 xLL060KatXvx0wFOemzG9hEGd63Qii6MP8xII0b9TYXT9U7ZpRtnhfHCy6uJ4Kq9TPJ9 pv6TYyV/I1bDCjsWphO4XxvcaUpiR5eHoB6XTcUDvwoE3qRTMJr2YsZljjARNdpDPWZQ jLdA== 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 gc4si2975980ejc.410.2021.10.20.07.55.29; Wed, 20 Oct 2021 07:55:30 -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 5CB7368A87C; Wed, 20 Oct 2021 17:54:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8CB2C68A480 for ; Wed, 20 Oct 2021 17:54:42 +0300 (EEST) Received: by mail-pf1-f178.google.com with SMTP id 187so3176764pfc.10 for ; Wed, 20 Oct 2021 07:54:42 -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=DfWsKSDTb1FYXdBhwIX/qbib4PBt+WvIQSXFoL9lMpI=; b=iNJ5xYDSCfhMp6m0cJ1fevXvY4AA9QP5SEuZ+XN1i3uhYHxFktrUUvuXx/LDx+Yf2r 4sRwgbK4KmP2UCEKZFknggy6kxs/w7mAL4SK4YztxZclA41U9i98WbJQhdAohKIML4/O IHokTOFFB5tYuGiRgwEP0/stCaAwaMwXXKHMFTbB4p6eFPCG5al866zGRxo+avxSNXIQ 36+aQ1ic/zljV5AS2wuY6ejkfOXGMDrRWSKR2NgUAPq2POOQkakQxUlFbTX+K+f0/CRX xiVXys02WZmyGQ1UagNLqhfhJqMPqH3hVbHsYFKUkDkSTHSFqCrATpig294ZpNjn8ZOA p8eA== X-Gm-Message-State: AOAM533IBkUbuIn8kTYN7+GErRO/m1jauF7NSBxklxIiAuGQKwqPcbkB yiuKmhwnsRED2X/apfd/67CUHEmYfsQ= X-Received: by 2002:a05:6a00:2294:b0:44d:92e:1d4d with SMTP id f20-20020a056a00229400b0044d092e1d4dmr522163pfe.26.1634741680511; Wed, 20 Oct 2021 07:54:40 -0700 (PDT) Received: from localhost (76-14-89-2.sf-cable.astound.net. [76.14.89.2]) by smtp.gmail.com with ESMTPSA id g14sm2436036pgo.88.2021.10.20.07.54.38 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Oct 2021 07:54:40 -0700 (PDT) Received: by localhost (sSMTP sendmail emulation); Wed, 20 Oct 2021 07:54:32 -0700 From: pal@sandflow.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 20 Oct 2021 07:53:36 -0700 Message-Id: <20211020145336.19725-5-pal@sandflow.com> X-Mailer: git-send-email 2.33.1.windows.1 In-Reply-To: <20211020145336.19725-1-pal@sandflow.com> References: <20211020145336.19725-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: wswK0sw1MCrA 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 92610c7edc..06ed96cdea 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] @@ -3367,6 +3367,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 3d6c8ef8f5..dda2bc9a47 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -285,6 +285,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 @@ -694,6 +695,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 cbfadcb639..91cd9a4c73 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -212,6 +212,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;