From patchwork Tue Jun 28 18:56:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vignesh Venkat X-Patchwork-Id: 36516 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp2830662pzh; Tue, 28 Jun 2022 11:56:37 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uexE/Lpp5tE16497eAYoRaXfgD+a8NCX8mERJkdyKlurEF4Xzw5By+hlJ5eW+uS2KLYabo X-Received: by 2002:a17:907:1694:b0:716:14a4:fba with SMTP id hc20-20020a170907169400b0071614a40fbamr19901562ejc.290.1656442597293; Tue, 28 Jun 2022 11:56:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656442597; cv=none; d=google.com; s=arc-20160816; b=FO+BUF7MKwK92z48zQi/2Jop/n/4odPtMn5IyGQld4OqTdti5Dl7nsGQrKGylsXE3H 79LqhKkk1iuXNjb6Kp3X9twaIZ3HWbLwLVJZwNdru+tyvIIG0QiUrZFoMOOnBDAk4uoL ZblzAaj845F+I5OMKWTUVp0t6bxRfGqsq5IBOCekht6AhWRL39pjx8bKnL1vNhFSYB5K YW77D23m3bkGyXAFHmO7gsMX4s7YwLbzNbwQde95PwTRHVZw7KfmCH5cw1eJVqTjjGU1 L114CzTzO2u+dFi1Z/rumQ+6tkan1fb0touN5KFSbdNd28EOTxzStSRMc9AQW/30Agxj mOCw== 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=enM5zMGoDPDIETY5k4Ya6JS2qD7l55kVWSO8Kg4da7U=; b=wqHOp3Jdul0nBjIIn+vH6vYER2/YdLJ5D+bA3IO3bb/nuedmOR3UiBrh2R157520n1 xrbM90gi7pfspbDFeGtcAA8J+xReTAR+PgOZCl2P8QqqEtfCQp2mF5yfeHusEUkvk8jx sGd+Q/VOvJ7+epviHC0MchUZyzBdlX8ChnATywAKLa7CW/yWp1rWjVepb4ITRhGg9RVp AptNUwlhoe3PxL9gdQBvL0JLxTUtq1BIAtGf86vfe1pvQfKEsRhdJMQmfnsart9u4Czn f20lAZCWfs0gmb1+XcjU4qe5YGasiAW8CCaVw/FmgGg7zoPRd9mWyVlFhxTgcI+7RVtG fU4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20210112 header.b=rx61ZX9+; 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 h14-20020a056402280e00b0042dd658ab17si2439903ede.231.2022.06.28.11.56.36; Tue, 28 Jun 2022 11:56:37 -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=rx61ZX9+; 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 9BD5168B991; Tue, 28 Jun 2022 21:56:32 +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 62F6868B980 for ; Tue, 28 Jun 2022 21:56:26 +0300 (EEST) Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-2dc7bdd666fso109962357b3.7 for ; Tue, 28 Jun 2022 11:56:26 -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:content-transfer-encoding; bh=9Z5wdyou9w/waIbxf9a3iClMPAImolIeD5pJ+xdgFAw=; b=rx61ZX9+/OVxdV1Q4igPaGBz8R0Fas9ZMzE/WyS3bgGWjm9TGvrtNI9ZpeK9vTpBX8 0LCKZkCsfKBqN/kUdhlshe2eEzdxFvDtD7/ShdwGkMVxPz8ve0Oo4EXn2HMGm74JUqPj mqD3roSc2UsjCTcH9KmXFj6rjHPtDD0ISpg5OaWL8TVWMuvlvN9J20z3yFsquF6c56n9 wSUL1OjYl/dAgv5vp204uFtCuYZWCLwafy8N4S45mti6g4KW2azFbQO7VCUVmmUXXqZP 446RQjrt1gRyxkn5O+ySd+S8Qzcpx51Z/y4jEqTyBbcnhv5sohqIQBBBDLYMc2pXUDY9 AMcQ== 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:content-transfer-encoding; bh=9Z5wdyou9w/waIbxf9a3iClMPAImolIeD5pJ+xdgFAw=; b=A9XfkFrFGJ5WJMZ61/xN6X4S3saq+tSLCP4PcISjpoi2W+MS1VEuG2xhr3P/urmRGY 8rgwdqss5a/lejEhJZSe+GgDaqvSEmtZgMhtXJ5Ry9fl7HmiqvpvOive0dfX01qsa3q+ ptKUZV53q7uE5lcM1RW/+VkI68U/bHpe03HyL9cxyGMlVzrQcSC40uEGOQSFI+m3yUFC UAsiNvO+wbwBHR3JSoe4cmWQqeKwK8I5uOg91LNp9HSe/3ZX2vjNx8d4YXvSt5uzI3QA 5xOMUI7EuNuvEj4sIeELTBk4JnOjwc1jMtYspxuVWskeW3mreW8hA9VhGBWjB6koMvGI I9Kg== X-Gm-Message-State: AJIora824SU0ExYpf5J5JLfYPao4UW+VbM42mcteTPFluxEsl3DnVjSa 89P+1rEwpPEWqZhnkloFW+MSakG5xAKnaSVl4SM1mryvDnkbgLmbiR9q1WNJUFB+hF1rftlvk0b YbmbBsEUWQ8kUkheXMEEQUFjO2Cu13gu9Q9Drg+/Oc3IQLBNmFAQ4mFNEVod7m73CItZ5 X-Received: from vigneshv3.mtv.corp.google.com ([2620:0:1000:2511:a3d:b3a0:5148:b682]) (user=vigneshv job=sendgmr) by 2002:a25:4cb:0:b0:66c:d429:eb71 with SMTP id 194-20020a2504cb000000b0066cd429eb71mr12950484ybe.418.1656442584328; Tue, 28 Jun 2022 11:56:24 -0700 (PDT) Date: Tue, 28 Jun 2022 11:56:20 -0700 In-Reply-To: Message-Id: <20220628185620.2957852-1-vigneshv@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.37.0.rc0.161.g10f37bed90-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: rsyF6mg5o+UF 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 Adding two fate tests: 1) demuxing of still image with 1 item - this test will pass regardlesss of this patch. 2) demuxing of still image with 2 items - this test will fail without this patch and will pass with patch applied. Partially fixes trac ticket #7621 Signed-off-by: Vignesh Venkatasubramanian --- libavformat/isom.h | 1 + libavformat/mov.c | 41 ++++++++++--------- tests/fate/mov.mak | 13 ++++++ .../fate/mov-avif-demux-still-image-1-item | 11 +++++ .../mov-avif-demux-still-image-multiple-items | 11 +++++ 5 files changed, 57 insertions(+), 20 deletions(-) create mode 100644 tests/ref/fate/mov-avif-demux-still-image-1-item create mode 100644 tests/ref/fate/mov-avif-demux-still-image-multiple-items 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 c6fbe511c0..88669faa70 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7470,6 +7470,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; @@ -7526,34 +7533,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; @@ -7561,7 +7559,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. @@ -7577,8 +7575,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; + } } } @@ -7696,6 +7696,7 @@ static const MOVParseTableEntry mov_default_parse_table[] = { { MKTAG('S','A','N','D'), mov_read_SAND }, /* non diegetic audio box */ { MKTAG('i','l','o','c'), mov_read_iloc }, { MKTAG('p','c','m','C'), mov_read_pcmc }, /* PCM configuration box */ +{ MKTAG('p','i','t','m'), mov_read_pitm }, { 0, NULL } }; diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index 2fae054423..8a7218a215 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -17,6 +17,10 @@ FATE_MOV = fate-mov-3elist \ fate-mov-bbi-elst-starts-b \ fate-mov-neg-firstpts-discard-frames \ fate-mov-stream-shorter-than-movie \ +# FIXME: Uncomment these two lines once the test files are uploaded to the fate +# server. +# fate-mov-avif-demux-still-image-1-item \ +# fate-mov-avif-demux-still-image-multiple-items \ FATE_MOV_FFPROBE = fate-mov-neg-firstpts-discard \ fate-mov-neg-firstpts-discard-vorbis \ @@ -138,6 +142,15 @@ FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, TTML SUBRIP, MP4 MOV, SRT_DEMUXER TTML fate-mov-mp4-ttml-stpp: CMD = transcode srt $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt mp4 "-map 0:s -c:s ttml -time_base:s 1:1000" "-map 0 -c copy" "-of json -show_entries packet:stream=index,codec_type,codec_tag_string,codec_tag,codec_name,time_base,start_time,duration_ts,duration,nb_frames,nb_read_packets:stream_tags" fate-mov-mp4-ttml-dfxp: CMD = transcode srt $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt mp4 "-map 0:s -c:s ttml -time_base:s 1:1000 -tag:s dfxp -strict unofficial" "-map 0 -c copy" "-of json -show_entries packet:stream=index,codec_type,codec_tag_string,codec_tag,codec_name,time_base,start_time,duration_ts,duration,nb_frames,nb_read_packets:stream_tags" +# FIXME: Uncomment these two tests once the test files are uploaded to the fate +# server. +# avif demuxing - still image with 1 item. +#fate-mov-avif-demux-still-image-1-item: CMD = framemd5 -i $(TARGET_SAMPLES)/avif/still_image.avif -c:v copy + +# avif demuxing - still image with multiple items. only the primary item will be +# parsed. +#fate-mov-avif-demux-still-image-multiple-items: CMD = framemd5 -i $(TARGET_SAMPLES)/avif/still_image_exif.avif -c:v copy + # Resulting remux should have: # 1. first audio stream with AV_DISPOSITION_HEARING_IMPAIRED # 2. second audio stream with AV_DISPOSITION_VISUAL_IMPAIRED | DESCRIPTIONS diff --git a/tests/ref/fate/mov-avif-demux-still-image-1-item b/tests/ref/fate/mov-avif-demux-still-image-1-item new file mode 100644 index 0000000000..93773afd4e --- /dev/null +++ b/tests/ref/fate/mov-avif-demux-still-image-1-item @@ -0,0 +1,11 @@ +#format: frame checksums +#version: 2 +#hash: MD5 +#extradata 0, 13, b52ae298d37128862ef1918cf916239c +#tb 0: 1/1 +#media_type 0: video +#codec_id 0: av1 +#dimensions 0: 352x288 +#sar 0: 1/1 +#stream#, dts, pts, duration, size, hash +0, 0, 0, 1, 36265, 235b0c6e389c4084845981e08d60db04 diff --git a/tests/ref/fate/mov-avif-demux-still-image-multiple-items b/tests/ref/fate/mov-avif-demux-still-image-multiple-items new file mode 100644 index 0000000000..93773afd4e --- /dev/null +++ b/tests/ref/fate/mov-avif-demux-still-image-multiple-items @@ -0,0 +1,11 @@ +#format: frame checksums +#version: 2 +#hash: MD5 +#extradata 0, 13, b52ae298d37128862ef1918cf916239c +#tb 0: 1/1 +#media_type 0: video +#codec_id 0: av1 +#dimensions 0: 352x288 +#sar 0: 1/1 +#stream#, dts, pts, duration, size, hash +0, 0, 0, 1, 36265, 235b0c6e389c4084845981e08d60db04