From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 7451E4083B for ; Wed, 2 Mar 2022 22:57:36 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8592568B387; Thu, 3 Mar 2022 00:57:32 +0200 (EET) Received: from mail-oi1-f169.google.com (mail-oi1-f169.google.com [209.85.167.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E7DD968B381 for ; Thu, 3 Mar 2022 00:57:26 +0200 (EET) Received: by mail-oi1-f169.google.com with SMTP id p15so3206800oip.3 for ; Wed, 02 Mar 2022 14:57:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :references:from:in-reply-to:content-transfer-encoding; bh=I2y2fMmbWaAVrRT22gX/z0b9jPlu+Z1rkZv8mSJBO1Y=; b=HhisagvpxewI6WGFitMB6xV6naB4kF2udN47Ydh/iJV66tlpWGAvTq2FH2n+vj8jBD LaGrvbqfSIqd0/ySTZ164DRavEY7ywzGQhRyhoHJNqVv3BH9HsRSyDqEROU5TJ4cE+GP 8BrH5HK1jYmRmKmreWuaIvk90iCUhMD11MWtfpErqEi7t5sQXd+b9+rbUIu3pD67dUMW v57pdgelgH70rLgj0+HOF5URbp3VWDYD4DupUqLVW/S0WPyvhc32MFfuDOuE2EQCFcPF jUDooEyoA4bGS8l87JMM8PZj7UeqZ6v+sEGVydnY8x3pTkIRWPz6vUtP86m/vB9JNniz xeIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=I2y2fMmbWaAVrRT22gX/z0b9jPlu+Z1rkZv8mSJBO1Y=; b=m/6Oh/ICumDr+2fV4/qpdrRY94QRXQY0h4zlKuyCYvu/BwDrP6hn8KS/bLCQHmvQ3r C02q01sCbUgso5uSuJgHEgvD+IZHyxRONsFHQaYOcO2b9KHR5zTMOAK7VAihTtjL9MKR njwL2uoyOqNt3YKKLLP984W4nw3c6/DxZs68RYb36otpdCkyEcXPprZ0VymUTDAKIhak I0lcEVzJBpTByPU4Fub2aMrnG40jQfqGm3c08mBSqGuz9LP9iPGKObA/SbePt6TZ4GnR VC/O0T/LAXf7vAYLUGEeCdeeNs6bvc9CAcAHo0ssNZbHg5lMbd9cf1ok5r98XfBeETyC I8SQ== X-Gm-Message-State: AOAM53349YdbTvSWazvmFPpuiKbB2pIvsM/3rN4r58Q/UuLoJkFUIypZ dlqiHEfRpg4A8w0bZuk9Gg+95k+Hnro1eQ== X-Google-Smtp-Source: ABdhPJxD1ERYrzTe3XBY3ibaTa7laLujoHXKHLrco51BXt5Tin+k3Q8KPpXvePLp4ELy6zWLHCaxeA== X-Received: by 2002:a05:6808:e8e:b0:2ce:27e4:3b97 with SMTP id k14-20020a0568080e8e00b002ce27e43b97mr2047047oil.54.1646261844780; Wed, 02 Mar 2022 14:57:24 -0800 (PST) Received: from [192.168.0.10] ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id l7-20020a9d4c07000000b005afa8981a42sm150553otf.8.2022.03.02.14.57.23 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 02 Mar 2022 14:57:23 -0800 (PST) Message-ID: <97b0c7e3-c333-2e0a-35e0-704ae4c59000@gmail.com> Date: Wed, 2 Mar 2022 19:57:21 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220217055117.3233501-1-vigneshv@google.com> <20220217055117.3233501-2-vigneshv@google.com> From: James Almer In-Reply-To: <20220217055117.3233501-2-vigneshv@google.com> Subject: Re: [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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 2/17/2022 2:51 AM, Vignesh Venkatasubramanian wrote: > 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 1fcfac2356..95ca7cc47f 100644 > --- a/libavformat/av1.c > +++ b/libavformat/av1.c > @@ -361,7 +361,8 @@ int ff_av1_parse_seq_header(AV1SequenceParameters *seq, const uint8_t *buf, int > return 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; > @@ -451,7 +452,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); > } > This patch no longer applies. _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".