From patchwork Wed Mar 2 23:22:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vignesh Venkat X-Patchwork-Id: 34588 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp80892nkx; Wed, 2 Mar 2022 15:22:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJxyLFgY5WValxOSdVa2Ze17tdWPKS2oDrgyheoXyAt//Hy+wD/UTL50hWCPZmLmz84OOSOT X-Received: by 2002:a05:6402:1112:b0:413:3d99:f2d7 with SMTP id u18-20020a056402111200b004133d99f2d7mr31305061edv.23.1646263345218; Wed, 02 Mar 2022 15:22:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646263345; cv=none; d=google.com; s=arc-20160816; b=yN6r80nKOEGHlE87fKKo92x0UmKKN+6iU/NEjOAKpHOEDLM8inY3FRkEGbsNc5KQq8 bjAFLgYmmc7InNe+aBRzulv2KWf2qWhF6SZa0umkJ1T+/GGfToOhNao0AOBaupMfzCKN rLRuDgXCNXytuGdchlmIciP6ltuz1c3n5IsgtP+1S8fqbhitJ2ojUNFilQmAZWElsyzr +mwZ3lGwAy/tVtcK+LoL8ytkunPrnGPM4alq7YhvIyZiuTnVRSIFU6KJROnhFvPZx4RW SAmY08c2H0hLf+ZnKovyCs0Quh4GWAa1ZOE1ty5j/+cxaRiXeWKfzoSwyicwxgkDy4s+ iyaA== 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=K2qIy3qcSuucEbkxumgC83Le+BfTXVJQxSJjnddPC2Y=; b=B8iG2dgHyabTUogkAVwG+6z25mXZCdH0gCiu/4hHsSs/rf7xemJ+7lyiHO4UEkREej twJ4YiVcoDfRSRTIVbVFdevwd5Uw1PNYA2GqFXbLe9PA1cfh6GNm4RJgC7C8N4XQucAJ 80eCJ6+5D3he/97GHOjRJWwq817hKKBWsYFB5F2AdJfAImGVFIkaoEJJTD1LApC0DVTp 0j+AM+aBDcqXZBy1g+VpVUggL7iVzsk5vCYrVR9WzuuZA8qO/5YajCzthmp9OYyk1jnY T2eRxnnkR68OrNelWN9aKGDZram9lx9H7QMa/Xo7UA3A4/QqI6BbMEEejZmLzuhkv75n 2mdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20210112 header.b=ljFcf0zm; 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 c16-20020a17090603d000b006d20ace2e8esi309875eja.772.2022.03.02.15.22.24; Wed, 02 Mar 2022 15:22:25 -0800 (PST) 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=ljFcf0zm; 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 B6DE668B2E1; Thu, 3 Mar 2022 01:22:20 +0200 (EET) 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 606AB68B347 for ; Thu, 3 Mar 2022 01:22:13 +0200 (EET) Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-2d07ae11467so26540057b3.12 for ; Wed, 02 Mar 2022 15:22:13 -0800 (PST) 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=HNwYmETabxWqPaYDTnKqObBwtT1UcbtkX/653zBJIWY=; b=ljFcf0zm/7mYac98FX9HZe0KoRiEh6bidE6OB5ciFH5YVnXa3cvQuy1z3K755rcKR1 3U3wtfpeiknvBSK8Zjk6S+1/XbL40Xzw/ENhrMjyEmLe0h5NjZU0o82YBw6zBunEoTzS IDBjQt5YBN+BRBxcmDrvMmpuMaxNkncF6xNSyPttsC1+sFHdX/tBh5OG19j/p2YXV43r S91QWwDZpyaqwGiY02KPd9kpeh/ypFK2AydYikBDM+qbxyUN/6SfgQ6Bmp2NbWpjr33b zQN9x7k/zHIlTcV6t/zdMIZV4UqzDFC7sS85TOhw24IOg5OM/5O0d77j/mdt4Vb2aKB9 XfiQ== 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=HNwYmETabxWqPaYDTnKqObBwtT1UcbtkX/653zBJIWY=; b=VU1yTbUHzZ4RfoDYQZaX58DegniInHMUlPZepC9KknHl/qr+Ur/e1AtVZpMekGjG+i Z9O/Sogvqh3KSby8nMBqGLTLpN1GDmQnn/oJ/c6sOF4ggD1NdrLvnREaLYj+iZMFvEWe gPZVb/b6Jjtf46LUfwxZZdzDmP54RrELXF27y6o65x6xhNoj2fcMKMXACWHHYAKQwaIm tifexbHySuU93lP3GScRm8EeKDGcpSNN9pm3oOo43jT3M2/Slktui7zj5SFCXxqNXFpY 6PKp1kgRbgH4hfVr0DL5W+Ml6/utsXVWd7O4bAZ06UoIdvn7dxLuIXQqbpLFy5WNQjPv 99vQ== X-Gm-Message-State: AOAM530rql462Glcva5LU54O+1m10JKqFMcd1tvrNCSAhUfBgKcjXyli W0F2yxx2CRUTgHBABvP+UCYlS/I3K481FZEAnNNwgBTkcD5xsnk9mqyVYB1mYpzWo6/zX7JEgdx KlmCV4kDOsaVAU4XlulQdsCatFBw6EN2rkeHk36OdlWM2+M57raoMfmpwIU591yL2rub6 X-Received: from vigneshv3.mtv.corp.google.com ([2620:0:1000:2511:2118:4136:e483:c648]) (user=vigneshv job=sendgmr) by 2002:a81:410c:0:b0:2d0:c3ba:c799 with SMTP id o12-20020a81410c000000b002d0c3bac799mr32656376ywa.193.1646263331593; Wed, 02 Mar 2022 15:22:11 -0800 (PST) Date: Wed, 2 Mar 2022 15:22:04 -0800 In-Reply-To: <97b0c7e3-c333-2e0a-35e0-704ae4c59000@gmail.com> Message-Id: <20220302232204.1631547-1-vigneshv@google.com> Mime-Version: 1.0 References: <97b0c7e3-c333-2e0a-35e0-704ae4c59000@gmail.com> X-Mailer: git-send-email 2.35.1.616.g0bdcbb4464-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: PDEPThsxcS9m 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 7caea0c377..e7c3056524 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 38d9485288..5061961283 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1087,7 +1087,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; @@ -2663,7 +2663,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 4c868919ae..1a746a67fd 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1303,7 +1303,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); }