From patchwork Mon Mar 28 20:48:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vignesh Venkat X-Patchwork-Id: 35032 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp527406pzb; Mon, 28 Mar 2022 13:48:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxOV4PUbU+EL1PX9AlHmN69TPdJwP5oDF+fc4a9rd8jIx0ZLHeia8g9OkC4lou95KPU5FQZ X-Received: by 2002:a17:906:5804:b0:6ce:3f17:bf35 with SMTP id m4-20020a170906580400b006ce3f17bf35mr29810079ejq.346.1648500527217; Mon, 28 Mar 2022 13:48:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648500527; cv=none; d=google.com; s=arc-20160816; b=oiW0cLYFFLcOysvHX7Rej6tl0Vfkbf7xrr4KSWvnRbxsYBLqvoBYUGEN0mrg/wKuYt u4hjyYoWXHtSbq+KUpeMFhMjUkjqaweqN8sIOvO6O/BImy/72pgi9ynZrHgKqy33cwqX SxHRNfewyOWxH8xFr+CPsG8/7s1MMjr7JZSHV2Qeuv3O83sKWtv7uNEAoQc7LAiigeio ZY1W+IPyHMKTpP5FywW7oQPWPBRpTHrxMM1a+HQigIPGz0wtnY16Zy4kzIZUperAVE6C B08mroh56tDIfXhH9a5iOqvuyhvMvUGv2ZTKDBRtTrWaemBHcAydVYG10OM07URzl3XX bxSQ== 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:to:from:references:mime-version :message-id:in-reply-to:date:dkim-signature:delivered-to; bh=Q/6NrmrAfn1yJWqmO0rtohWNVZ9cTJ6+Ie7jYaboHWE=; b=EwwlyMDCVIu1kL9IR19DBndjz99bx48U7y/2Luo2+A42Lo5D1yPUUdCHh/mudfUEDG lnvvKbqyFsbgsRmfZVO9sumhmWv+VQHEEKjg8c4MHNOsivviRlOBOLLigy9stnLjPI7F yXUAIDGVgCyTX6tawG8URkpgUoxuKyReXiIm73kWIdSQYh6P/zTBKsr5Yfl8gksond7z 6yogtMPQBl3UhKJXAgzbrxDp+qXmVc6dSl1sQ5SCebSdVUomDBFssPNDYIMKXcz2i7Hy smd22HKBS5gW0lzsKb9Z/Obmo1IWa0wFaBW3CBLNY7HR5qEhVKzA2aO11Z25mR6App16 9kKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20210112 header.b=OKmdaAot; 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 my22-20020a1709065a5600b006e1124be7c4si4277075ejc.160.2022.03.28.13.48.46; Mon, 28 Mar 2022 13:48:47 -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=@google.com header.s=20210112 header.b=OKmdaAot; 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 E89CB68B2DD; Mon, 28 Mar 2022 23:48:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B811268B214 for ; Mon, 28 Mar 2022 23:48:37 +0300 (EEST) Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-2e689dfe112so127814697b3.20 for ; Mon, 28 Mar 2022 13:48:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=LbtkaM1GSBcAVsLj5pMb8pLjI3PZPMVSFPy/pup2Of4=; b=OKmdaAot51jjvuycR/A3NHOGhrTpli3IvPlJh21aGEtJPZa5ILyzABwmgkz3hgc9FI NFwuDe8Tey02kFhPsibNh+Ie/CxECPPGxfrW3X68Kj4r/uGik5D1fd293OqBorrWUXGB Qx6WtkEbmXhMQLvFZQpzyUekC/Nec5XKL6F6jeGpjnagubOFt9JJqbdbl95MJfqPUgJu XkhKMMmom3JvVS6XMkPjAusDcYRMV3YuYXUKIknzkqNaft7ZZ1Olec3d4+tfbzg2Zgmk H2zD/2AFpaAFSlTzlF6WsN+rNoODq1u9MxTvRkU/NheOwnMH8r7vbMAIXAEMInlxTM+D ygqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=LbtkaM1GSBcAVsLj5pMb8pLjI3PZPMVSFPy/pup2Of4=; b=E4CAd2VU/S17m82lV1asBztKt6Uwbagy4ovSvIzTn3ouvH/AuTt5kmNfN1XFQptQgp Bf7Cht5vP+2g2EA2Dk3UqOvv77LAIk7o8TFXKUBR7yR5UIfHj3weHWzjiFCmRE09uGrm 5VCD0SonTExC3cpo3soDfHojbSFU9eeWH3lYaj5Mm3lSJtsbYIwMBLGJ4ZxVlM5V1nOp Gnqs2tPlp2lavpfpRV41l3oT6gy6kJm/Mywlp2oNeVAcBy/QJGvagz3Ezo2X/zQTs9oM dFYzU+rmrC38QNrdaK++NwqiGrmdeOQHTf39Zp5ifZOq2HAGHGhFNzCrPengVXDk2hJi wbXw== X-Gm-Message-State: AOAM530BGnICDIYok0sz1g/94Rm2PgWdAKO0pQ40jGzg8fNWZSoBZVvt Dhq+IOU4iWIqVdircu97GoknXMCPcV/4uASxihCioeaMucehEWRhoLbodbh+P8C7k/l0j8N1rQA u+kb7csdeRg9jz8dSSKAypzUvPd0j0689+wy5hZA/G2EV+la+cW0mVRGKoWon6OHwzaoo X-Received: from vigneshv3.mtv.corp.google.com ([2620:0:1000:2511:228a:277d:bb24:94ea]) (user=vigneshv job=sendgmr) by 2002:a0d:ca0a:0:b0:2e5:ad11:1fff with SMTP id m10-20020a0dca0a000000b002e5ad111fffmr26932127ywd.395.1648500516469; Mon, 28 Mar 2022 13:48:36 -0700 (PDT) Date: Mon, 28 Mar 2022 13:48:33 -0700 In-Reply-To: <431afea2-ce1e-4c94-8ed2-2ee8ff33cd50@gmail.com> Message-Id: <20220328204833.3342663-1-vigneshv@google.com> Mime-Version: 1.0 References: <431afea2-ce1e-4c94-8ed2-2ee8ff33cd50@gmail.com> X-Mailer: git-send-email 2.35.1.1021.g381101b075-goog From: Vignesh Venkatasubramanian To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 2/3] avformat/av1: Add a parameter to av1c to omit seq header 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: Vignesh Venkatasubramanian Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: wCZTTnbllmMe Add a parameter to omit seq header when generating the av1C atom. For now, this does not change any behavior. This will be used by a follow-up patch to add AVIF support. Signed-off-by: Vignesh Venkatasubramanian --- libavformat/av1.c | 7 +++++-- libavformat/av1.h | 4 +++- libavformat/matroskaenc.c | 4 ++-- libavformat/movenc.c | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/libavformat/av1.c b/libavformat/av1.c index 79065d0c9f..b6eaf50627 100644 --- a/libavformat/av1.c +++ b/libavformat/av1.c @@ -395,7 +395,8 @@ int ff_av1_parse_seq_header(AV1SequenceParameters *seq, const uint8_t *buf, int return is_av1c ? 0 : AVERROR_INVALIDDATA; } -int ff_isom_write_av1c(AVIOContext *pb, const uint8_t *buf, int size) +int ff_isom_write_av1c(AVIOContext *pb, const uint8_t *buf, int size, + int write_seq_header) { AVIOContext *meta_pb; AV1SequenceParameters seq_params; @@ -485,7 +486,9 @@ int ff_isom_write_av1c(AVIOContext *pb, const uint8_t *buf, int size) flush_put_bits(&pbc); avio_write(pb, header, sizeof(header)); - avio_write(pb, seq, seq_size); + if (write_seq_header) { + avio_write(pb, seq, seq_size); + } meta_size = avio_get_dyn_buf(meta_pb, &meta); if (meta_size) diff --git a/libavformat/av1.h b/libavformat/av1.h index f57dabe986..a393fbb78f 100644 --- a/libavformat/av1.h +++ b/libavformat/av1.h @@ -96,9 +96,11 @@ int ff_av1_parse_seq_header(AV1SequenceParameters *seq, const uint8_t *buf, int * @param pb pointer to the AVIOContext where the av1C box shall be written * @param buf input data buffer * @param size size in bytes of the input data buffer + * @param write_seq_header If 1, Sequence Header OBU will be written inside the + * av1C box. Otherwise, Sequence Header OBU will be omitted. * * @return >= 0 in case of success, a negative AVERROR code in case of failure */ -int ff_isom_write_av1c(AVIOContext *pb, const uint8_t *buf, int size); +int ff_isom_write_av1c(AVIOContext *pb, const uint8_t *buf, int size, int write_seq_header); #endif /* AVFORMAT_AV1_H */ diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 3b8ca11f28..d789a618a4 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1089,7 +1089,7 @@ static int mkv_write_native_codecprivate(AVFormatContext *s, AVIOContext *pb, case AV_CODEC_ID_AV1: if (par->extradata_size) return ff_isom_write_av1c(dyn_cp, par->extradata, - par->extradata_size); + par->extradata_size, 1); else put_ebml_void(pb, 4 + 3); break; @@ -2665,7 +2665,7 @@ static int mkv_check_new_extra_data(AVFormatContext *s, const AVPacket *pkt) ret = avio_open_dyn_buf(&dyn_cp); if (ret < 0) return ret; - ff_isom_write_av1c(dyn_cp, side_data, side_data_size); + ff_isom_write_av1c(dyn_cp, side_data, side_data_size, 1); codecpriv_size = avio_get_dyn_buf(dyn_cp, &codecpriv); if ((ret = dyn_cp->error) < 0 || !codecpriv_size && (ret = AVERROR_INVALIDDATA)) { diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 46d66c29c2..70ceb0dea4 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1306,7 +1306,7 @@ static int mov_write_av1c_tag(AVIOContext *pb, MOVTrack *track) avio_wb32(pb, 0); ffio_wfourcc(pb, "av1C"); - ff_isom_write_av1c(pb, track->vos_data, track->vos_len); + ff_isom_write_av1c(pb, track->vos_data, track->vos_len, 1); return update_size(pb, pos); }