From patchwork Wed Sep 29 20:47:51 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: 30664 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp753162iob; Wed, 29 Sep 2021 13:49:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwV4zGczLDJ/7wOWs05chdwCiNoj3R80DDsSM5utQ0VC7i5ivVfDEx7Pv4FI+7/66THy9ul X-Received: by 2002:a05:6402:3088:: with SMTP id de8mr2520811edb.76.1632948568318; Wed, 29 Sep 2021 13:49:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632948568; cv=none; d=google.com; s=arc-20160816; b=jY9hc8F85UT12B9IQs8l0rgaW8TDvGPiile04OzE04/8vnz4qfasg/VIFg12Y0zl52 MEwNoC3HAMzuvZ0j7OsAtQruUf8lpPHR2xMBsyoTYkp78GW2oGMN9pyqIkA3ADitP6LP I7rjiOk4kiYnxniBwq5XINyqGL1YayYcoAR/gENraoade4lVReXvMUmosra8F8mjqlVE lTQMf6On8ia2i9DS2+5avuweweLS9qDm00VO/z03Zn7GzeAAF1BH1pQdSFFo3mQcVI7P 6sNQY2i2FR7QGOJjhe2xBm4QI9HNTlWTDmc1AdlOcg5zVx+f4SdOXRKUsp9YLjGJJ445 pG3A== 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=k99Czz3bAmGFVNd1pS0vd2VqczzoxEhIC8XwIJeCkKc=; b=oc5xLEYPdhKM+1Y9aRi6Cve8uM+iYXDxBg4s8P40QjIWSctrMmon4opGZ6xO+oWiCf 75/7sV+A537tkSsZ4Ol78W4h4YLUWq05Gb+fdYQjSGMd+4w2Xj1pdxPTncLGdnDO4NnV TJo3a6zg9LQT+hUxXv7F7NJgNwe4vXqJs1Oq1oLsegTsAWSu/PX5b4WzwQ80xGo7dYES 0AVuwJ/YMijLLK6d9xc6Rp1gfw1dsubJVTS+r23Wf8uKyutSMAYXLLCEnSGdkqxgn8h+ L4vfgEfLM6QlaRMiOwZAOjOpJUBSi69DM4c0quhQbcIo4xkEBKEc22RgxB2qNrWVU0ZE VEIQ== 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 bx16si1111242ejb.146.2021.09.29.13.49.27; Wed, 29 Sep 2021 13:49:28 -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 EB84F68A5BE; Wed, 29 Sep 2021 23:48:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 11B4168A5AC for ; Wed, 29 Sep 2021 23:48:49 +0300 (EEST) Received: by mail-pg1-f179.google.com with SMTP id a73so1015495pge.0 for ; Wed, 29 Sep 2021 13:48:49 -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=rlSdpYtgFa8jFFpkM5sltjq8/RoPltlBPKDVN5h1t1M=; b=5HhphslydoVUBGwLJWLUlVH4J5MafaknMAImWGAvYCje8MvQxJfV0OmQZYKz6uwhr6 r4LfFN2T6l55uk9a/VcvuxMIpMrClcejSKJy8Vb4Oujhxjd64KmidAXH/XpHKZQ2c/Su S9zoeuF4fb5nW5ydbLo7+pBqwJ8Lxt/X/PnXHHOoX7qVrNI6CFaSenvwnQSe9y8BVwLu 02Ad0+MYUynYrEIGzzjjHCzjRyFJoZ7f8lm2Tzibm7lrf3c3ohBfzzEoeklD8N1o+VPZ 8vlcWjqNoxoIUgythfMkCSWc31goZk9urTalTLhlCQ3FjqFQBf+a9THOPYMKBnvxUIvO LJgA== X-Gm-Message-State: AOAM533Fz/tpPn8YwR1JlG4aPJ9TjmT5RiNM+OsSRIDeMriZhTl61JuB DgxHxuoKZxBJ18K/jTRPnok2PeLzBkA= X-Received: by 2002:a63:e741:: with SMTP id j1mr1692285pgk.86.1632948527788; Wed, 29 Sep 2021 13:48:47 -0700 (PDT) Received: from localhost (76-14-89-2.sf-cable.astound.net. [76.14.89.2]) by smtp.gmail.com with ESMTPSA id q15sm657718pfl.18.2021.09.29.13.48.46 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 29 Sep 2021 13:48:47 -0700 (PDT) Received: by localhost (sSMTP sendmail emulation); Wed, 29 Sep 2021 13:48:33 -0700 From: pal@sandflow.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 Sep 2021 13:47:51 -0700 Message-Id: <20210929204751.6320-5-pal@sandflow.com> X-Mailer: git-send-email 2.32.0.windows.2 In-Reply-To: <20210929204751.6320-1-pal@sandflow.com> References: <20210929204751.6320-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: HCENDyX1dquK 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;