From patchwork Fri Aug 27 19:34:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 29835 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1758676iov; Fri, 27 Aug 2021 12:35:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxb2nZVKWEaomwan8zGgDxIqXQI9AY/xtB24y2NCbpbDuDIt5Xy5FiUdFFpAj9XRCdaMVGR X-Received: by 2002:a50:e606:: with SMTP id y6mr11239177edm.216.1630092948739; Fri, 27 Aug 2021 12:35:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630092948; cv=none; d=google.com; s=arc-20160816; b=S9Fbc8I65VCd2U3u3Kd1I5Q8HOSrH2voi6jz7WPXG+aTBilk/JlxSgzfjabTrCKEJ2 3Mz5nmQc6uFQ0TDA6IpwXPk5SLIVNaoExWxyCmmp3Zc3Qdz0yGjzud7nmtr9p7KRAgQe caNLA9wqAtdVjV8tlAPc530tnEiDmcSFRsNxD9kxOjhGGcCzc+HDvi03LOXUGvcntP61 cagya+67aroUdTlMaJadORtMWJnstxh6LiM5nLOFiQrCBtoqv5Ces8kl6ojW8in1O6Sg 3vuO3mWSrT2du8S76OJ3er+qf5luZ5vlnn8bViqYDC3EgZp+/qP+EOI5dNHtV4P+0A2h NBvA== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=FC78oUrm7qfrfA/YlVi9ef0T9pxju4kJ4oob47hiFzI=; b=dV+OOcDeWJUbhLcoMa14gQaeQFqYQmnWF5J2NVKtRuZWxkg/2oWhlYUGMr93LE7sGQ MT59Di+k8/XgCKpSFGiQHekLEDkTwDHBcYHZ/U+NdB22mQjH/6UW3Rp/bh5H5TCMem38 /cAlYPQHcuSA2i4+ms2YMAFkbKB6lQfid53d0SEUzlAIRekNGmwKNxqKb/1NwviERqAQ RzhvdefVC2py5phxNMJHvP4IiM7/IWYQYCpBaaFKF+WOg57WImkO8JhrkSUkiOXYizNy 3FPxJyjpJ8A6kQKb7P6gcAF/tPjD8d6J4M6rCxZSjJYT5nwzJ17//vz8pGgs5buhjv3J al6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=vLlFzNu5; 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 h93si9443788edd.487.2021.08.27.12.35.47; Fri, 27 Aug 2021 12:35:48 -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=20161025 header.b=vLlFzNu5; 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 C2C9E68994A; Fri, 27 Aug 2021 22:35:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f171.google.com (mail-qk1-f171.google.com [209.85.222.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5EAFE6808FC for ; Fri, 27 Aug 2021 22:35:36 +0300 (EEST) Received: by mail-qk1-f171.google.com with SMTP id f22so8387143qkm.5 for ; Fri, 27 Aug 2021 12:35:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=OUdXGTG6GuC/q6O6fTc2yGL4aj6G7exF5O7nU8bCd9A=; b=vLlFzNu5WqIFPyBGMvEixJMMcTpIDIML/2gp4WcgbCxjQ0PzohFDc4swrsaIHOSr6t hkU7ntzUPFOlLfEWSBOfiVyakeDiaYF4x/OGfKns/rdcZQVNNoSEWmjmxVBb4Pe5I6Ag u78YycoVoNBpkK926Ffs4qCOa45QSkl/w8IS3fPE6UOWs6jziznNoJyVtSQofBTh5AeZ TxxMMKbApR1cifjyoZuqZoMP84qFdlZcoBP244rvZUxnCxmjAGO/PpOjy3NX5Rt62MFp PRl0rRjDVDhndjgy9r1k2sVwi1TLW7JYWd7NlQ2qKzO0V+tf8u/5ThLugvvTc06i38Zl b7PA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=OUdXGTG6GuC/q6O6fTc2yGL4aj6G7exF5O7nU8bCd9A=; b=gD+CJbW6+pPvJWF9SGAWeJzmyi5FmdIXSUEJKiBiMcmIxagG9iqtKU89YTnUSBacat 08mvNOiuHuxfG73bjldSb3nYuYY6njguaT21NYK2lQomyMwzNgMrzYvafmgulSFQiSh9 77os6i+L6gS0m4Jlhbb54EeSnCJ7EoYCK4DWizTH3S/3tcYC7e1doJ339rktGQuI4JkP GXs/b8CbxYn+ZWfKSaz5epbbIBw5VoauSQz9mUWO14cETENKsv1oS20bv45ktMq9owGp U0vDgceYJE98PZYHkdeYlqf6WkOvWWUuw+xQjmvIhe164eM17ObEWYPmIP114MGAQ2SH Zt8g== X-Gm-Message-State: AOAM532UdyVCM9yP3GROrPD3lwR9DPV8SUneYyN8TarrUVegxcR+fqdC CHH1JIDYIX+CJz65Yp8f/h8iGRcgvOAY9g== X-Received: by 2002:a05:620a:4f5:: with SMTP id b21mr10903345qkh.323.1630092934488; Fri, 27 Aug 2021 12:35:34 -0700 (PDT) Received: from localhost.localdomain ([181.23.91.198]) by smtp.gmail.com with ESMTPSA id c193sm5450056qkg.120.2021.08.27.12.35.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Aug 2021 12:35:34 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Aug 2021 16:34:42 -0300 Message-Id: <20210827193442.38790-1-jamrial@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avforma: add an AV1 Low overhead bitstream format muxer 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: XOKEGxbiNN/U Suggested-by: BBB Signed-off-by: James Almer --- Changelog | 1 + configure | 1 + doc/general_contents.texi | 1 + libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/rawenc.c | 20 ++++++++++++++++++++ libavformat/version.h | 4 ++-- 7 files changed, 27 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 20d71bed88..a306848ec6 100644 --- a/Changelog +++ b/Changelog @@ -12,6 +12,7 @@ version : - audio and video segment filters - Apple Graphics (SMC) encoder - hsvkey and hsvhold video filters +- AV1 Low overhead bitstream format muxer version 4.4: diff --git a/configure b/configure index 9249254b70..af410a9d11 100755 --- a/configure +++ b/configure @@ -3388,6 +3388,7 @@ mxf_opatom_muxer_select="mxf_muxer" nut_muxer_select="riffenc" nuv_demuxer_select="riffdec" obu_demuxer_select="av1_frame_merge_bsf av1_parser" +obu_muxer_select="av1_metadata_bsf" oga_muxer_select="ogg_muxer" ogg_demuxer_select="dirac_parse" ogv_muxer_select="ogg_muxer" diff --git a/doc/general_contents.texi b/doc/general_contents.texi index edc047e539..ce5fd4639d 100644 --- a/doc/general_contents.texi +++ b/doc/general_contents.texi @@ -599,6 +599,7 @@ library: @item raw NULL @tab X @tab @item raw video @tab X @tab X @item raw id RoQ @tab X @tab +@item raw OBU @tab X @tab X @item raw SBC @tab X @tab X @item raw Shorten @tab @tab X @item raw TAK @tab @tab X diff --git a/libavformat/Makefile b/libavformat/Makefile index 7e0f587b41..f7e47563da 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -379,6 +379,7 @@ OBJS-$(CONFIG_NUT_MUXER) += nutenc.o nut.o OBJS-$(CONFIG_NUV_DEMUXER) += nuv.o OBJS-$(CONFIG_AV1_DEMUXER) += av1dec.o OBJS-$(CONFIG_OBU_DEMUXER) += av1dec.o +OBJS-$(CONFIG_OBU_MUXER) += rawenc.o OBJS-$(CONFIG_OGG_DEMUXER) += oggdec.o \ oggparsecelt.o \ oggparsedirac.o \ diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 111ca3cbf0..5471f7c16f 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -305,6 +305,7 @@ extern const AVInputFormat ff_nut_demuxer; extern const AVOutputFormat ff_nut_muxer; extern const AVInputFormat ff_nuv_demuxer; extern const AVInputFormat ff_obu_demuxer; +extern const AVOutputFormat ff_obu_muxer; extern const AVOutputFormat ff_oga_muxer; extern const AVInputFormat ff_ogg_demuxer; extern const AVOutputFormat ff_ogg_muxer; diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index 088b62f369..ad29e71099 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -453,6 +453,26 @@ const AVOutputFormat ff_mpeg2video_muxer = { }; #endif +#if CONFIG_OBU_MUXER +static int obu_check_bitstream(struct AVFormatContext *s, const AVPacket *pkt) +{ + AVStream *st = s->streams[0]; + return ff_stream_add_bitstream_filter(st, "av1_metadata", "td=insert"); +} + +const AVOutputFormat ff_obu_muxer = { + .name = "obu", + .long_name = NULL_IF_CONFIG_SMALL("AV1 low overhead OBU"), + .extensions = "obu", + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_AV1, + .init = force_one_stream, + .write_packet = ff_raw_write_packet, + .check_bitstream = obu_check_bitstream, + .flags = AVFMT_NOTIMESTAMPS, +}; +#endif + #if CONFIG_RAWVIDEO_MUXER const AVOutputFormat ff_rawvideo_muxer = { .name = "rawvideo", diff --git a/libavformat/version.h b/libavformat/version.h index fc8170a3b1..13df244d97 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,8 +32,8 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 59 -#define LIBAVFORMAT_VERSION_MINOR 4 -#define LIBAVFORMAT_VERSION_MICRO 102 +#define LIBAVFORMAT_VERSION_MINOR 5 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \