From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 5C3DC412C9 for ; Tue, 19 Apr 2022 20:55:59 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 903EE68B3AD; Tue, 19 Apr 2022 23:55:56 +0300 (EEST) Received: from mail-yb1-f171.google.com (mail-yb1-f171.google.com [209.85.219.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4CFC068B3A3 for ; Tue, 19 Apr 2022 23:55:50 +0300 (EEST) Received: by mail-yb1-f171.google.com with SMTP id m132so33298226ybm.4 for ; Tue, 19 Apr 2022 13:55:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=/3KFqScyall+hNOEvq8/1YeYXfsWfKk7+WJEbdV8EFU=; b=nJ2MmgikQ4/sQK9dFP6kgcVms0ALBZH+QL4GZTAIn0dgnxMF7O4KWVwHid23pQnGng LeGfe2lniZsIGKswFv2l5kp3EqvDuweB+/HNA7S6m47I2EA5nn0k6hGhv5t0il280osy 8oJivbRNxRAztj3MEz0UXPU83xQY+IUSzCgqe/qI58w2TaZoh36JPfFe/gzW4iM88WFh 5Bw2AcKQxBGgijpN5XNuocA1xYKGrGEsAjgsMPW7Ap2nPsKuhzSdGyEtVhX0xzu8XV2r 1R4B06UMwA+EnnpUakXauvBILTXafeFeDo3bBO9y5yybi/hFzLq+/V12P+6uMBlpLkgb nSzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=/3KFqScyall+hNOEvq8/1YeYXfsWfKk7+WJEbdV8EFU=; b=KxD9ncatDjdI7zNtT7bqam6l2kGahhYuA1mxGPR/6N+GImnJO2jXOl9nSYfJ1Ear2P B1Qu04DCWyDVtAK+FTF2PqAm7MtKfxymyujEhEbiafIFZc+JM5Vvpal2Fg5ZrutAqkJV UpYXBIc6ekbk4DSkIFjYjInzQ9EUL7Vkrjqd20yoob6Kw7hyyPYblBZResLqRItHNXuj BdDIoYOcuZl/ciM/Ol73jrC7tb7uOWYkpiNQTeMYsCP38DyPAlkN1n5zdPlqxkRWhlxr RGnd1w6rB51Tm8sSvizNI30Shf+5E3sc8oQ+2149Q2RtDL8jJpMXTaS3bsxl0p9IRfo6 o1qw== X-Gm-Message-State: AOAM532bcTRo7qOAEVX2QD4gbstItg1ZH7OfZ1JtUBzgWHRWPV51zmNl kxcjgFFT+wIVhq+//AjdnfhY6vyeyFW9KnKqCKtSWw== X-Google-Smtp-Source: ABdhPJyznF/HnnKffcj0qKFyuOdibX7uR2iBTZHzwttI5E4oxIZXexdigpH8asinU7Bt73RH2Ujpg6166Bf8BKlIlP4= X-Received: by 2002:a25:504d:0:b0:644:f851:4f4b with SMTP id e74-20020a25504d000000b00644f8514f4bmr11495659ybb.172.1650401748657; Tue, 19 Apr 2022 13:55:48 -0700 (PDT) MIME-Version: 1.0 References: <20220328181136.2198207-1-vigneshv@google.com> <20220328191152.2959056-1-vigneshv@google.com> In-Reply-To: From: Vignesh Venkatasubramanian Date: Tue, 19 Apr 2022 13:55:37 -0700 Message-ID: To: Paul B Mahol Subject: Re: [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: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Tue, Apr 19, 2022 at 1:18 PM Paul B Mahol wrote: > > > > On Mon, Mar 28, 2022 at 9:12 PM Vignesh Venkatasubramanian wrote: >> >> 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); >> + } > > > Here and everywhere else, remove excessive {/}, they are not needed for one liners. > Done. >> + 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 } >> }; >> >> -- >> 2.35.1.1021.g381101b075-goog >> >> _______________________________________________ >> ffmpeg-devel mailing list >> ffmpeg-devel@ffmpeg.org >> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel >> >> To unsubscribe, visit link above, or email >> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". -- Vignesh _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".