From patchwork Wed Mar 16 17:00:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vignesh Venkat X-Patchwork-Id: 34795 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp189789nkb; Wed, 16 Mar 2022 10:00:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxfgNwszZkx3gZw/dbakqYUahxrW9tlbqbnxhb/qi+aRcGh7SrkY52ORkzi8Nuai5Fyco+y X-Received: by 2002:a50:d5cc:0:b0:416:4b23:df33 with SMTP id g12-20020a50d5cc000000b004164b23df33mr378861edj.281.1647450048216; Wed, 16 Mar 2022 10:00:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647450048; cv=none; d=google.com; s=arc-20160816; b=TtEfUHLj7I5vcvNFvNd0A+Al1fCp9BZ9S/OXdqxDKED7/PkyUoNYD/RokQdeG6qGWa 41UMffS+rSBXVkwzj+rxyofsgCU4KGYKGio+lVYYG9y2um7YG6UTorM/il0bKAqbsN7c w7GidzPdmEwjuVcDiQVDspmqFgT2Ay9kormR8Vd+AabwtemO+1dkqyuZiON9zWvWewXz YnX8WjwYZiEv6FdxE9nr2/v/91toMGNul79VRjkRL8LZgq3O4/R+TEfBFxDJ4GwaNCpG U7tKiDfO7g7NSzx/W0aHA82uVUmHR9GKJCWyPNxp1JIxvfpsLk8vetWV0NS1Qrc30jOu uJ7w== 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=BfkzMrVje5/0IPytJN+q8S86Wg0sIU6zWd+T+5ko7+E=; b=IO33Ae3LXLpUhoGP8W/z5vjRhMDKEI4AyUHzOu8RYvIJRM2u2Z3jwu+ve9TmAeIb28 GbXXfoatuTv4ScVb3c3JvvgoM4+9RmYjV/DvIASFb9GGBq0/oSBvgkxWJRZCcstqFScw 7lW0vS5xT6tfEshbK0KeOiJj2ci78kufjz53xA58msWA7eRY6IOnobaGNxwSNp0YtJ1Y t0qTlx4CU14jUWwnI3LM0ylSxKGHx9UgBja/WoghjxpqL2nDF+9zZlkcX6/Xw+ijZAQV ZMGtug0UYoClPgi1CSrW2rBAkbMZVBSZSOhPRNaUyV54lgLo90AISCcd372CmdIGWv/1 aUDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20210112 header.b=XMBWo4ly; 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 w17-20020a056402269100b004169f716df4si1772246edd.568.2022.03.16.10.00.47; Wed, 16 Mar 2022 10:00:48 -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=XMBWo4ly; 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 C618F68AFB1; Wed, 16 Mar 2022 19:00:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8B79A68A77A for ; Wed, 16 Mar 2022 19:00:38 +0200 (EET) Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-2d61f6c1877so23513117b3.15 for ; Wed, 16 Mar 2022 10:00:38 -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=Uxvf1SQyBGnqB5lAqtJp3RONwbvFtk8OdBtgs8gw0cE=; b=XMBWo4lyNj6MjJtMshB5urKfQ7g0az6pBhNcL0nl0rf2UJcNt5fjJtLlakNxOxUFwx HbMt2RlJFKDhsWSwdACs33ruRiCUjtNPTAqUxHE8BC5hQdrEW0Dwk64QsvuQ2RicwBLG 2mkxDYlgsZNSXWUV6FnVnUs3G4LTRMS4NcY/Z2pOq4B17Bac3TZWqo6ORsCc4UBmALeT VIL1QqBCQweSbeuf5COUnimX3i1SZ6Coi0jbkWaxaYRFTT5RganyC8ENnhROLrLq1TNP QzchtLxDkp4DxPCOJnRoXwWKOPqOS8q0zx+i9ICWUtLuRntKkDh/QQhkSb0uRZHWOsEo 0JSw== 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=Uxvf1SQyBGnqB5lAqtJp3RONwbvFtk8OdBtgs8gw0cE=; b=V5oSuADcduTwHck6YxtKiUUuPbFd8YpssbX9HoyRxqo9C4b/3DwrvSKn3LQ7SCXDH9 tByUDT2FZukXqM3UDBuDfBzm8+9wzcB2+6hKTAjJZq5qyZ3nlSYxe8TgCBCPGnTEU+9q A0LK0bFKIOOMmWbcti0SReSI753TMYpLVpuyN2OZhGvxEN91h8c8N/xHlX/0DqRBP9qJ lCfdOP4eBmHei2SvheEWrDOD+kX5fl60h34GmQiw4uxq+fBwsbUzCUay0T8VLhxr9dcy /1XticFqp5YlAw5UfA5CccqyhrGDRQYoql+nbZis2SVZy1hn10MxzE20aP5+s8CWiHYD fITw== X-Gm-Message-State: AOAM533T54xoyGtZjJratHJ6r+vQBkZbiWOhHwltEwF1Bcz47vZwK5XL 8ynYPqwQLmYCbkA+LH6cyY1+Q8ThpYTLvy+Az/oOVxYmf3HLCzKZ8a/7Rs9FY+srKiF/sqzvhoQ HCoXTEvZFCvZxUbq8GSS4Mgk5Lkvtz2J6OE8BEY0HBtFDKNIG0tRGrM7N/43SpyNhCQpV X-Received: from vigneshv3.mtv.corp.google.com ([2620:0:1000:2511:d3e0:a27:90b8:94a0]) (user=vigneshv job=sendgmr) by 2002:a0d:ead6:0:b0:2e5:952e:af45 with SMTP id t205-20020a0dead6000000b002e5952eaf45mr1260238ywe.22.1647450036928; Wed, 16 Mar 2022 10:00:36 -0700 (PDT) Date: Wed, 16 Mar 2022 10:00:29 -0700 In-Reply-To: Message-Id: <20220316170029.3954061-1-vigneshv@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.35.1.723.g4982287a31-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: WXYZoxpNfP2R 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 | 142 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 143 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..d598f9b248 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,146 @@ 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; + int i, j; + 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) ? 0 : (value & 0xF); + if (index_size != 0) { + 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; + sc->stts_data[0].duration = 0; // Not used for still images. But needed by mov_build_index. + + for (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 (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 +7673,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 } };