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 8D414432FA for ; Tue, 31 May 2022 19:12:01 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 187F568B6DC; Tue, 31 May 2022 22:11:59 +0300 (EEST) Received: from mail-yb1-f176.google.com (mail-yb1-f176.google.com [209.85.219.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7B5AF68B5ED for ; Tue, 31 May 2022 22:11:53 +0300 (EEST) Received: by mail-yb1-f176.google.com with SMTP id a64so15297685ybg.11 for ; Tue, 31 May 2022 12:11:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=xBJvtpd2BmYXqPe1aVa9A+StBgOxmlSKPdseVd+xi7g=; b=lKNcW2uuhZbd4TimGJzTVenh8nB3zFADjLLdyAe7+D9amuikF9SdSxZuoBfkWfVHl+ E4bgNRX6u1I6MeY9cf9HV8CynEXsp2juTskveYUWwY4GNbDhh8OofJWgQJg86d7PtQDP BT5Q5Q3HsnFLZ09djF+XCbHnLPp2QlRCQt3xQicHhEQKEEaMgQ6pKOmk951pG+FeRB+Z 3R5twCnjsD/tLABtvXdN4dCyjRjiIQzwLJ6OSdOfb0PA7OopY+16U3yzN66JNJCaxcP4 WfqY8mv9xjBGse5PvvoiUZUxLC+pxeTmi6Xie0G5RJDKj7AvdbNHRwGljO8Ap2DgyJiM r26Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=xBJvtpd2BmYXqPe1aVa9A+StBgOxmlSKPdseVd+xi7g=; b=3MmtV/NConpdEExeGpCzwvmAI1v71sBsjmq2HZ/uLjtdSS1Uh6sKTLRG36INzjJ0X3 BfnVVCabXRzlQUfWbSH0nUS4kyMqIvzaKHNyvfs31fnyMb56V2CxWPOI3+tEaQpnZEMw XPjCf9tV3E8gocU5lY9wVi4WhBRgtn4PofZvMnj1zggiG0Tes7W8XQpvUUyhINGmZMHE SmWL1kgq/3mf8aBQoIqqRsoonMA0Nc17W2wJjdk8bivxBOS20Wb4QgnQTm1eLSnwSXmv Jclxxg6PvguWJj9mRbrhXdz03u7w8BTlmoy9jjV/Lftna/kzV34/ny8y9WbPcezWz3Ri BjLg== X-Gm-Message-State: AOAM532lfZRG6ZFzZIW9CW+e8PUoXFGmShv/IAU2iWd2koJYssnki96V TvUWt8X8hskAvztKpQRzG+QUgF0UVtkSaG04Q9d9yUnQm/s= X-Google-Smtp-Source: ABdhPJx9phF8blGI1z0XJ4bmbBXztISpadCfuhWh0AXIZrhCUCAtabKnh5WXMNso3mEN0+QhV+ELzSDT84s4HgKp/io= X-Received: by 2002:a25:6b09:0:b0:65d:1219:5e32 with SMTP id g9-20020a256b09000000b0065d12195e32mr8459199ybc.233.1654024310968; Tue, 31 May 2022 12:11:50 -0700 (PDT) MIME-Version: 1.0 References: <20220516165912.3731545-1-vigneshv@google.com> In-Reply-To: From: Vignesh Venkatasubramanian Date: Tue, 31 May 2022 12:11:39 -0700 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH] avformat/mov: Only read the primary item for AVIF 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Thu, May 19, 2022 at 9:13 AM Vignesh Venkatasubramanian wrote: > > On Mon, May 16, 2022 at 9:59 AM Vignesh Venkatasubramanian > wrote: > > > > Update the still AVIF parser to only read the primary item. With this > > patch, AVIF still images with exif/icc/alpha channel will no longer > > fail to parse. > > > > For example, this patch enables parsing of files in: > > https://github.com/AOMediaCodec/av1-avif/tree/master/testFiles/Microsoft > > > > Partially fixes trac ticket #7621 > > > > Signed-off-by: Vignesh Venkatasubramanian > > --- > > libavformat/isom.h | 1 + > > libavformat/mov.c | 41 +++++++++++++++++++++-------------------- > > 2 files changed, 22 insertions(+), 20 deletions(-) > > > > diff --git a/libavformat/isom.h b/libavformat/isom.h > > index cf36f04d5b..f05c2d9c28 100644 > > --- a/libavformat/isom.h > > +++ b/libavformat/isom.h > > @@ -317,6 +317,7 @@ typedef struct MOVContext { > > uint32_t mfra_size; > > uint32_t max_stts_delta; > > int is_still_picture_avif; > > + int primary_item_id; > > } MOVContext; > > > > int ff_mp4_read_descr_len(AVIOContext *pb); > > diff --git a/libavformat/mov.c b/libavformat/mov.c > > index d7be593a86..9310a393fe 100644 > > --- a/libavformat/mov.c > > +++ b/libavformat/mov.c > > @@ -7445,6 +7445,13 @@ static int rb_size(AVIOContext *pb, uint64_t* value, int size) > > return size; > > } > > > > +static int mov_read_pitm(MOVContext *c, AVIOContext *pb, MOVAtom atom) > > +{ > > + avio_rb32(pb); // version & flags. > > + c->primary_item_id = avio_rb16(pb); > > + return atom.size; > > +} > > + > > static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) > > { > > int version, offset_size, length_size, base_offset_size, index_size; > > @@ -7501,34 +7508,25 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) > > return AVERROR_PATCHWELCOME; > > } > > item_count = (version < 2) ? avio_rb16(pb) : avio_rb32(pb); > > - if (item_count > 1) { > > - // For still AVIF images, we only support one item. Second item will > > - // generally be found for AVIF images with alpha channel. We don't > > - // support them as of now. > > - av_log(c->fc, AV_LOG_ERROR, "iloc: item_count > 1 not supported.\n"); > > - return AVERROR_PATCHWELCOME; > > - } > > > > // Populate the necessary fields used by mov_build_index. > > - sc->stsc_count = item_count; > > - sc->stsc_data = av_malloc_array(item_count, sizeof(*sc->stsc_data)); > > + sc->stsc_count = 1; > > + sc->stsc_data = av_malloc_array(1, sizeof(*sc->stsc_data)); > > if (!sc->stsc_data) > > return AVERROR(ENOMEM); > > sc->stsc_data[0].first = 1; > > sc->stsc_data[0].count = 1; > > sc->stsc_data[0].id = 1; > > - sc->chunk_count = item_count; > > - sc->chunk_offsets = > > - av_malloc_array(item_count, sizeof(*sc->chunk_offsets)); > > + sc->chunk_count = 1; > > + sc->chunk_offsets = av_malloc_array(1, sizeof(*sc->chunk_offsets)); > > if (!sc->chunk_offsets) > > return AVERROR(ENOMEM); > > - sc->sample_count = item_count; > > - sc->sample_sizes = > > - av_malloc_array(item_count, sizeof(*sc->sample_sizes)); > > + sc->sample_count = 1; > > + sc->sample_sizes = av_malloc_array(1, sizeof(*sc->sample_sizes)); > > if (!sc->sample_sizes) > > return AVERROR(ENOMEM); > > - sc->stts_count = item_count; > > - sc->stts_data = av_malloc_array(item_count, sizeof(*sc->stts_data)); > > + sc->stts_count = 1; > > + sc->stts_data = av_malloc_array(1, sizeof(*sc->stts_data)); > > if (!sc->stts_data) > > return AVERROR(ENOMEM); > > sc->stts_data[0].count = 1; > > @@ -7536,7 +7534,7 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) > > sc->stts_data[0].duration = 0; > > > > for (int i = 0; i < item_count; i++) { > > - (version < 2) ? avio_rb16(pb) : avio_rb32(pb); // item_id; > > + int item_id = (version < 2) ? avio_rb16(pb) : avio_rb32(pb); > > if (version > 0) > > avio_rb16(pb); // construction_method. > > avio_rb16(pb); // data_reference_index. > > @@ -7552,8 +7550,10 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) > > if (rb_size(pb, &extent_offset, offset_size) < 0 || > > rb_size(pb, &extent_length, length_size) < 0) > > return AVERROR_INVALIDDATA; > > - sc->sample_sizes[0] = extent_length; > > - sc->chunk_offsets[0] = base_offset + extent_offset; > > + if (item_id == c->primary_item_id) { > > + sc->sample_sizes[0] = extent_length; > > + sc->chunk_offsets[0] = base_offset + extent_offset; > > + } > > } > > } > > > > @@ -7670,6 +7670,7 @@ static const MOVParseTableEntry mov_default_parse_table[] = { > > { MKTAG('S','A','3','D'), mov_read_SA3D }, /* ambisonic audio box */ > > { MKTAG('S','A','N','D'), mov_read_SAND }, /* non diegetic audio box */ > > { MKTAG('i','l','o','c'), mov_read_iloc }, > > +{ MKTAG('p','i','t','m'), mov_read_pitm }, > > { 0, NULL } > > }; > > > > -- > > 2.36.0.550.gb090851708-goog > > > > Any comments on this one? If not, can this be merged please? > Another ping on this please? > -- > Vignesh -- Vignesh _______________________________________________ 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".