From patchwork Mon Mar 28 19:11:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vignesh Venkat X-Patchwork-Id: 35023 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp467375pzb; Mon, 28 Mar 2022 12:12:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzQfA5oXKIWjcr7ZvRMZHXfA54MKEt7TUVKzFNOAs5/ysJVYnVzb0R49IG29JwlKUYhM/WT X-Received: by 2002:a17:907:3d89:b0:6df:802d:df43 with SMTP id he9-20020a1709073d8900b006df802ddf43mr30028266ejc.76.1648494728941; Mon, 28 Mar 2022 12:12:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648494728; cv=none; d=google.com; s=arc-20160816; b=0CVN5CRtYiTPcJzkLjtBl/C0CHx0qva9ikSqWiFwEcQ7ubqIeArZgPXkbCBEyoDmOv kGW7bYTVk+BCd8pwdvGEqpxWcLVF+w79xkk9YZCQH4fIEdp/C4jV6FeZ7RpLt/bAo1uW hY2/FTmn0G8HdBegM6boBOsnxnmioyVH/jOFEvF0MU1dpBpbziaPXZUUD+QOUoMZcpyi kaTo6Q28zPztDpaDQ1jAPsDhMoUNG0yibu9iFy6VEaic/jY4cxyvuvysyVPaS+6++Jzt adyHsSB23+B3XYvUbdWG8VezRUAXl47vQWkTNCvgeLjGufKxJbCB/uuNgBPe1FHKv6lV CJbg== 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=RZUtUH9HbIMvO5Tc5MlpzWxeO0Q73WFLJqpTWjO4xTM=; b=iEXo3yfeqhHtcqOlhp6+6PF1w7gqodLhg5l5LgEd5fkndvG1DUBMbi4BiW8Rv+CWEg 3ZrbNKRZxlFEL0UnG2Q0T0ecSY5SaYp89Jo2q8mT42B9vMelJnrbCAuaduifKkQxtKOK r0mpdc3ruoWayClrVZ9oBmWgp6c6JK6adO5eMXh9eo3bIdkehvzW1RH6wPh0Sr6eftBS dyyoS9AVB0d0ZH2eFEzlHf+5EcqcjDpz5rOURgmnVQRFNon8/LZqeQqi2QiHf9saq6Jw 4AwQ0dfSV446J62A60WGckADxXXlBdeHLI3V9tmJhIViheYYDIhh4WM/BS24L3FnQLvh xwcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20210112 header.b=F9TTcXtW; 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 j2-20020a170906830200b006df8b390027si13185760ejx.550.2022.03.28.12.12.07; Mon, 28 Mar 2022 12:12:08 -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=F9TTcXtW; 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 0B7AD68B251; Mon, 28 Mar 2022 22:12:04 +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 E099B68AEFE for ; Mon, 28 Mar 2022 22:11:57 +0300 (EEST) Received: by mail-yb1-f202.google.com with SMTP id j5-20020a056902020500b00628ab64be30so11467816ybs.16 for ; Mon, 28 Mar 2022 12:11:57 -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=2A0gv3pH3s9gfJ01yhi6mluvXE9PQTx6fAOMMS7j0Vs=; b=F9TTcXtWcGzQLAJZQM/SCgWphJ5yddpv/3l0aSQZyVYXuXopCETgCqEpK9H7k+RrtR 99ioDSNqe53exzCx/88BhBvI9n1wlxZ40rDGx0eN/PCpo0pYbwkhdfndhRO5h88KOugL wh+0Qru6Q45GbrhUSWgOLwlsWbhtP2UmGVyWmlII86D1+vfP0BLR2RPeV06uSqV15L+P 8zfG9WPlTbnulgsJCVvmjPJRI3n6eayZ7yHskDCJyEVTB83dC/XIjaU4ZfvEItJruLtv AHJ4ZEDrFVVE+29g/7oo7QCCAfw6NCt9ZOPQ6CIXTo3Jk+kbLICXPJowcPpdrSbV1J++ wlsQ== 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=2A0gv3pH3s9gfJ01yhi6mluvXE9PQTx6fAOMMS7j0Vs=; b=mmh/pL5JJy33NEDzCwWUm8T+D+qsE2LIotY+PR/iIVb0wVXNsdzHATNlkdJjWea/Nu OhY8lZyGQ3RAB2ZvPPqM8CzeCrlvQt/vJAxBzGeT6kkGU0WzWZwFVCCpQlAvha47TA47 3DSFsMIWvAfgJtXLyrtw8QscT5LJrAnmJjOB3bhIXm7WuPMmuUKAbLg9n422moNoZ2vN gQg1Rxx5zY272jwGKcWQokpY7bRz6gkNKPxCwBAQbZwB8RlRblEPAfZ/c8GaYEIZui/T 8fgCat73FdLweCFHgD9Ato6H7wzHqWIbG81EAeFaClyrZOIfNu7GM1E6/XXXwG9cVrWZ vimQ== X-Gm-Message-State: AOAM531PnxVd2OXKRG7XCQxsQgtYymASi7GBSZXVX4gP+uO9Ro2BRBaa KAlQWJHm1KYq7Rfa+EY2VdTXD7O0z8xtx1uk3XZXLRS2El0VlkbH0VlzR3DbphdqDSSuTwSnpNz Y6iUp3TK8rSQNfBUbaGX8qD/WyNWthyUwjL3TmsNpBs6mMqG4BcQNyJxoAai6+NlrB0qv X-Received: from vigneshv3.mtv.corp.google.com ([2620:0:1000:2511:228a:277d:bb24:94ea]) (user=vigneshv job=sendgmr) by 2002:a81:a1c4:0:b0:2e5:84d2:e59f with SMTP id y187-20020a81a1c4000000b002e584d2e59fmr26295269ywg.214.1648494716408; Mon, 28 Mar 2022 12:11:56 -0700 (PDT) Date: Mon, 28 Mar 2022 12:11:52 -0700 In-Reply-To: <20220328181136.2198207-1-vigneshv@google.com> Message-Id: <20220328191152.2959056-1-vigneshv@google.com> Mime-Version: 1.0 References: <20220328181136.2198207-1-vigneshv@google.com> X-Mailer: git-send-email 2.35.1.1021.g381101b075-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: eyYj423n0jgi 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 | 148 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 149 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..fb6d071b95 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,152 @@ 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 +7679,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 } };