From patchwork Mon May 16 16:59:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vignesh Venkat X-Patchwork-Id: 35790 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp1635368pzb; Mon, 16 May 2022 09:59:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxP5TVxhIN/vd3shMiv0e0h/ak+osAxX4t3sragCoRPPjhFdBY10RA+EwPZ4Bq4ISKTV5mH X-Received: by 2002:a17:906:2cc8:b0:6fd:d8d8:b8f3 with SMTP id r8-20020a1709062cc800b006fdd8d8b8f3mr16205037ejr.384.1652720373844; Mon, 16 May 2022 09:59:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652720373; cv=none; d=google.com; s=arc-20160816; b=tZ/dDukI+X2WL/sKmwF8oXGo0zIYpAIIo7l6mUw3wE8Sg7QAQSiw0WEc4Pk9wDdTJi kVnZMnCBO4i4/6DPwMKFXANCHP4YANfs8rfa1j9BI1HGfHVW9yrlBf6netaLseShCE9g eITiVx9EQ3VFSzb2AxqFt6lm8VM1Sdyh595mR5R/gva8F6Wnf4XL9lWx54eiqs9KZ7hP T2Ul+gWIMoyZOVRSbbnjd7LMYw0Vr+6UNxWptF+g4EujydRTeGkWL28bPJaz8Pfr4431 SPQohHsxz6A7+nWL9CxGueo4B8bCMKaW/ROMt8voMIPSFKEes/OKEzwKkmeg9ve1yE/u 5CCA== 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=8HBMcf3z1g0r/LfHDO0I0pGMiDIYrwu0uZQZRiCnAI4=; b=vA9Pi9Uo7eB7GJs+g3gW/0Zg0xU6WZIDP6QGpaupZPCvn7pNZLpRpq4N2sXAsZw4Ca WeR10dZXFOa53brJ1kaHyI9agQNS3+3oIwq/kRV3zYtNb8OQMJ8B2biZCHWxGoD9m91N RGei4S/hSQjoLj+vNk/gKJX6u57ZN3Pj/tbg3fEVh5dbbMnfpVkCcqOQV68JBNCDJYQI g4PPffh7pr4vT2XffWt+hsKgcA101YhWEsO0c/ksCW2V1zWr/SbC7Zfn5Sl7qrfp78BO ugJO0wzc8jW0Py3cb1MYYgXGNrPVTwsdHGmziPuB4TBYzHdmat6yyB97oxkoAiM6kYtw to3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20210112 header.b="dT/RvwGm"; 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 gb17-20020a170907961100b006f4d2e55f86si88268ejc.356.2022.05.16.09.59.32; Mon, 16 May 2022 09:59:33 -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="dT/RvwGm"; 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 B78E968B2DC; Mon, 16 May 2022 19:59:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C47FA68AEF0 for ; Mon, 16 May 2022 19:59:22 +0300 (EEST) Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-2fefb9975c5so24896717b3.21 for ; Mon, 16 May 2022 09:59:22 -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=edcXreaZQ/S6SkBzl63Igp21AYSF2pKWld5frJZK1Ro=; b=dT/RvwGmMYvEbjplBA6i7JgFGKY+PJ3LkH76jXnerKcFz317EMls9/1oAaMdR9EqiM IsdIpmRWGag/f7notWJMvuI8UiMP5SuDu+gZMDIebFpDDgwtp8MSa8c0pM7p05A1Ixar TU+ahkDMRb3drG+tXnZF+zroCsV2LAJVuxXAfnCW1In+UQC6Eez2s87o3FV5uxOir/sJ k7cDlafFc33uN5unrHaDzra85P5bkYwBZBRUmLomUBYUXpLVKYaO4ookkg5OJfnO76oq CeMT1+suSu6jITFZ7N76OClrKWNcNgYFWnVcwa12HuoLFOK3836BqiyrTB1ncH8W42WN ZiDA== 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=edcXreaZQ/S6SkBzl63Igp21AYSF2pKWld5frJZK1Ro=; b=SdZ5gV8tacUatf7DN/KRySurYOtIPN94xYwloxvxrwBliPOLZt4EIZDPF0NHjHA/k5 1Yiemog9jsHi2NJwkziyUgR5riYlqACzbZ0eaFQZmcBSqEodl2XNMIriiPqHlH9lkMte 0fzc4fUA81NhDuMieMc3Syw14tfab4PtAvCvvy22O1wFXidPb9nQzyytL6/n4IsJuiAL IjylSjdvAzx68gBbNXoj7tpiTcULJXyXXEKzRdhshr6BpuQ0+dcoAdFFrLgm1dxFZ/Ut I6hX++oi2UNnepHPcJDrOHDDeerwBFLRQ0xq+dwlhpKLZ4T3qCdm3f7r9BOzTIJh8hhg NpOw== X-Gm-Message-State: AOAM530JwbWqFUlK3QGfkhPXXT2/+uRZTULyJTQhJMZ5HlR0KE1++7Sc 0OZgBY1u6ciwnGjCMro2FGK2BrvKmL+7hem1AcuhUChuwkF/s+HKOCGdFXL7cxP+9SLdTM4joaV oHcXqpPo8ffkzK5NZJ5ZloPamug1usfPg1QB4b4PhcNJFCUYC1cxUQkhk3+h6ac10qnCf X-Received: from vigneshv3.mtv.corp.google.com ([2620:0:1000:2511:d719:9ae6:470a:e086]) (user=vigneshv job=sendgmr) by 2002:a81:4e8b:0:b0:2ff:fbf:3c2b with SMTP id c133-20020a814e8b000000b002ff0fbf3c2bmr3531512ywb.150.1652720361105; Mon, 16 May 2022 09:59:21 -0700 (PDT) Date: Mon, 16 May 2022 09:59:12 -0700 In-Reply-To: Message-Id: <20220516165912.3731545-1-vigneshv@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.36.0.550.gb090851708-goog From: Vignesh Venkatasubramanian To: ffmpeg-devel@ffmpeg.org Subject: [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 Cc: Vignesh Venkatasubramanian Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: QtN1jhQITJD6 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 } };