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 4F1814084A for ; Wed, 2 Mar 2022 23:27:31 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C5EDC68B37E; Thu, 3 Mar 2022 01:27:29 +0200 (EET) Received: from mail-oi1-f182.google.com (mail-oi1-f182.google.com [209.85.167.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BADA768B109 for ; Thu, 3 Mar 2022 01:27:23 +0200 (EET) Received: by mail-oi1-f182.google.com with SMTP id ay7so3238300oib.8 for ; Wed, 02 Mar 2022 15:27:23 -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=CP6b3VT902XQg83OE9TsxP3AKjh/PLtAFw2LhykPHUw=; b=LPtn59ZoDdRxJnSwwOKfZO2VUQb2ABF+nvNLGnrIfFvdva2GV/OIUgaK2G3CH2rwuR JHnaYjfrMBUQws97HX8LQ/GN5qHNRIG/N7WzZj2luuyJlmxGAnxuTPuLhR+lpZo9Po4K 0bLR3rAAAG31fYi6lhUOHCw3rJCHoSYrFiheS4zr+nYgyULkpgeu5T7nyt1n7IRcc6P3 Wzmta1mlWIkguFL1SQmVli3WCmyCtthfP3wsqGT7DKczpU/m1RRzAs4mqO+3RQNLNtce pHAWvN9zvGABD9SYIEQ3llYUhwd4h+pAVJeY5QeOsdLJsuEmv8mAWPq+ya8sme6HIseh gCcw== 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=CP6b3VT902XQg83OE9TsxP3AKjh/PLtAFw2LhykPHUw=; b=2DF7J137HIDXrsBOJ4LsXVv4dw/Sidr1wzbpBSOpOce+LraCUCFdpwe81ZLUcH23b6 7PvnmExE6q5EKFq0IfHuwEi12WiQYX+UXdJ1qGGNzvWWPOarW6RVSKAuVTazelxMtO/d ShUY/efpvid/GTXBMnoCgfeiebJlkb5RmqtdaHsYsp/C5GjMM/EmCC+f4Kbe4Ay9/VQ3 QwaXcBlnGah/M7F6QtALDASSGb8H5ouTRGSNTxMyO8pQxDfNH4pJS5X/sogB+QpouiZI pCMZrlAS/OOnD0K72/q78eMAndi74hqX1b9uZ3jHPlugrjfqAyFAZM+aop2nzJLcRPVh 8k9Q== X-Gm-Message-State: AOAM530USMmmrIG/PAUtK6oixh5GdmAuOswyPAO7vtqW32lDd2qG4Ysm Qy1YqQkNJH5rtqIyt6mJiS+Pz3rR69jWqA== X-Google-Smtp-Source: ABdhPJxOf/2zVyLtwJZCqaDfdV0OpY2PsvGZUK/3iqyNiETBq4A+8RRIvylS9RugVBp73eKe9uleRQ== X-Received: by 2002:a05:6808:10c8:b0:2d4:a070:d20b with SMTP id s8-20020a05680810c800b002d4a070d20bmr2159482ois.88.1646263641662; Wed, 02 Mar 2022 15:27:21 -0800 (PST) Received: from [192.168.0.10] ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id p16-20020a05680811d000b002d72ec3a921sm196462oiv.21.2022.03.02.15.27.20 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 02 Mar 2022 15:27:21 -0800 (PST) Message-ID: <431afea2-ce1e-4c94-8ed2-2ee8ff33cd50@gmail.com> Date: Wed, 2 Mar 2022 20:27:19 -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> <97b0c7e3-c333-2e0a-35e0-704ae4c59000@gmail.com> From: James Almer In-Reply-To: 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 3/2/2022 8:23 PM, Vignesh Venkatasubramanian wrote: > On Wed, Mar 2, 2022 at 2:57 PM James Almer wrote: >> >> 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. > > I have generated a new patch after sync'ing to the latest master. I > did not notice any conflicts. Can you please check if the updated > patch applies? The new one does, yes. Thanks. > >> _______________________________________________ >> 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". > > > _______________________________________________ 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".