From patchwork Tue Apr 19 20:57:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vignesh Venkat X-Patchwork-Id: 35352 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp543933pzh; Tue, 19 Apr 2022 13:57:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzloHcv/+JpClzK3yJ8Ol7hAvqnTFy+G3Qu77wCjGFhvtVgHbmXMEvTganx95EQuiX2QkeZ X-Received: by 2002:a05:6402:26c7:b0:423:e5d6:b6c6 with SMTP id x7-20020a05640226c700b00423e5d6b6c6mr12298049edd.61.1650401838119; Tue, 19 Apr 2022 13:57:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650401838; cv=none; d=google.com; s=arc-20160816; b=Nsk6l/fdIcGuwNGJops4rn05zeIO/T/ZrNYzIPUCzR8E4XSlL8c/SmBez9/bxmrHnJ 0evpG3e6dwRam2V3IPwPyJyPnlU7n8sxBPYMPNHVV1KXwmNxLhwgojyjAqhjovokaE73 89vcYmpiZeakuNLphqan0ivLi6tZy5Zntns1pESRYm85exbH72WEowJ8ViC+H27tPsAn c2CyVxeVMjhVrANu8QHXPjB+YX3Is3GNIkzomfDTTYS0b734fc31A2j51sfcri4eCEMA o5p6TdkefOM/tCAw+bLN63oi0qNefqZJ8T8Tfoe3nQ7w7P3id4lGj7v7+NDkDEhoYgeP JlwQ== 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=PqxQaCKtgcJ6sePO5bMtjwmedRilBMjElh5bSssq51Q=; b=JR2fBdsOqrr751HOClXNu6iHXmMdoL5e1b7dxnXebzCY23nj4vVT6OP8ZcjEwQka/m WfkuvnR7FQ1s1l2G0wLYt3hl8LW/RSIM2um/Xln45wUeTQc0waXItSIPggwJKvR161eA mXarLfgTD1lq3LvN9Ysj876qHCw2DDcjbu7RysIwnCFLW315etyGcWvyX/4ShuzxkOtc XrLbErzJRZYXb6jMdtV7O440B41mSq9+8tCq9t7F1JU2UpuNJwYmJThuY8aLyxLfSbMY ypN/XHRtAyQJ7rJNgyDDrR0V5JDcoh81LqHEqeKZuRiyCGGxaVsBDCK6NoMs8KDcAlCK gyaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20210112 header.b=C8AejWZe; 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 z8-20020a05640240c800b0041d71714dc1si3847544edb.420.2022.04.19.13.57.17; Tue, 19 Apr 2022 13:57:18 -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=C8AejWZe; 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 E880C68B1DD; Tue, 19 Apr 2022 23:57:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E38868B1DD for ; Tue, 19 Apr 2022 23:57:09 +0300 (EEST) Received: by mail-yb1-f202.google.com with SMTP id o188-20020a2541c5000000b0064334935847so10271941yba.16 for ; Tue, 19 Apr 2022 13:57:09 -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=N9TThFhfp0zbi1y4rMKQen4GgNOfSzdajLmUbmIq2zU=; b=C8AejWZeUPUBKSYKWamQi8peRZ6qAZGGMKEQcHmF9WQGnyHvxDw6nnLqopmRtdvZMh PowZz2yMH/OVZETYNrLdLuyyus79HPQbnlfzJKj+huFGvs3PjZw9d1H4GOGfKhBtwbzK myep61L3jObNcOoRr7f+WT7AuxoNxGCNzs0VopMbu0LMM1Xuy36iHQwLfiAWTFmYOl/W 522GFMXHAdbLtJGK+r2srSfbuwoOabgWvU+DqfukGVV6aNSUpXgUBbV+kC5hghDv5tWb EPpbvZ31LCC6JlBUE6cL9u9aQXGMHFmdrKms+P8XiJw9tvrtFNUcwNUqYJ5zQcON7P+u b2Yw== 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=N9TThFhfp0zbi1y4rMKQen4GgNOfSzdajLmUbmIq2zU=; b=5TvJtpS6Kqb/VXydFL0vo+Gni75RtelIu0BG0WREe6IcFNYSfrpRmNlEQPVpEl+hs1 TYhj8JdcQmDonMD+DZ4b8AaoAM+bUFRjgeGH8KeHessJHEDrmzEc1MmUCSPoyoISofoN tT13yrNTy6sxT5gR43rwuopQTXz10fTJup4c5JqLjVn6YCVjpHaMcmH7m9DJTJ844nk7 7ZuwkgO12X+7YJiGqtSbJPTdAQNK1QWg61qcR8bxVLVq0L2bIdN09JohcSaQ5AZcK02d 1ccH9dsFa3KjIyU9j3ayQEKfjXYInM8pfSU1MduRxbzoUXGCO9a2J2vU63A25xwh6k8g 1JXA== X-Gm-Message-State: AOAM531XTRGs6zIPy3cxRUV9oK9HKJSSfJWfj7VockbJYdESszB+8MKo vCck3KqdMNNgNtPgJwqxPuSlPJNCZjdH90Qj9YNaZ+nPl/nV4canhnXiAL9PUa0QfiIbYiZoTSu 2XfnumdL+eutgdDH5/meQ00qF35wbC0LbywX8mP5wkIq8eY1pMY7E6CRoSavCabUji70y X-Received: from vigneshv3.mtv.corp.google.com ([2620:0:1000:2511:1649:4f1a:2561:b3b6]) (user=vigneshv job=sendgmr) by 2002:a25:2e45:0:b0:642:875d:c9a5 with SMTP id b5-20020a252e45000000b00642875dc9a5mr15986343ybn.314.1650401827993; Tue, 19 Apr 2022 13:57:07 -0700 (PDT) Date: Tue, 19 Apr 2022 13:57:04 -0700 In-Reply-To: Message-Id: <20220419205704.3548965-1-vigneshv@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.36.0.rc0.470.gd361397f0d-goog From: Vignesh Venkatasubramanian To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] avformat/mov: Add support for still image AVIF parsing 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: rF/r1tvTJVbc Add support for parsing AVIF still images. This patches supports AVIF still images that have exactly 1 item (i.e.) no alpha channel. Essentially, we will have to parse the "iloc" box and populate the mov index. With this patch, we can decode still AVIF images like so: ffmpeg -i image.avif image.png Partially fixes trac ticket #7621 Signed-off-by: Vignesh Venkatasubramanian --- libavformat/isom.h | 1 + libavformat/mov.c | 137 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+) diff --git a/libavformat/isom.h b/libavformat/isom.h index 5caf42b15d..02d681e3ae 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -315,6 +315,7 @@ typedef struct MOVContext { int have_read_mfra_size; uint32_t mfra_size; uint32_t max_stts_delta; + int is_still_picture_avif; } MOVContext; int ff_mp4_read_descr_len(AVIOContext *pb); diff --git a/libavformat/mov.c b/libavformat/mov.c index 6c847de164..e925690584 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1136,6 +1136,7 @@ static int mov_read_ftyp(MOVContext *c, AVIOContext *pb, MOVAtom atom) c->isom = 1; av_log(c->fc, AV_LOG_DEBUG, "ISO: File Type Major Brand: %.4s\n",(char *)&type); av_dict_set(&c->fc->metadata, "major_brand", type, 0); + c->is_still_picture_avif = !strncmp(type, "avif", 4); minor_ver = avio_rb32(pb); /* minor version */ av_dict_set_int(&c->fc->metadata, "minor_version", minor_ver, 0); @@ -7430,6 +7431,141 @@ static int mov_read_SAND(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; } +static int rb_size(AVIOContext *pb, uint64_t* value, int size) +{ + if (size == 0) + *value = 0; + else if (size == 1) + *value = avio_r8(pb); + else if (size == 2) + *value = avio_rb16(pb); + else if (size == 4) + *value = avio_rb32(pb); + else if (size == 8) + *value = avio_rb64(pb); + else + return -1; + return size; +} + +static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) +{ + int version, offset_size, length_size, base_offset_size, index_size; + int item_count, extent_count; + uint64_t base_offset, extent_offset, extent_length; + uint8_t value; + AVStream *st; + MOVStreamContext *sc; + + if (!c->is_still_picture_avif) { + // * For non-avif, we simply ignore the iloc box. + // * For animated avif, we don't care about the iloc box as all the + // necessary information can be found in the moov box. + return 0; + } + + if (c->fc->nb_streams) { + av_log(c->fc, AV_LOG_INFO, "Duplicate iloc box found\n"); + return 0; + } + + st = avformat_new_stream(c->fc, NULL); + if (!st) + return AVERROR(ENOMEM); + st->id = c->fc->nb_streams; + sc = av_mallocz(sizeof(MOVStreamContext)); + if (!sc) + return AVERROR(ENOMEM); + + st->priv_data = sc; + st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; + st->codecpar->codec_id = AV_CODEC_ID_AV1; + sc->ffindex = st->index; + c->trak_index = st->index; + st->avg_frame_rate.num = st->avg_frame_rate.den = 1; + st->time_base.num = st->time_base.den = 1; + st->nb_frames = 1; + sc->time_scale = 1; + sc = st->priv_data; + sc->pb = c->fc->pb; + sc->pb_is_copied = 1; + + version = avio_r8(pb); + avio_rb24(pb); // flags. + + value = avio_r8(pb); + offset_size = (value >> 4) & 0xF; + length_size = value & 0xF; + value = avio_r8(pb); + base_offset_size = (value >> 4) & 0xF; + index_size = !version ? 0 : (value & 0xF); + if (index_size) + 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. + 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)); + 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)); + if (!sc->chunk_offsets) + return AVERROR(ENOMEM); + sc->sample_count = item_count; + sc->sample_sizes = + av_malloc_array(item_count, 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)); + if (!sc->stts_data) + return AVERROR(ENOMEM); + sc->stts_data[0].count = 1; + // Not used for still images. But needed by mov_build_index. + sc->stts_data[0].duration = 0; + + for (int i = 0; i < item_count; i++) { + (version < 2) ? avio_rb16(pb) : avio_rb32(pb); // item_id; + if (version > 0) + avio_rb16(pb); // construction_method. + avio_rb16(pb); // data_reference_index. + if (rb_size(pb, &base_offset, base_offset_size) < 0) + return AVERROR_INVALIDDATA; + extent_count = avio_rb16(pb); + if (extent_count > 1) { + // For still AVIF images, we only support one extent item. + return AVERROR_PATCHWELCOME; + } + for (int j = 0; j < extent_count; j++) { + 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; + } + } + + mov_build_index(c, st); + + // For still AVIF images, the iloc box contains all the necessary + // information that would generally be provided by the moov box. So simply + // mark that we have found the moov box so that parsing can continue. + c->found_moov = 1; + + return atom.size; +} + static const MOVParseTableEntry mov_default_parse_table[] = { { MKTAG('A','C','L','R'), mov_read_aclr }, { MKTAG('A','P','R','G'), mov_read_avid }, @@ -7532,6 +7668,7 @@ static const MOVParseTableEntry mov_default_parse_table[] = { { MKTAG('k','i','n','d'), mov_read_kind }, { 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 }, { 0, NULL } };