From patchwork Sun Feb 11 18:56:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 46188 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9002:b0:19e:cdac:8cce with SMTP id d2csp310725pzc; Sun, 11 Feb 2024 10:57:27 -0800 (PST) X-Google-Smtp-Source: AGHT+IGNetXRYZr1ukLOtJVYfqB72YSminrr0rl066ET6D1Z50KRPVtiuy06sidyIcDUjo/FkL69 X-Received: by 2002:aa7:c68b:0:b0:55f:5187:b18d with SMTP id n11-20020aa7c68b000000b0055f5187b18dmr2827597edq.20.1707677846800; Sun, 11 Feb 2024 10:57:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707677846; cv=none; d=google.com; s=arc-20160816; b=l0NeEHPPRt1r4SYC58MURyozdIwyv3h3W1hojNzdnkHJYvHOpgWukCqXcOcud+YgIP uilQZqx6UBG8Foq1A+ePpEolV3Aqk+z4e1qlQ7vomh98f6gs3nQkPeD6t7JJuqYS0m6q he22SGu+dBRpXmLo+a1RVyhGcPow74yS70z0coWV9gVdGCcGfyOzrtF5mZVztajKxpAx waZCpCqz8C/8BBXWHn97xqv9fbJzt1QWNSRUl7uxSokhHT5bQV7XJDtlXstNm4U6ZSJV zog0gxa1Pof9KcJHQDzJqSIUsH1XLwQ68mZvAk7YaiTrbNUGr/qopRrRsCxi7IiJYB5l /sgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=14o9k0mYlk++DYgPF7hdikvvRI2FJCCGVjJh/Df6qaI=; fh=1ysdB1T9aUa/LKYXJMVy6Lsp4PFpzMcmWoNt8VVRQFw=; b=zPgOujryNAgWdf8AEI1Z8yn0XiwmdFBhFMS5HGKjEUaS1WOCFH7yVgA7u34RKL7hxT Op++j7NUWdOoqodHbqKyLtOiTsP+zTKkTTsZDyI6gVh2aaDJ+H91cnuHat5vN9pjlR2X uTkgX8ljktm55OEO3VHoSb5spafX6BVMY9WGR/jzlBiMNBI3xEFYaWkt/XB+xUnb6sQz eW6xzScYKyA5RARivWM5utlTBNYU9eMOEBmXqYJbbb2+DUN5vlt1lMQBsvI3v6k6hzpl TcZWMaM2S5AdTp5dBhM/4WBA9TStyKhmcbxtkkdhHqshDYey+PjsS7F/GjtWN+iFgKCz LLvw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=ALyFVueE; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com X-Forwarded-Encrypted: i=1; AJvYcCX0OVD8Gd/PY8zn4FBWRtlbDasBGGr3qjRdQJMnl+4DNRf3r826yIlBIl0FpNp2LXLwU4G3C59XuQy53tMxSkK8JV7gt6Nleya+1FBvRo4z3c5/3FU6/WIBSaACmJJxBpBJCUmnmoIqp3Ba0bmesAA/iZ3/c3X1jP5SlIQwdgmb3MrkJ9yzXOnx7P35tPUGqlOa0TDJkdRQC9KRrqJfsBrN7Qo6q1Y0BlEyMEa9U9/5s186ntXuzJJcDcGZ7Lyq5lv+8UM1JrClvY+sPn24u6SATB04Pn5ZKhcH7cj1Tc+SH7Go6s86JXgO14h2y6W81W6RDEcNqPap1846NRlnACpy5c1/GkgMQ6slD4afQ5Jp0O7z+t36tmeQJoTzDk1GIO155lL97JHbn4FopTsgueHF09rWQL6vgX/zFtniL4oIc/0YG67x14Zdr2HrOx8mOBunMZ94LKwFDb8Hfhb9g+rl9bUuY/VNbcUX4HMviycKiOylQdAQwOE4iIqBDFTTOm1Lf0jnl+A9AHg7rNevq+ba1ocvR0TAXzimXI1J2+p3M9ZDOkFUcWkRSNLXHXkAIihuGXglZWbNc+c3w6rJ23sEd2M0mr304LgnSefkX0ngJsiPW9QXJMxsbkx2zto1dXu3+0A4UcdAFvs1HtnrwuD4AIp9Nx/iKZEZGgPsUWuXzpl8FuoegIHjnCuoWxMx8BX2vq4j2hx+lFjxX4P+GNvV0+7rA5hD4Xw4gfG4s/uv38zGZqvXIqyvPqwd6PkqKHJRoHgyWVv4inKaHi2VMeMdln5RaG3xA3ZuYbWuv+ZLXUhJ6QTeuE3fahi0hHnyk+Gki+SZewIHlc4WGUu//m/KKovlfmGJWwKeEI3oSBuin8JkKuMpn6Kikf37CA3yTpeI9kpNW/QoEn0WWp1FRT50gepiu2cgjFABw83mRb3Q5aLmn/q07mKt0sWK8KnBGlLIM4 hh1l53JU/yR+cE0mW1wzfnGalYXYf8rBFGf4FGdG69tkW3xcms4OqliiddPyJLGDhBm2jnGgWF5Fzw5TQayWzxNuTlmtZanVbJSm3BsBGBNTx2251Htq4SzPW55In6A/PrKuTLgiI9msfiSKU+yFTnGo0NvruYG6kGMOM/qTc4qB0FAjLXFg2xB+OZmmtJy6KPLnGIY+o7fGNIgPfxHoVNF64238SuJOFoVXPsG0YAPC7OWpIN1ncJ2Uui8sLRnXfBvFOy324ydxpp18vVAllRhpDhtV1zwDSnE/kdsdFNWztjCS7hTnP5Op2tY0IBSkB8j2PliDnoJPB9in13Q7IijN7AFBax4E3jxpbLLDXze3cAAN3AiCeLKoIZgrTZBCpEEK3VDUbcImxZrDL3lnAHQaJ3w7APTBSjGk8xWdpgoWkPMt9inYZCEo0CwQzFk3cdMWyUytlRvAl2wVw2mRGs0rNVSOtGlZ/Y3RfG1wuWIovlN/zTjiy8ttFK4rfBKgvDxYH+R5pp1baa4ku3xmZNXoLtrA5ZV+G1C8svXw9xEY5i5ZyzI0jD9j/1n857exv6OklESD3f00GaOW61P/r3VqPjAe+5wF1O9nLzQTkaJhu51/+pynHB5OpVqh/Rif63 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z3-20020a05640235c300b0056101f4ecadsi2016430edc.464.2024.02.11.10.57.26; Sun, 11 Feb 2024 10:57:26 -0800 (PST) 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=@gmail.com header.s=20230601 header.b=ALyFVueE; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 99B886807D3; Sun, 11 Feb 2024 20:57:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B7FAB6807D3 for ; Sun, 11 Feb 2024 20:57:16 +0200 (EET) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1d7881b1843so23346035ad.3 for ; Sun, 11 Feb 2024 10:57:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707677834; x=1708282634; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=4XMnkyae5FOdbmfowpLwTF+7Vp9O5r+Ma8ivA6c/fh0=; b=ALyFVueEseK1jej5MGolLpYHtD6LdzlF5BZjBlUdFoIgCGguFd45KjIZu0iDZmCDMS uvejDDxQKw2MaDDOthwwjIGwwU20CdtdjoMryDKPuxasG0sF2lo7SCS6mAJwYYEAWS2w GXMrWiRzSTxVUx1mu3xcqciU7wRxa36IPpRR0/5I35Q8AZwXOA30+0BcaopGKcu1uSBQ A4Z9nEYc0v5FnrqfVv+LieI77SaHU8XMXhF7kuAhePR/6fHRi9kdbF2yk7Pcr7qVNT8P TL1hZZ6tOH+kjhw+NjZOI/jennTrA7FYezBT0pLje0D8oKnCeKAucUlNBeq86R50spde R3gA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707677834; x=1708282634; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=4XMnkyae5FOdbmfowpLwTF+7Vp9O5r+Ma8ivA6c/fh0=; b=aU430Dr3oJjbze658wcUdaTq5092ikMQ0mUXj5fxiHNBrETDrVkAHujmBe2Ohw9TI4 x0/e7PYkB9Fia9i2enyrQvg7hera2oGALkYfdUsIO2l3D5/jo7rfzRJ4AgC+KLjjqDXo SZt6/BsExYV7umOufDBBt8kc7tNCSlPVhGtMMZBH2DL79zVUvma5kw6oD1Y6lkeEGE71 qGYti4XJyVing0D+RQnsADUiHHdm4wnlIy7ekuZGx5H5cbaip9givoOfb2H5pzAz7XAi oLhyUpXAKAznx/sFfzmv9MW5vdmxejwN7EWdw+sqgG6SFLgiATtgz6oCWPSbM/Ap/bVS NtOA== X-Gm-Message-State: AOJu0YyzPvdnsXA2W20tHjPsdfhDcRf7KsTSgR9Inc/GwlHfoWsI161V W3EiO86X5lAgc9MIKPEoU7FO+UrubY+58908J+Z4r/N2/80dknfx/PIS8pYA X-Received: by 2002:a17:902:ea0d:b0:1d8:fb17:a1fe with SMTP id s13-20020a170902ea0d00b001d8fb17a1femr6552880plg.48.1707677834047; Sun, 11 Feb 2024 10:57:14 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id q13-20020a170902a3cd00b001d8accb025fsm4778166plb.197.2024.02.11.10.57.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 10:57:13 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Feb 2024 15:56:58 -0300 Message-ID: <20240211185701.9327-1-jamrial@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4 v10] avformat: add a Tile Grid stream group type 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: EuUOgbf2P8gP This will be used to support tiled image formats like HEIF. Signed-off-by: James Almer --- There can be more tiles than streams in the group now, which makes it possible to parse C021.heic libavformat/avformat.c | 5 ++ libavformat/avformat.h | 147 +++++++++++++++++++++++++++++++++++++++++ libavformat/dump.c | 29 ++++++++ libavformat/options.c | 34 ++++++++++ 4 files changed, 215 insertions(+) diff --git a/libavformat/avformat.c b/libavformat/avformat.c index ca31d3dc56..f53ba4ce58 100644 --- a/libavformat/avformat.c +++ b/libavformat/avformat.c @@ -99,6 +99,11 @@ void ff_free_stream_group(AVStreamGroup **pstg) av_iamf_mix_presentation_free(&stg->params.iamf_mix_presentation); break; } + case AV_STREAM_GROUP_PARAMS_TILE_GRID: + av_opt_free(stg->params.tile_grid); + av_freep(&stg->params.tile_grid->offsets); + av_freep(&stg->params.tile_grid); + break; default: break; } diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 5d0fe82250..92751e5aee 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1018,10 +1018,156 @@ typedef struct AVStream { int pts_wrap_bits; } AVStream; +/** + * AVStreamGroupTileGrid holds information on how to combine several + * independent images on a single canvas for presentation. + * + * The following is an example of a simple grid with 3 rows and 4 columns: + * + * +---+---+---+---+ + * | 0 | 1 | 2 | 3 | + * +---+---+---+---+ + * | 4 | 5 | 6 | 7 | + * +---+---+---+---+ + * | 8 | 9 |10 |11 | + * +---+---+---+---+ + * + * Assuming all tiles have a dimension of 512x512, the + * @ref AVStreamGroupTileGrid.offsets "offset" of the topleft pixel of + * the first @ref AVStreamGroup.streams "stream" in the group is "0,0", the + * @ref AVStreamGroupTileGrid.offsets "offset" of the topleft pixel of + * the second @ref AVStreamGroup.streams "stream" in the group is "512,0", the + * @ref AVStreamGroupTileGrid.offsets "offset" of the topleft pixel of + * the fifth @ref AVStreamGroup.streams "stream" in the group is "0,512", the + * @ref AVStreamGroupTileGrid.offsets "offset", of the topleft pixel of + * the sixth @ref AVStreamGroup.streams "stream" in the group is "512,512", + * etc. + * + * The following is an example of a canvas with overlaping tiles: + * + * +---------------+ + * |***** | + * |* 0##### | + * |***# 1 # | + * | ##### | + * | | + * | | + * | | + * +---------------+ + * + * Assuming a canvas with size 2048x2048 and both tiles with a dimension of + * 512x512, a possible @ref AVStreamGroupTileGrid.offsets "offset" for the + * topleft pixel of the first @ref AVStreamGroup.streams "stream" in the group + * would be 256x256, and the @ref AVStreamGroupTileGrid.offsets "offset" for + * the topleft pixel of the second @ref AVStreamGroup.streams "stream" in the + * group would be 512x512. + * + * sizeof(AVStreamGroupTileGrid) is not a part of the ABI and may only be + * allocated by avformat_stream_group_create(). + */ +typedef struct AVStreamGroupTileGrid { + const AVClass *av_class; + + /** + * Amount of tiles in the grid. + * + * Must be > 0. + */ + unsigned int nb_tiles; + + /** + * Width of the canvas. + * + * Must be > 0. + */ + int coded_width; + /** + * Width of the canvas. + * + * Must be > 0. + */ + int coded_height; + + /** + * An @ref nb_tiles sized array of offsets in pixels from the topleft edge + * of the canvas, indicating where each stream should be placed. + * It must be allocated with the av_malloc() family of functions. + * + * - demuxing: set by libavformat, must not be modified by the caller. + * - muxing: set by the caller before avformat_write_header(). + * + * Freed by libavformat in avformat_free_context(). + */ + struct { + /** + * Index of the stream in the group this tile references. + * + * Must be < @ref AVStreamGroup.nb_streams "nb_streams". + */ + unsigned int idx; + /** + * Offset in pixels from the left edge of the canvas where the tile + * should be placed. + */ + int horizontal; + /** + * Offset in pixels from the top edge of the canvas where the tile + * should be placed. + */ + int vertical; + } *offsets; + + /** + * The pixel value per channel in RGBA format used if no pixel of any tile + * is located at a particular pixel location. + * + * @see av_image_fill_color(). + * @see av_parse_color(). + */ + uint8_t background[4]; + + /** + * Offset in pixels from the left edge of the canvas where the actual image + * meant for presentation starts. + * + * This field must be >= 0 and < @ref coded_width. + */ + int horizontal_offset; + /** + * Offset in pixels from the top edge of the canvas where the actual image + * meant for presentation starts. + * + * This field must be >= 0 and < @ref coded_height. + */ + int vertical_offset; + + /** + * Width of the final image for presentation. + * + * Must be > 0 and <= (@ref coded_width - @ref horizontal_offset). + * When it's not equal to (@ref coded_width - @ref horizontal_offset), the + * result of (@ref coded_width - width - @ref horizontal_offset) is the + * amount amount of pixels to be cropped from the right edge of the + * final image before presentation. + */ + int width; + /** + * Height of the final image for presentation. + * + * Must be > 0 and <= (@ref coded_height - @ref vertical_offset). + * When it's not equal to (@ref coded_height - @ref vertical_offset), the + * result of (@ref coded_height - height - @ref vertical_offset) is the + * amount amount of pixels to be cropped from the bottom edge of the + * final image before presentation. + */ + int height; +} AVStreamGroupTileGrid; + enum AVStreamGroupParamsType { AV_STREAM_GROUP_PARAMS_NONE, AV_STREAM_GROUP_PARAMS_IAMF_AUDIO_ELEMENT, AV_STREAM_GROUP_PARAMS_IAMF_MIX_PRESENTATION, + AV_STREAM_GROUP_PARAMS_TILE_GRID, }; struct AVIAMFAudioElement; @@ -1062,6 +1208,7 @@ typedef struct AVStreamGroup { union { struct AVIAMFAudioElement *iamf_audio_element; struct AVIAMFMixPresentation *iamf_mix_presentation; + struct AVStreamGroupTileGrid *tile_grid; } params; /** diff --git a/libavformat/dump.c b/libavformat/dump.c index 9d37179bb7..756db8c87e 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -22,6 +22,7 @@ #include #include +#include "libavutil/avstring.h" #include "libavutil/channel_layout.h" #include "libavutil/display.h" #include "libavutil/iamf.h" @@ -738,6 +739,34 @@ static void dump_stream_group(const AVFormatContext *ic, uint8_t *printed, } break; } + case AV_STREAM_GROUP_PARAMS_TILE_GRID: { + const AVStreamGroupTileGrid *tile_grid = stg->params.tile_grid; + AVCodecContext *avctx = avcodec_alloc_context3(NULL); + const char *ptr = NULL; + av_log(NULL, AV_LOG_INFO, " Tile Grid:"); + if (avctx && stg->nb_streams && !avcodec_parameters_to_context(avctx, stg->streams[0]->codecpar)) { + avctx->width = tile_grid->width; + avctx->height = tile_grid->height; + avctx->coded_width = tile_grid->coded_width; + avctx->coded_height = tile_grid->coded_height; + if (ic->dump_separator) + av_opt_set(avctx, "dump_separator", ic->dump_separator, 0); + buf[0] = 0; + avcodec_string(buf, sizeof(buf), avctx, is_output); + ptr = av_stristr(buf, " "); + } + avcodec_free_context(&avctx); + if (ptr) + av_log(NULL, AV_LOG_INFO, "%s", ptr); + av_log(NULL, AV_LOG_INFO, "\n"); + dump_metadata(NULL, stg->metadata, " ", AV_LOG_INFO); + for (int i = 0; i < stg->nb_streams; i++) { + const AVStream *st = stg->streams[i]; + dump_stream_format(ic, st->index, i, index, is_output, AV_LOG_VERBOSE); + printed[st->index] = 1; + } + break; + } default: break; } diff --git a/libavformat/options.c b/libavformat/options.c index 03e6a2a7ff..a323aa7fe6 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -339,6 +339,28 @@ fail: return NULL; } +#define FLAGS AV_OPT_FLAG_ENCODING_PARAM | AV_OPT_FLAG_VIDEO_PARAM +#define OFFSET(x) offsetof(AVStreamGroupTileGrid, x) +static const AVOption tile_grid_options[] = { + { "grid_size", "size of the output canvas", OFFSET(coded_width), + AV_OPT_TYPE_IMAGE_SIZE, { .str = NULL }, 0, INT_MAX, FLAGS }, + { "output_size", "size of valid pixels in output image meant for presentation", OFFSET(width), + AV_OPT_TYPE_IMAGE_SIZE, { .str = NULL }, 0, INT_MAX, FLAGS }, + { "background_color", "set a background color for unused pixels", + OFFSET(background), AV_OPT_TYPE_COLOR, { .str = "black"}, 0, 0, FLAGS }, + { "horizontal_offset", NULL, OFFSET(horizontal_offset), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FLAGS }, + { "vertical_offset", NULL, OFFSET(vertical_offset), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FLAGS }, + { NULL }, +}; +#undef FLAGS +#undef OFFSET + +static const AVClass tile_grid_class = { + .class_name = "AVStreamGroupTileGrid", + .version = LIBAVUTIL_VERSION_INT, + .option = tile_grid_options, +}; + static void *stream_group_child_next(void *obj, void *prev) { AVStreamGroup *stg = obj; @@ -348,6 +370,8 @@ static void *stream_group_child_next(void *obj, void *prev) return stg->params.iamf_audio_element; case AV_STREAM_GROUP_PARAMS_IAMF_MIX_PRESENTATION: return stg->params.iamf_mix_presentation; + case AV_STREAM_GROUP_PARAMS_TILE_GRID: + return stg->params.tile_grid; default: break; } @@ -370,6 +394,9 @@ static const AVClass *stream_group_child_iterate(void **opaque) case AV_STREAM_GROUP_PARAMS_IAMF_MIX_PRESENTATION: ret = av_iamf_mix_presentation_get_class(); break; + case AV_STREAM_GROUP_PARAMS_TILE_GRID: + ret = &tile_grid_class; + break; default: break; } @@ -431,6 +458,13 @@ AVStreamGroup *avformat_stream_group_create(AVFormatContext *s, if (!stg->params.iamf_mix_presentation) goto fail; break; + case AV_STREAM_GROUP_PARAMS_TILE_GRID: + stg->params.tile_grid = av_mallocz(sizeof(*stg->params.tile_grid)); + if (!stg->params.tile_grid) + goto fail; + stg->params.tile_grid->av_class = &tile_grid_class; + av_opt_set_defaults(stg->params.tile_grid); + break; default: goto fail; } From patchwork Sun Feb 11 18:56:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 46189 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9002:b0:19e:cdac:8cce with SMTP id d2csp310770pzc; Sun, 11 Feb 2024 10:57:36 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXN5XSpBHq1LwcWDmOvTOHlLibgiLEog/MGxeO5WvFzFZWpPv8ZWBMnajWvgwKQUj817gu0OsYura7FjRiDzuHOcSPEVbXTd06qmg== X-Google-Smtp-Source: AGHT+IGV9W7VgS71gtrGW5Sa980MyBjyKDSJqiAWz6XHdVTXFkGWb6j6YoZHAsm0phvfEYwyORfR X-Received: by 2002:a17:906:abcd:b0:a3c:9a23:f54a with SMTP id kq13-20020a170906abcd00b00a3c9a23f54amr641136ejb.32.1707677856392; Sun, 11 Feb 2024 10:57:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707677856; cv=none; d=google.com; s=arc-20160816; b=Xy4ndfV6DKNthIzCSDj5beZthRpoMHYTSxw6qeDnkMg7wMWYC+ab94bKvDhkLc7273 D+ZGvBrbzK6cB7IKbTGbM+vudRcCOoEmQOWQVBw2s6ffZ4zNOnqODsMJ7Je80Ue+oKWv GdpTMWgmmhmYTQFEQ6N1Bp0MFgNFVUfrX9MZ7X4TubXUI2jej9nC4RlKxh+6FM1AbgGT k8XyD3RZXqb2wMKPjt6N3Z9klkacUhBDZq3TYtOtXQZ4jUofPxtwO+GCW/KzBKWAmSvU oUTc/PRhooARwXf7IbyUFq1gh/PQlK8z46Um0dAok4AAtmm1DVQgr+02WFTDgjoa7m7M UFZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=xV+7JFc5fq/bBxoUNT+OcYKzXi9nQoN2rQhQOcVIVls=; fh=sFrGXPJtuehBHrFSsUVo9OWqJm6cVurzavawn6WTHR8=; b=kiHq/vA/9RMUuRquefCrVLWuHpsj42Eves1UXfevUwjYf8XQoKNvXkOdUZHC8R53Xn x+yWD5pqYUWewEeN65Id9veVA3ocFeBvaCF6T1kyvebqNEMFlhtGXcn2Pk7jrbkFXi2h MAi4QK+smpRMQS+ce1iuZxLtLFP0KnVjsJ8i5x0s3yQzw+4U+RhgD82/oZP3qMuy0s5b Py/T3IFBLsjcPHKvM2kRWaGQP/po5mgJtLjcepPbf5Fj0KpKf9Xj1Mo46U1cLxOOqacz wRZ54utjGZEUA1EagXJkUV9Ib4+DZKvFIVe1IcWCpIHESBnOLgi/qNRExwxtjXOd2cCv gAzQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=V4VQ0r4E; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com X-Forwarded-Encrypted: i=1; AJvYcCWsqKffmBMznznA4Cwne6dmVeoCvWPvtEb7lS9WqE9c874T3ck8JMHqkEzp5HZ7OTTUZDSbFayQX5It1N1I13yuwvoClixfStG7oyQ6Wimq5w0ZaeHCLPawXQrTwqKADyez7aY5Hcv3r+qqJO4IsMPTkjJr0TCgMx3UmLv7VxcNGDLUNZdY0bHOV0aUkyyTA8sbnJkIODf07ePStNlcoIojRNHNDahjngnT3UfNeJVaOoCwKVaaCJx13ceCMK1/fWTwM7pO4yWrA1UznaaxSMgT+2kx1kMCnurBKrv9No41pqLm7pkTr2ZIkEF5cih6ppOH5+UYioVIoANSRlUgwAMS0CLORWxKyW9kPjYKYzCeSohxsSOJk7D+Kk0bM/dn+mVN75v0r63MYjvPtfeXvP5liMtOWt4aQDZVs/BS6n8b2KcG5UX5a+FJcewmg8wIwbiG2C9mltWifdRGWsskOvUVPmRNtjuok0YVE18xvmeNWjoEtMfwHTBciL+Lm8tqRIJVlfPoXNsLxGXgzv7+JfC6CkDRUIgedv7uBm2jEX4lLWwmr2j5NUYIivAhiz1upIX0sXihtLJ0xuZn3cT7Ec+NkuGIuXrip7sD5niUncaH+JMG++3LMUJgDpZWTeUNAzE2tKBGc/N0RUN/z8hSuVd0iisAxPG2+J22DrcAzwYHhkJZlgkDoci62QUW/glPSTrOJ/BqxIIB8WnU/sxPPOrVSr70dQNUOOc1ElQQ/+HnGt8WwJsLxCJGvDs2O9biZnpnEGWmEnz2iQkR+JGk7G74gWVk/yyh782Iq+0raGq273v+BGIeNpiuezwsM9u1t+dTFP8DzXY03x1ECm2ISZNcDmGtzMKyW7A2A2RcHV+LaCjnTp9qTk2SFkxKQ8Gr8JcKhHBPov56d5QKKE/ZHQ26WQNH3IQJHp/jBQzYalELwbbhcqeVxwAkAQouUygf6em7bt 10LYUb+7qHX8hA/alMgGZ9Vhp0rts5/T7w3giBO3SksO2u5/BUXxuugmYfNv85KXusNVZRn7eKFWpN9j5ofwrhcQPnXkAyo/+D5NEDhoPf+ogaOrW+KmLai2w9HFtgdx5r5a+ZuzErGUqbkTcmVss+Op7bLdsYltELvOSpZ7cjzvyiaR3IAUfecPUKI5M028P1cOdSX4RYZF3pp4M6bMhbM/zRUJzhrTRbvmaVP66a7932LLKiYBE+0BvaF//00pdZOotKuscV1GTo6oUgVhrt8etEVPEuNNOBhqG7mpQY16k1JhUJgDPzOwv9IBkrRkyjeYC+NJ0EZYhQIkStcpgJUsZbUG3V8pW6UjYG4mHjNxvVNHYerfm3T0gOl8olSkofRmGhyClCF6kjIryC0gZQymAFtUkZpg1B6sJLHacTW671jvI92Oq7Qy6ZZWruxixESBl9dBIzs6MW7dnpf8/6xpEGfMb3A2Cw6dPO70MG1V2dfjh5DpkllCK3qr9EI9yURIrlUG1KX950K9LXpjlM5SGrKljClVV46Dpg67pTxIAyDbXdIeirE2xaAYx7NAtbXiWt/pEhmXD6BTvp7/VWv3dhtPllhD/hDyOJqKzStBJX4dPowRVDRZ31F3KHZBsC Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ky24-20020a170907779800b00a3bd8c53a08si3005085ejc.893.2024.02.11.10.57.35; Sun, 11 Feb 2024 10:57:36 -0800 (PST) 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=@gmail.com header.s=20230601 header.b=V4VQ0r4E; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C168668CF92; Sun, 11 Feb 2024 20:57:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C9C1B68CBFD for ; Sun, 11 Feb 2024 20:57:18 +0200 (EET) Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1d93edfa76dso20705455ad.1 for ; Sun, 11 Feb 2024 10:57:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707677836; x=1708282636; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ym85Xkki+3rsr9m5X4ZVTXT8oXpBcS7WmtQGe45dxJw=; b=V4VQ0r4ECGjWiwW8Ev3l48I7xHhHTiZS4pFKkykFhvhxYR6Q9SnZGLKlCMdloZ1TJg VFGBZ0HrrMuGa0/7Rj4vAIQL7779AMK408oX9WEuLpgS9E0PqirWxn0uJb+wnC5Sk58g loclslXgm6/OEArQvbdaozD36ODAsLKZEXkZpBFsPsrQC7PnZsRr0FK/HBAjQ/CLEapr HdO3UFdtaL4TZ5zfroJD+XWy4H6vWgVVK5vC/Km3sG2HxUEe2GafPP2BECikbM+RQAmR GRIwq7FKVRRTa0evexAkqVOD5MWl96rKjuovKjaS/RQxz6N+r+TFvWBl6N9IeBaXhzdy Xvfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707677836; x=1708282636; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ym85Xkki+3rsr9m5X4ZVTXT8oXpBcS7WmtQGe45dxJw=; b=DL6V6L+2lFb0uiNzJXO6mxB0Q3VF4rmUALEdUOmToE471UBOWwRdudJILh6MVHQ0CM Eonh2N8YqDuAPs8lMhloktEkhKxJMtz6yVUpigq/nnRhUMhTAGSIgIvnZ2T4vaL/cONl ppGe3tvm+gSwauVWWH4sIqdZmpQ4HFh02fpQXq7rKehhbMLC90VyoJUnCXBpDzqWk16q n48kitWnGOj35p2xEuhwcWGQsDF/y90/wsZjCgAYIqngBMiLSmH2R4dRXffdJ3o3MjEN XEV43mDtIktaa/3lN+eGLDWemWSYVkim11aMOxN0we0a0d1DwvMaqSAMdynsglKseMj3 Njzg== X-Gm-Message-State: AOJu0Yycv55NMOcTKPS+u+vO/tsjNZKuj/fJwc8jw4xbb5aftYG1ESkz wD0N4D6jpSJTm/1++61xsLjskIk5W26QBW2AYfaFCgyIy3WXWvHFdF5uTBkg X-Received: by 2002:a17:902:c403:b0:1d9:63ac:f54a with SMTP id k3-20020a170902c40300b001d963acf54amr7271520plk.36.1707677835992; Sun, 11 Feb 2024 10:57:15 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id q13-20020a170902a3cd00b001d8accb025fsm4778166plb.197.2024.02.11.10.57.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 10:57:14 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Feb 2024 15:56:59 -0300 Message-ID: <20240211185701.9327-2-jamrial@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240211185701.9327-1-jamrial@gmail.com> References: <20240211185701.9327-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4 v8] avformat/mov: add support for tile HEIF still images 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: d/lkqTX0gQhM Export tiles as streams, and the grid information as a Stream Group of type TILE_GRID. This also enables exporting other stream items like thumbnails, which may be present in non tiled HEIF images too. Based on a patch by Swaraj Hota Signed-off-by: James Almer --- libavformat/avformat.c | 8 + libavformat/avformat.h | 6 + libavformat/dump.c | 2 + libavformat/internal.h | 5 + libavformat/isom.h | 16 +- libavformat/mov.c | 492 +++++++++++++++++++++++++++++++++++++---- 6 files changed, 484 insertions(+), 45 deletions(-) diff --git a/libavformat/avformat.c b/libavformat/avformat.c index f53ba4ce58..eb898223d2 100644 --- a/libavformat/avformat.c +++ b/libavformat/avformat.c @@ -119,6 +119,14 @@ void ff_remove_stream(AVFormatContext *s, AVStream *st) ff_free_stream(&s->streams[ --s->nb_streams ]); } +void ff_remove_stream_group(AVFormatContext *s, AVStreamGroup *stg) +{ + av_assert0(s->nb_stream_groups > 0); + av_assert0(s->stream_groups[ s->nb_stream_groups - 1 ] == stg); + + ff_free_stream_group(&s->stream_groups[ --s->nb_stream_groups ]); +} + /* XXX: suppress the packet queue */ void ff_flush_packet_queue(AVFormatContext *s) { diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 92751e5aee..27b052bad5 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -811,6 +811,12 @@ typedef struct AVIndexEntry { * The video stream contains still images. */ #define AV_DISPOSITION_STILL_IMAGE (1 << 20) +/** + * The video stream is intended to be merged with another stream before + * presentation. + * Used for example to signal the stream contains a tile from a HEIF grid. + */ +#define AV_DISPOSITION_TILE (1 << 21) /** * @return The AV_DISPOSITION_* flag corresponding to disp or a negative error diff --git a/libavformat/dump.c b/libavformat/dump.c index 756db8c87e..6123ca58a5 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -657,6 +657,8 @@ static void dump_stream_format(const AVFormatContext *ic, int i, av_log(NULL, log_level, " (still image)"); if (st->disposition & AV_DISPOSITION_NON_DIEGETIC) av_log(NULL, log_level, " (non-diegetic)"); + if (st->disposition & AV_DISPOSITION_TILE) + av_log(NULL, log_level, " (tile)"); av_log(NULL, log_level, "\n"); dump_metadata(NULL, st->metadata, extra_indent, log_level); diff --git a/libavformat/internal.h b/libavformat/internal.h index c66f959e9f..5603ca1ab5 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -637,6 +637,11 @@ void ff_remove_stream(AVFormatContext *s, AVStream *st); * is not yet attached to an AVFormatContext. */ void ff_free_stream_group(AVStreamGroup **pstg); +/** + * Remove a stream group from its AVFormatContext and free it. + * The stream group must be the last stream group of the AVFormatContext. + */ +void ff_remove_stream_group(AVFormatContext *s, AVStreamGroup *stg); unsigned int ff_codec_get_tag(const AVCodecTag *tags, enum AVCodecID id); diff --git a/libavformat/isom.h b/libavformat/isom.h index a4cca4c798..d96722fe79 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -267,15 +267,25 @@ typedef struct MOVStreamContext { typedef struct HEIFItem { AVStream *st; + char *name; int item_id; int64_t extent_length; int64_t extent_offset; - int64_t size; + int tile_rows; + int tile_cols; int width; int height; int type; + int is_idat_relative; } HEIFItem; +typedef struct HEIFGrid { + HEIFItem *item; + unsigned int *tile_idx_list; + int16_t *tile_id_list; + int nb_tiles; +} HEIFGrid; + typedef struct MOVContext { const AVClass *class; ///< class for private options AVFormatContext *fc; @@ -339,6 +349,10 @@ typedef struct MOVContext { int cur_item_id; HEIFItem *heif_item; int nb_heif_item; + HEIFGrid *heif_grid; + int nb_heif_grid; + int thmb_item_id; + int64_t idat_offset; int interleaved_read; } MOVContext; diff --git a/libavformat/mov.c b/libavformat/mov.c index 42b0135987..23343c7ae2 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -185,6 +185,30 @@ static int mov_read_mac_string(MOVContext *c, AVIOContext *pb, int len, return p - dst; } +static AVStream *get_curr_st(MOVContext *c) +{ + AVStream *st = NULL; + + if (c->fc->nb_streams < 1) + return NULL; + + for (int i = 0; i < c->nb_heif_item; i++) { + HEIFItem *item = &c->heif_item[i]; + + if (!item->st) + continue; + if (item->st->id != c->cur_item_id) + continue; + + st = item->st; + break; + } + if (!st) + st = c->fc->streams[c->fc->nb_streams-1]; + + return st; +} + static int mov_read_covr(MOVContext *c, AVIOContext *pb, int type, int len) { AVStream *st; @@ -1767,9 +1791,9 @@ static int mov_read_colr(MOVContext *c, AVIOContext *pb, MOVAtom atom) uint16_t color_primaries, color_trc, color_matrix; int ret; - if (c->fc->nb_streams < 1) + st = get_curr_st(c); + if (!st) return 0; - st = c->fc->streams[c->fc->nb_streams - 1]; ret = ffio_read_size(pb, color_parameter_type, 4); if (ret < 0) @@ -2117,9 +2141,9 @@ static int mov_read_glbl(MOVContext *c, AVIOContext *pb, MOVAtom atom) AVStream *st; int ret; - if (c->fc->nb_streams < 1) + st = get_curr_st(c); + if (!st) return 0; - st = c->fc->streams[c->fc->nb_streams-1]; if ((uint64_t)atom.size > (1<<30)) return AVERROR_INVALIDDATA; @@ -4951,12 +4975,10 @@ static int heif_add_stream(MOVContext *c, HEIFItem *item) st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; st->codecpar->codec_id = mov_codec_id(st, item->type); 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; @@ -7809,11 +7831,18 @@ static int mov_read_pitm(MOVContext *c, AVIOContext *pb, MOVAtom atom) return atom.size; } +static int mov_read_idat(MOVContext *c, AVIOContext *pb, MOVAtom atom) +{ + c->idat_offset = avio_tell(pb); + return 0; +} + static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) { + HEIFItem *heif_item; int version, offset_size, length_size, base_offset_size, index_size; int item_count, extent_count; - uint64_t base_offset, extent_offset, extent_length; + int64_t base_offset, extent_offset, extent_length; uint8_t value; if (c->found_moov) { @@ -7832,17 +7861,20 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) base_offset_size = (value >> 4) & 0xF; index_size = !version ? 0 : (value & 0xF); if (index_size) { - av_log(c->fc, AV_LOG_ERROR, "iloc: index_size != 0 not supported.\n"); + avpriv_report_missing_feature(c->fc, "iloc: index_size != 0"); return AVERROR_PATCHWELCOME; } item_count = (version < 2) ? avio_rb16(pb) : avio_rb32(pb); - if (!c->heif_item) { - c->heif_item = av_calloc(item_count, sizeof(*c->heif_item)); - if (!c->heif_item) - return AVERROR(ENOMEM); - c->nb_heif_item = item_count; - } + heif_item = av_realloc_array(c->heif_item, item_count, sizeof(*c->heif_item)); + if (!heif_item) + return AVERROR(ENOMEM); + c->heif_item = heif_item; + if (item_count > c->nb_heif_item) + memset(c->heif_item + c->nb_heif_item, 0, + sizeof(*c->heif_item) * (item_count - c->nb_heif_item)); + c->nb_heif_item = FFMAX(c->nb_heif_item, item_count); + c->cur_item_id = 0; av_log(c->fc, AV_LOG_TRACE, "iloc: item_count %d\n", item_count); for (int i = 0; i < item_count; i++) { @@ -7852,7 +7884,7 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (avio_feof(pb)) return AVERROR_INVALIDDATA; if (offset_type > 1) { - avpriv_request_sample(c->fc, "iloc offset type %d", offset_type); + avpriv_report_missing_feature(c->fc, "iloc offset type %d", offset_type); return AVERROR_PATCHWELCOME; } c->heif_item[i].item_id = item_id; @@ -7863,13 +7895,15 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) extent_count = avio_rb16(pb); if (extent_count > 1) { // For still AVIF images, we only support one extent item. - av_log(c->fc, AV_LOG_ERROR, "iloc: extent_count > 1 not supported\n"); + avpriv_report_missing_feature(c->fc, "iloc: extent_count > 1"); 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; + if (offset_type == 1) + c->heif_item[i].is_idat_relative = 1; c->heif_item[i].extent_length = extent_length; c->heif_item[i].extent_offset = base_offset + extent_offset; av_log(c->fc, AV_LOG_TRACE, "iloc: item_idx %d, offset_type %d, " @@ -7884,7 +7918,7 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) static int mov_read_infe(MOVContext *c, AVIOContext *pb, MOVAtom atom) { - char item_name[128]; + AVBPrint item_name; int64_t size = atom.size; uint32_t item_type; int item_id; @@ -7894,27 +7928,32 @@ static int mov_read_infe(MOVContext *c, AVIOContext *pb, MOVAtom atom) avio_rb24(pb); // flags. size -= 4; - if (version != 2) { - av_log(c->fc, AV_LOG_ERROR, "infe: version != 2 not supported\n"); + if (version < 2) { + av_log(c->fc, AV_LOG_ERROR, "infe: version < 2 not supported\n"); return AVERROR_PATCHWELCOME; } - item_id = avio_rb16(pb); + item_id = version > 2 ? avio_rb32(pb) : avio_rb16(pb); avio_rb16(pb); // item_protection_index item_type = avio_rl32(pb); size -= 8; - size -= avio_get_str(pb, INT_MAX, item_name, sizeof(item_name)); - av_log(c->fc, AV_LOG_TRACE, "infe: item_id %d, item_type %s, item_name %s\n", - item_id, av_fourcc2str(item_type), item_name); + av_bprint_init(&item_name, 0, AV_BPRINT_SIZE_UNLIMITED); + ret = ff_read_string_to_bprint_overwrite(pb, &item_name, size); + if (ret < 0) { + av_bprint_finalize(&item_name, NULL); + return ret; + } - // Skip all but the primary item until support is added - if (item_id != c->primary_item_id) - return 0; + av_log(c->fc, AV_LOG_TRACE, "infe: item_id %d, item_type %s, item_name %s\n", + item_id, av_fourcc2str(item_type), item_name.str); + size -= ret + 1; if (size > 0) avio_skip(pb, size); + if (ret) + av_bprint_finalize(&item_name, &c->heif_item[c->cur_item_id].name); c->heif_item[c->cur_item_id].item_id = item_id; c->heif_item[c->cur_item_id].type = item_type; @@ -7925,9 +7964,6 @@ static int mov_read_infe(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (ret < 0) return ret; break; - default: - av_log(c->fc, AV_LOG_TRACE, "infe: ignoring item_type %s\n", av_fourcc2str(item_type)); - break; } c->cur_item_id++; @@ -7937,6 +7973,7 @@ static int mov_read_infe(MOVContext *c, AVIOContext *pb, MOVAtom atom) static int mov_read_iinf(MOVContext *c, AVIOContext *pb, MOVAtom atom) { + HEIFItem *heif_item; int entry_count; int version, ret; @@ -7954,13 +7991,14 @@ static int mov_read_iinf(MOVContext *c, AVIOContext *pb, MOVAtom atom) avio_rb24(pb); // flags. entry_count = version ? avio_rb32(pb) : avio_rb16(pb); - if (!c->heif_item) { - c->heif_item = av_calloc(entry_count, sizeof(*c->heif_item)); - if (!c->heif_item) - return AVERROR(ENOMEM); - c->nb_heif_item = entry_count; - } - + heif_item = av_realloc_array(c->heif_item, entry_count, sizeof(*c->heif_item)); + if (!heif_item) + return AVERROR(ENOMEM); + c->heif_item = heif_item; + if (entry_count > c->nb_heif_item) + memset(c->heif_item + c->nb_heif_item, 0, + sizeof(*c->heif_item) * (entry_count - c->nb_heif_item)); + c->nb_heif_item = FFMAX(c->nb_heif_item, entry_count); c->cur_item_id = 0; for (int i = 0; i < entry_count; i++) { @@ -7977,11 +8015,125 @@ static int mov_read_iinf(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; } +static int mov_read_iref_dimg(MOVContext *c, AVIOContext *pb, int version) +{ + HEIFItem *item = NULL; + HEIFGrid *grid; + int entries, i; + int from_item_id = version ? avio_rb32(pb) : avio_rb16(pb); + + for (int i = 0; i < c->nb_heif_grid; i++) { + if (c->heif_grid[i].item->item_id == from_item_id) { + av_log(c->fc, AV_LOG_ERROR, "More than one 'dimg' box " + "referencing the same 'grid'\n"); + return AVERROR_INVALIDDATA; + } + } + for (int i = 0; i < c->nb_heif_item; i++) { + if (c->heif_item[i].item_id != from_item_id) + continue; + item = &c->heif_item[i]; + + switch (item->type) { + case MKTAG('g','r','i','d'): + case MKTAG('i','o','v','l'): + break; + default: + avpriv_report_missing_feature(c->fc, "Derived item of type %s", + av_fourcc2str(item->type)); + return 0; + } + break; + } + if (!item) { + av_log(c->fc, AV_LOG_ERROR, "Missing grid information\n"); + return AVERROR_INVALIDDATA; + } + + grid = av_realloc_array(c->heif_grid, c->nb_heif_grid + 1U, + sizeof(*c->heif_grid)); + if (!grid) + return AVERROR(ENOMEM); + c->heif_grid = grid; + grid = &grid[c->nb_heif_grid++]; + + entries = avio_rb16(pb); + grid->tile_id_list = av_malloc_array(entries, sizeof(*grid->tile_id_list)); + grid->tile_idx_list = av_calloc(entries, sizeof(*grid->tile_idx_list)); + if (!grid->tile_id_list || !grid->tile_idx_list) + return AVERROR(ENOMEM); + /* 'to' item ids */ + for (i = 0; i < entries; i++) + grid->tile_id_list[i] = version ? avio_rb32(pb) : avio_rb16(pb); + grid->nb_tiles = entries; + grid->item = item; + + av_log(c->fc, AV_LOG_TRACE, "dimg: from_item_id %d, entries %d\n", + from_item_id, entries); + + return 0; +} + +static int mov_read_iref_thmb(MOVContext *c, AVIOContext *pb, int version) +{ + int entries; + int to_item_id, from_item_id = version ? avio_rb32(pb) : avio_rb16(pb); + + entries = avio_rb16(pb); + if (entries > 1) { + avpriv_request_sample(c->fc, "thmb in iref referencing several items"); + return AVERROR_PATCHWELCOME; + } + /* 'to' item ids */ + to_item_id = version ? avio_rb32(pb) : avio_rb16(pb); + + if (to_item_id != c->primary_item_id) + return 0; + + c->thmb_item_id = from_item_id; + + av_log(c->fc, AV_LOG_TRACE, "thmb: from_item_id %d, entries %d\n", + from_item_id, entries); + + return 0; +} + static int mov_read_iref(MOVContext *c, AVIOContext *pb, MOVAtom atom) { - avio_rb32(pb); /* version and flags */ + int version = avio_r8(pb); + avio_rb24(pb); // flags atom.size -= 4; - return mov_read_default(c, pb, atom); + + if (version > 1) { + av_log(c->fc, AV_LOG_WARNING, "Unknown iref box version %d\n", version); + return 0; + } + + while (atom.size) { + uint32_t type, size = avio_rb32(pb); + int64_t next = avio_tell(pb); + + if (size < 14 || next < 0 || next > INT64_MAX - size) + return AVERROR_INVALIDDATA; + + next += size - 4; + type = avio_rl32(pb); + switch (type) { + case MKTAG('d','i','m','g'): + mov_read_iref_dimg(c, pb, version); + break; + case MKTAG('t','h','m','b'): + mov_read_iref_thmb(c, pb, version); + break; + default: + av_log(c->fc, AV_LOG_DEBUG, "Unknown iref type %s size %"PRIu32"\n", + av_fourcc2str(type), size); + } + + atom.size -= size; + avio_seek(pb, next, SEEK_SET); + } + return 0; } static int mov_read_ispe(MOVContext *c, AVIOContext *pb, MOVAtom atom) @@ -8104,10 +8256,6 @@ static int mov_read_iprp(MOVContext *c, AVIOContext *pb, MOVAtom atom) av_log(c->fc, AV_LOG_TRACE, "ipma: property_index %d, item_id %d, item_type %s\n", index + 1, item_id, av_fourcc2str(ref->type)); - // Skip properties referencing items other than the primary item until support is added - if (item_id != c->primary_item_id) - continue; - c->cur_item_id = item_id; ret = mov_read_default(c, &ref->b.pub, @@ -8236,6 +8384,7 @@ static const MOVParseTableEntry mov_default_parse_table[] = { { MKTAG('p','c','m','C'), mov_read_pcmc }, /* PCM configuration box */ { MKTAG('p','i','t','m'), mov_read_pitm }, { MKTAG('e','v','c','C'), mov_read_glbl }, +{ MKTAG('i','d','a','t'), mov_read_idat }, { MKTAG('i','r','e','f'), mov_read_iref }, { MKTAG('i','s','p','e'), mov_read_ispe }, { MKTAG('i','p','r','p'), mov_read_iprp }, @@ -8745,7 +8894,14 @@ static int mov_read_close(AVFormatContext *s) av_freep(&mov->aes_decrypt); av_freep(&mov->chapter_tracks); + for (i = 0; i < mov->nb_heif_item; i++) + av_freep(&mov->heif_item[i].name); av_freep(&mov->heif_item); + for (i = 0; i < mov->nb_heif_grid; i++) { + av_freep(&mov->heif_grid[i].tile_id_list); + av_freep(&mov->heif_grid[i].tile_idx_list); + } + av_freep(&mov->heif_grid); return 0; } @@ -8885,6 +9041,229 @@ fail: return ret; } +static int read_image_grid(AVFormatContext *s, AVStreamGroup *stg, + AVStreamGroupTileGrid *tile_grid, HEIFGrid *grid) +{ + MOVContext *c = s->priv_data; + HEIFItem *item = grid->item; + int64_t offset = 0, pos = avio_tell(s->pb); + int x = 0, y = 0, i = 0; + int flags, size; + + if (!(s->pb->seekable & AVIO_SEEKABLE_NORMAL)) { + av_log(c->fc, AV_LOG_INFO, "grid box with non seekable input\n"); + return AVERROR_PATCHWELCOME; + } + if (item->is_idat_relative) { + if (!c->idat_offset) { + av_log(c->fc, AV_LOG_ERROR, "missing idat box required by the image grid\n"); + return AVERROR_INVALIDDATA; + } + offset = c->idat_offset; + } + + avio_seek(s->pb, item->extent_offset + offset, SEEK_SET); + + avio_r8(s->pb); /* version */ + flags = avio_r8(s->pb); + + item->tile_rows = avio_r8(s->pb) + 1; + item->tile_cols = avio_r8(s->pb) + 1; + /* actual width and height of output image */ + tile_grid->width = (flags & 1) ? avio_rb32(s->pb) : avio_rb16(s->pb); + tile_grid->height = (flags & 1) ? avio_rb32(s->pb) : avio_rb16(s->pb); + + av_log(c->fc, AV_LOG_TRACE, "grid: grid_rows %d grid_cols %d output_width %d output_height %d\n", + item->tile_rows, item->tile_cols, tile_grid->width, tile_grid->height); + + avio_seek(s->pb, pos, SEEK_SET); + + size = item->tile_rows * item->tile_cols; + for (int i = 0; i < item->tile_cols; i++) + tile_grid->coded_width += stg->streams[i]->codecpar->width; + for (int i = 0; i < size; i += item->tile_cols) + tile_grid->coded_height += stg->streams[i]->codecpar->height; + + tile_grid->offsets = av_calloc(tile_grid->nb_tiles, sizeof(*tile_grid->offsets)); + if (!tile_grid->offsets) + return AVERROR(ENOMEM); + + while (y < tile_grid->coded_height) { + int left_col = i; + + while (x < tile_grid->coded_width) { + if (i == tile_grid->nb_tiles) + return AVERROR(EINVAL); + + tile_grid->offsets[i].horizontal = x; + tile_grid->offsets[i].vertical = y; + + x += stg->streams[i++]->codecpar->width; + } + + if (x > tile_grid->coded_width) { + avpriv_request_sample(s, "Non uniform HEIF tiles"); + return AVERROR_PATCHWELCOME; + } + + x = 0; + y += stg->streams[left_col]->codecpar->height; + } + + if (y > tile_grid->coded_height || i != tile_grid->nb_tiles) { + avpriv_request_sample(s, "Non uniform HEIF tiles"); + return AVERROR_PATCHWELCOME; + } + + return 0; +} + +static int read_image_overlay(AVFormatContext *s, AVStreamGroupTileGrid *tile_grid, + HEIFGrid *grid) +{ + MOVContext *c = s->priv_data; + HEIFItem *item = grid->item; + uint16_t canvas_fill_value[4]; + int64_t offset = 0, pos = avio_tell(s->pb); + int ret = 0, flags; + + if (!(s->pb->seekable & AVIO_SEEKABLE_NORMAL)) { + av_log(c->fc, AV_LOG_INFO, "iovl box with non seekable input\n"); + return AVERROR_PATCHWELCOME; + } + if (item->is_idat_relative) { + if (!c->idat_offset) { + av_log(c->fc, AV_LOG_ERROR, "missing idat box required by the image overlay\n"); + return AVERROR_INVALIDDATA; + } + offset = c->idat_offset; + } + + avio_seek(s->pb, item->extent_offset + offset, SEEK_SET); + + avio_r8(s->pb); /* version */ + flags = avio_r8(s->pb); + + for (int i = 0; i < 4; i++) + canvas_fill_value[i] = avio_rb16(s->pb); + av_log(c->fc, AV_LOG_TRACE, "iovl: canvas_fill_value { %u, %u, %u, %u }\n", + canvas_fill_value[0], canvas_fill_value[1], + canvas_fill_value[2], canvas_fill_value[3]); + for (int i = 0; i < 4; i++) + tile_grid->background[i] = canvas_fill_value[i]; + + /* actual width and height of output image */ + tile_grid->width = + tile_grid->coded_width = (flags & 1) ? avio_rb32(s->pb) : avio_rb16(s->pb); + tile_grid->height = + tile_grid->coded_height = (flags & 1) ? avio_rb32(s->pb) : avio_rb16(s->pb); + av_log(c->fc, AV_LOG_TRACE, "iovl: output_width %d, output_height %d\n", + tile_grid->width, tile_grid->height); + + tile_grid->offsets = av_malloc_array(tile_grid->nb_tiles, sizeof(*tile_grid->offsets)); + if (!tile_grid->offsets) { + ret = AVERROR(ENOMEM); + goto fail; + } + + for (int i = 0; i < tile_grid->nb_tiles; i++) { + tile_grid->offsets[i].idx = grid->tile_idx_list[i]; + tile_grid->offsets[i].horizontal = (flags & 1) ? avio_rb32(s->pb) : avio_rb16(s->pb); + tile_grid->offsets[i].vertical = (flags & 1) ? avio_rb32(s->pb) : avio_rb16(s->pb); + av_log(c->fc, AV_LOG_TRACE, "iovl: stream_idx[%d] %u, horizontal_offset[%d] %d, vertical_offset[%d] %d\n", + i, tile_grid->offsets[i].idx, + i, tile_grid->offsets[i].horizontal, i, tile_grid->offsets[i].vertical); + } + +fail: + avio_seek(s->pb, pos, SEEK_SET); + + return ret; +} + +static int mov_parse_tiles(AVFormatContext *s) +{ + MOVContext *mov = s->priv_data; + + for (int i = 0; i < mov->nb_heif_grid; i++) { + AVStreamGroup *stg = avformat_stream_group_create(s, AV_STREAM_GROUP_PARAMS_TILE_GRID, NULL); + AVStreamGroupTileGrid *tile_grid; + HEIFGrid *grid = &mov->heif_grid[i]; + int err, loop = 1; + + if (!stg) + return AVERROR(ENOMEM); + + stg->id = grid->item->item_id; + tile_grid = stg->params.tile_grid; + + for (int j = 0; j < grid->nb_tiles; j++) { + int tile_id = grid->tile_id_list[j]; + + for (int k = 0; k < mov->nb_heif_item; k++) { + const HEIFItem *item = &mov->heif_item[k]; + AVStream *st = item->st; + + if (item->item_id != tile_id) + continue; + if (!st) { + av_log(s, AV_LOG_WARNING, "HEIF item id %d from grid id %d doesn't " + "reference a stream\n", + tile_id, grid->item->item_id); + ff_remove_stream_group(s, stg); + loop = 0; + break; + } + + err = avformat_stream_group_add_stream(stg, st); + if (err == AVERROR(EEXIST)) { + unsigned int l; + for (l = 0; l < stg->nb_streams; l++) + if (stg->streams[l]->index == st->index) + break; + av_assert0(l < stg->nb_streams); + grid->tile_idx_list[j] = l; + break; + } else if (err < 0) + return err; + + grid->tile_idx_list[j] = stg->nb_streams - 1; + st->codecpar->width = item->width; + st->codecpar->height = item->height; + st->disposition |= AV_DISPOSITION_TILE; + break; + } + + if (!loop) + break; + } + + if (!loop) + continue; + + tile_grid->nb_tiles = grid->nb_tiles; + + switch (grid->item->type) { + case MKTAG('g','r','i','d'): + err = read_image_grid(s, stg, tile_grid, grid); + break; + case MKTAG('i','o','v','l'): + err = read_image_overlay(s, tile_grid, grid); + break; + default: + av_assert0(0); + } + if (err < 0) + return err; + + + if (grid->item->name) + av_dict_set(&stg->metadata, "title", grid->item->name, 0); + } + + return 0; +} + static int mov_read_header(AVFormatContext *s) { MOVContext *mov = s->priv_data; @@ -8901,6 +9280,8 @@ static int mov_read_header(AVFormatContext *s) mov->fc = s; mov->trak_index = -1; + mov->thmb_item_id = -1; + mov->primary_item_id = -1; /* .mov and .mp4 aren't streamable anyway (only progressive download if moov is before mdat) */ if (pb->seekable & AVIO_SEEKABLE_NORMAL) atom.size = avio_size(pb); @@ -8923,20 +9304,43 @@ static int mov_read_header(AVFormatContext *s) av_log(mov->fc, AV_LOG_TRACE, "on_parse_exit_offset=%"PRId64"\n", avio_tell(pb)); if (mov->found_iloc) { + if (mov->nb_heif_grid) { + err = mov_parse_tiles(s); + if (err < 0) + return err; + } + for (i = 0; i < mov->nb_heif_item; i++) { HEIFItem *item = &mov->heif_item[i]; MOVStreamContext *sc; AVStream *st; + int64_t offset = 0; - if (!item->st) + if (!item->st) { + if (item->item_id == mov->thmb_item_id) { + av_log(s, AV_LOG_ERROR, "HEIF thumbnail doesn't reference a stream\n"); + return AVERROR_INVALIDDATA; + } continue; + } + if (item->is_idat_relative) { + if (!mov->idat_offset) { + av_log(s, AV_LOG_ERROR, "Missing idat box for item %d\n", item->item_id); + return AVERROR_INVALIDDATA; + } + offset = mov->idat_offset; + } st = item->st; sc = st->priv_data; st->codecpar->width = item->width; st->codecpar->height = item->height; + sc->sample_sizes[0] = item->extent_length; - sc->chunk_offsets[0] = item->extent_offset; + sc->chunk_offsets[0] = item->extent_offset + offset; + + if (item->item_id == mov->primary_item_id) + st->disposition |= AV_DISPOSITION_DEFAULT; mov_build_index(mov, st); } From patchwork Sun Feb 11 18:57:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 46190 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9002:b0:19e:cdac:8cce with SMTP id d2csp310824pzc; Sun, 11 Feb 2024 10:57:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IGReWjzUpYb8heh06eSxsa8ZexEJGmSdULGTtMaobpPO1x/JGaTHJMwBPGPi+0aaEJ1yzuL X-Received: by 2002:a17:906:2287:b0:a38:53df:4c5d with SMTP id p7-20020a170906228700b00a3853df4c5dmr3209184eja.34.1707677864530; Sun, 11 Feb 2024 10:57:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707677864; cv=none; d=google.com; s=arc-20160816; b=ZkrbwSDVxb4d3w7bRIDLvlrBbJvUx9CblU2eVmW+3tibL+zKgCC53KzzPZ84rsFw1K s9ni5j52owiu6JnbIi+lBAmeR3Ib/PQcFJDm9+/Dxa9oY82MvkuPbU8SQnWUM0LpfFWL khoG2NophdTurOdNWGnavNn1VfGdvCkvdRMR8ZqBw+FqIJZ7U4+bNgtUbG6XEqf1XXfk 9FdeBQOFxgPmBkFjTnIBfMYgxkZ3XfDSAPokSZ0XI9VLhMK50wmH1v1PuEtNIyXXHy/g H1rKEv/2ESuz4HevFm0RB9yro7WLcc+rrxS0G6l0HilE9VDkakc8XPvPthUbtx1r7gnE rUeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=15jVz9Pz3UohC32hb/m80v12j+zbOjO7hIf6M7S+hJ0=; fh=yHTiQFKUsSPcA5c3dw1Nw1qje3XBIYwdWSR/IOo5j9M=; b=XZc/tEUiMFhYVAY+9FvwkI0yquxMlqnsL4KA1xSTNaGWKHsflehLPbnDydTKa7PyvT dEPOHhjJ5vb2qU7Dm9tE2CemBGKRr34ESZEwYkTKITYsgcvvXbgbYYfptYAd6xsJ9tnE Ympxyv+DRYmSaf+nVd0VUHv3sTH52AiaQGqTXCqgx2lF6xB+CM4epaUE6T1ba+zJoAZC OvIaGAeIUXTjeBJf8221ecPqOdxfleB99WkYJFeJpQ+RH4B8Za6ImBlbU4idlu6MZv0F 981mugDOIk1sFwwplLzYgTqfj8v7JyDVnaiDZwDsQlDz+AVicu1YdhUpOVnSFePzi3Fq NSGw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=fiErSOVT; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com X-Forwarded-Encrypted: i=1; AJvYcCWYeMBUmmln68pbaaNSfnb44VLxdZcYEouzX7gARELpI+q7SOcT+V3OFUnFLMEDOVhtfIyluKedIK7qtcSZk5gi3UUmRnTEfwVMzzwdV8NRqO7/1NgS1hb3jFFma3iWsPW155sWTjkAseqQxqFiCCbtWUg/dWFgUaMs4zmANPcZhP7gkg465RoALqQ8QpOslAuX0lY3g1vrKpunypspo7pig2WyNEDTwWJuUcJR+Z1saUaLWeTtiAUawb0+GLtnsIBWXa2sHlQUHW9C6fo4mXEkBf+SlhlDP3ZHuIapi3VsEv/BKLc4nWfr8ETVp1XZJ0l9i6daA5mvMtb/rgOeMi+vxTKazFtB/uC6xuV8yyBSuNh6Bm6vJGI7qand1pjrRaWplCVlnu64cvvXtafbYErs3NqWBm4jJuEZopWGIEsBPmd/hERa/a/4mK0ME4Nctf3Ap/WTfkFIP83HmUvn5ktIF1cSUK/uV9mnMevBP/XxV0emMFzZhODRDTIoAG4KFpT4hXE1xv9hmcbBBsQFcWQ8b97yz3/d+xf/eIKp8ogHky2OYrSY1wLlhuWl0ULKGj75QvmnP2CLjipjcX9V7vc7ZaawWezWezAftKFB/eeEBgZS9bljN1OGLZEev/GqceGsmL/C8+2paj5PP/EJXEYKBGcU97nq9Qxndzwjmq2PeUH/TECBjgpyBFakfpsLWFk7Rv1NE+8+aJI7PZQLkeJSMPWs0SdAEcBskDw4rDBA0/hKiJ37yNArcZtrwwU8L74QtYtonYKFy2P0CiJJZo/d3ZYJn08gIzQWJN/x/GlLgV4f0DBsxdPI9sKvJNz9d3FK8pUSTzwF6GMnA5Z8Eqa2YA35a1TGAH1jIDS0rKAxu33XiMkXbjWHU22J8j5ALgWQxXAWLiFWOuIzG4tLluL/HhXOHxuzgvzfDzASCpcVqo3atG67Io1PtD0U33Bs9eNE6J S7G5ZC58jHZ+X5PkgjBrT1jwXDbLwHCzegh0sACjKnLCGx6Ma3V5Iz81geqFuoh9yGlPoxJLO/j8Mp78ekwBryP1R2HyGeST3d0T5xpOxvYAMnJw2bvTT0/K8ZI5fuJUiwer2HozwGCIjDSkWDYPaD6kJ4qyQDKWBANP710lzyc0rlheoEGNjKEpcsgelngTyQwvjxPLPvL6W6r+F4p1ovHzWBvstnBnIEkPotB+6ZHoY6tKF1pIMA3h67fU1CJSD9x4oc1NOhik+VcAUOprdWEeqJQdqM6j48w6/hnh77STOl1jbgmJaZ6JmF671GlrgGbgDAYdD4Wc4xFI3HJfQdc2U1qVUn56T88EM4c2ZycWAIzp5H9wGh0r0Di8wvI47ZnF71/v4SDOe2PJEsMBKGgUOpIG6ASSrhq8d+4/UMQOy5beFbvEJODFmMW4F8dJGE3NaEb76PFIoFuqiYtSO0j8IUgCGwTmhJZ9aNvgKuwKR3kZCZAlLqZqHUsrLvkKs29G1haaxfbdxclbICs6TpMJu6Ob30IHcInp615IUlnQMLcKkEGUpJ2rewTA+lkwwrjQH7AMXf38GeOv9gpSKVGFqJD1wVodrx+9qTD5/epat2IhZylGeh8Pi0hNM= Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sa26-20020a1709076d1a00b00a378423c80fsi3233605ejc.61.2024.02.11.10.57.44; Sun, 11 Feb 2024 10:57:44 -0800 (PST) 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=@gmail.com header.s=20230601 header.b=fiErSOVT; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E797768D09E; Sun, 11 Feb 2024 20:57:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4A55C68CDD1 for ; Sun, 11 Feb 2024 20:57:20 +0200 (EET) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1d74045c463so19941355ad.3 for ; Sun, 11 Feb 2024 10:57:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707677838; x=1708282638; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=dFDgbM6wTpnvGAny8ZiZcomaSJHMgyUHKb2zIr6yTtE=; b=fiErSOVTqvnWS+5we9fWU2X3yghIJneZQQo9BicGinUuSPXJ2DN4qijowiQoX5vWkA 88C4HaCkIQ4Qqubk6QxYSW9ZpLDuYlkYqwbstdWEhMmo+ualMhQ1EueXg4QxvcqfMKx3 muLQmFZIos+KUlMhlK0Dl7axBgkhNXaQR1nc3k6JX2SP/zuwSbdIlMVIuAX4zLG+GYPf n1YOzzXb5wsySd0sH6jkGUYBne2VP8Rx434XSXmzQ87PVgH3tJK2YaGUzWZiXDXpl5wr UoFmiqyKqD/meyru4kW1Ty++R1AxuEO6HZ6MwA43PRvR5sBupt/rxoCk6oO00FVII41V Z8lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707677838; x=1708282638; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dFDgbM6wTpnvGAny8ZiZcomaSJHMgyUHKb2zIr6yTtE=; b=VVD54kmjxWhTo+y0uivYMIw/8wb6L2xZjO/kAdSn+HdoeLTdHLgwRFktKHkj2iwFI1 D8jCpUzGn/6O/51uuiawu1FmoCHHFiD6iqu7NMSUziFTbNAZNL4+m/GrRCZkV8GaadAY YV35vf+jTmLof6EeAnz/WM7kHIm5nO8aGdqlGC6MHaJ6e8eQQkK1fBsL/wWgPB8GnaY6 fjtHnI1uCe5uVlyoiHZ/1HYS/kSGFVZyZ0IbHRIgJHji03gw/POyLXB7ChS8z//mvDbP BM1CKMkj5Sw+daxZ9/XLVJFwIxHPDzUMuCUpBc4w1ObkwQlCmTXyU9nm4nR+EMFkW4U6 9UBA== X-Gm-Message-State: AOJu0YwPhB8B1/jDyZHcX4Y33BEQSQH1pqgT2fKSYUOyOxo4EcvDcm4A 7qrGhNFY/VqbO3eM/rcexS1fUydDU/VKkMxfOTKESpgqWBoBA7HZPJ4vb0hP X-Received: by 2002:a17:902:da92:b0:1d9:b5d8:855f with SMTP id j18-20020a170902da9200b001d9b5d8855fmr4572623plx.21.1707677837683; Sun, 11 Feb 2024 10:57:17 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id q13-20020a170902a3cd00b001d8accb025fsm4778166plb.197.2024.02.11.10.57.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 10:57:17 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Feb 2024 15:57:00 -0300 Message-ID: <20240211185701.9327-3-jamrial@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240211185701.9327-1-jamrial@gmail.com> References: <20240211185701.9327-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4 v7] fate/mov: test remuxing all stream heif items 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: RZot4cSNAQmz Signed-off-by: James Almer --- tests/fate/mov.mak | 2 +- tests/ref/fate/mov-heic-demux-still-image-multiple-items | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index 4850c8aa94..1be7a0d15a 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -161,7 +161,7 @@ fate-mov-heic-demux-still-image-1-item: CMD = framemd5 -i $(TARGET_SAMPLES)/heif FATE_MOV_FFMPEG-$(call FRAMEMD5, MOV, HEVC, HEVC_PARSER) \ += fate-mov-heic-demux-still-image-multiple-items -fate-mov-heic-demux-still-image-multiple-items: CMD = framemd5 -i $(TARGET_SAMPLES)/heif-conformance/C003.heic -c:v copy +fate-mov-heic-demux-still-image-multiple-items: CMD = framemd5 -i $(TARGET_SAMPLES)/heif-conformance/C003.heic -c:v copy -map 0 # Resulting remux should have: # 1. first audio stream with AV_DISPOSITION_HEARING_IMPAIRED diff --git a/tests/ref/fate/mov-heic-demux-still-image-multiple-items b/tests/ref/fate/mov-heic-demux-still-image-multiple-items index c850c1ff9c..753cef267a 100644 --- a/tests/ref/fate/mov-heic-demux-still-image-multiple-items +++ b/tests/ref/fate/mov-heic-demux-still-image-multiple-items @@ -2,10 +2,17 @@ #version: 2 #hash: MD5 #extradata 0, 100, 5444bf01e03182c73ae957179d560f4d +#extradata 1, 100, 5444bf01e03182c73ae957179d560f4d #tb 0: 1/1 #media_type 0: video #codec_id 0: hevc #dimensions 0: 1280x720 #sar 0: 0/1 +#tb 1: 1/1 +#media_type 1: video +#codec_id 1: hevc +#dimensions 1: 1280x720 +#sar 1: 0/1 #stream#, dts, pts, duration, size, hash 0, 0, 0, 1, 111554, 03ceabfab39afd2e2e796b9362111f32 +1, 0, 0, 1, 112393, daa001d351c088a5bc328459e2501c95 From patchwork Sun Feb 11 18:57:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 46191 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9002:b0:19e:cdac:8cce with SMTP id d2csp310876pzc; Sun, 11 Feb 2024 10:57:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IE6rqk0J8Kw0+st3KhIBJ8R4TzMbI6qaOu9zwMX+KDSPrBmF/vHjbR4uR7fJtB/e+k30DqT X-Received: by 2002:a17:906:7f90:b0:a3c:aa51:ae8f with SMTP id f16-20020a1709067f9000b00a3caa51ae8fmr229023ejr.15.1707677872621; Sun, 11 Feb 2024 10:57:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707677872; cv=none; d=google.com; s=arc-20160816; b=Yd+EPiqljeiSSkvdzl5AiT9Uo8ae882O+t5yD6woSsTo2cD/7GjYuOqc+aLObriero XWbw7bb5GCWGm/BgSH4Uf4H6wLTUaVUYAG38uxnq6ar+PQ/IPlpcHRNWR7Z0yz2p1ewX JBsAodsRoSrkJN8gLwwdLlYokLNyq8Qkjbc7HOOk+oJZxcJe9FjoKD1g4bAWNokz6wKx qXQ1nG3BKOdMQtgWjJgOw9ZXgSdWPTYx3WQfzya+S/PEMONlbTyD+9GgrdPgEFkzH2ba gilrTWuvhje6anv06kF+eV1+s9w8jONhrUNPpBtbMhUpQbVu/NBPDX/4uqNBSPMR0iN6 dgFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=sFrDg1uc+JGqAfibFfdWKSh1eb9pXroUvMODwFuI9GY=; fh=4ziMCFxPUsXck5AxViPeQaQdXFOLP5FuPJ297DBuIFE=; b=gktBQULjhU8RklcoIweNXtQ1YLcji1z+5kcK/G9hIdUWLr8vrsgM9iC0GN3Eggm+GR px7yAFN8YLPekkkb/L1TD6We5pByqsBlwqAyk5YLeidLqOudC0KzseTNFimHixmkETtd dwUit+Hb3j+937qPi7u+ri1DLlE+48rX4XW+keI13k+B0dqePL1biEg/N2zZVjDwldlD 8NuoMkJv2zLIc0mm97GNj9w8YPzZPCFdm+zjwBHvntXRAjiN+H8EUZ0gefWToyVSgSac lG9MRslpOXPDCUDThC3MeBs+JtLPyz5GLcA2TXICGRDVkerERtK6mhABIOf56JYUrHTV pmYA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=JRQplumT; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com X-Forwarded-Encrypted: i=1; AJvYcCXZwaTXmvuXHP1/bzPGKnB+1nw4ehsVycjWY+HMiitmLQbafMFAyBsyhfHmOjr0tROoMnZhZQufaKMdT5U5p6oPONC8hRKpqdcmLdrKomdvloc4EMwO2yfIa+LL2Ec9Hx81+W1//9TVGetV9GxZdFsbVoev+xk+B5VUkYflZ2dlm1ocAPBe/O8XqnqjKcWgtL8B6jG52XRBL2E6ca1aSf2hrGkneXy6D43uiDnPK1oABgwrviwedVwCmfpOxO6sMFavc+ONJG57fgM2fEqprTIu5XKEk8BfvXSLTzNhn2Kry22dL6n7uzJmYDCQLUUd/XJWETcXyf81tFFut4YyQTwWyrOtDYHpa21HloOE7T5wfQOAtS0g8BoirjQYOXNbIsyb0a9ewQikeQgBl8jGy+MQyNIicF1O0txLCuINn6YgOFceT7rUFLcXeFJIP2FVvnmH8p1tVFVsjZ+Toc4IMUeDIue5zcJGL1RBIcS4OY40Ylnez5r9BFOuC7ZKmWN04PPWaMcvpZbto9/A9JvPkb5ipzlrVshABwbguwjv9IqYaRxySnC4kiviXTP7VPrzAyTOfRKgbVb9uD3DXzHIFtD7/iBBsLJkL8gRYI3lqZGyacsoFy7BVE0uwj8plDXSQGxE4r1mG0u7AfJefwR+BIYX/h0If89dU+kGIDBXh1pzStkVJvvmXILnOhDslbunBiqkR5q/KYWYtq4Cdoe316uMN5/1tmlV8TO4GGTJ6uhHtY6VIeQwCDiRiGseyueZNuUkzJLe2eXpUGvqrw9yMEjPO134LvLIzQEttXmFEBnuPsG69ctxtKKr1goZ+7gUYWKSXZuEEzpT7sz42RqBVKqNd+YzNFiF397FyR9fZi6kXO+90uv3NsbmG7VN9SoACCZJN35XoN0UUoq6MKuLBHitYhGvA5gMNF/a8g2teYswxFFYJFq3jNXaBgerOe+7l2oY2p Y5YlySJ6GKmGkQxIBuFjkt62T4BLHJuZF9mc46E72B0fD+2R2EBOybia7u+hic9VOoUKx69o26S/JVwLHvbEl+Q1xJTWB4qEfVFZJrCGA67AYgjtW8JVyippkMjDSYJ0rSFVZBhEmgtMy636Go/6GTZ7whs1dUwI76yClmoFZrs2SmEqRnS2kYR9LoOaD+/Z8TENIVfMPW2rinF7dH+1GqDVcjVsXzvxnhKKqIciWzTD41wb1sTTq26I+0L6E09nT68ltcrMYm0t5kcfz2zv8i35uwwVpvbu3tgpzxPWISgiq2rf1o1bku3wezNT0zTWaYK8+Zxoupqve+PuDEshy7QqBHPT5jcuyyXRdxh0Z+FRSw9ejQYlBxx/k2bEFXAf9kMx8LaiL0r5gVax/jAyxsL15AV03gjNa9WOUosUZ6txCEeocnzXiqi/ux9U2cefynjY/gDv5U1kiMhy4KtLbjEWCR50ajaM1I0ptganPq7EBf5u4Il4sqkj+OmY5lKwbf3y2ZJgiK69k8+wyP5vgnhnc0ezYimcSlACCXMr4kLbFE0PUzOkdU/XLpMrkW+8J3nRnyjDJVRpp8areu0rixDTVFYejNdWxK7mLneXc03ZfL1vgg0DndyfahPS8= Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u21-20020a170906c41500b00a3c570ca7bfsi1219606ejz.134.2024.02.11.10.57.52; Sun, 11 Feb 2024 10:57:52 -0800 (PST) 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=@gmail.com header.s=20230601 header.b=JRQplumT; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DEF9C68D0E0; Sun, 11 Feb 2024 20:57:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BE99568D09E for ; Sun, 11 Feb 2024 20:57:21 +0200 (EET) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1d958e0d73dso17220975ad.1 for ; Sun, 11 Feb 2024 10:57:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707677839; x=1708282639; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=+plJGhPMEcMhuZpMxIaPHhs9YWmWQvf/rrvUDjEx9bg=; b=JRQplumTHL5B5/jocQWzoJcO6/2JQnRR6g0H7+0HkNYjSz1U/xQEPtWY6zz9erUEJj +wrAt6IUwSDhS3/DnAkGgnJGixd/3Km7fGfmpUbhPcbuIyrkAtDR9cQrJgkhLQ3BdM5c Fr49vMZOiuf/1fcA/odFy8L6Wx/nSgxUOOiAhsr4S2xJxTgq88fXx2ekFsSacMylpozw PraVgnvm8pfB1kducoJ+wkfCGON5MQq8ni3+Iv8p2hpyM05g9DD1GeIb1BMkg7uN8TYp A8GU73KVJYAT4nID4fuwLEIHtBcMDQ3KJc58K+J1YYyh00okIzMaAvrv8nwUHMXxlbJj jfrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707677839; x=1708282639; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+plJGhPMEcMhuZpMxIaPHhs9YWmWQvf/rrvUDjEx9bg=; b=hcVa/6FieirbgtN77KrOBak55D0qQCSWVHEA/ZzQLb0EIpF5W+OccYBJHi1LQMwjKO Ms8ZtPIt1HwTP0edn/H7virZFCjZleoD6p6ninqXobXmolWX0EskDQxymihe1rRehQGH OiuzTLGyiNUx1U7BjQVPyLcy0qUfhRURSI/SbqtFplkv9vj9scr4mHbX+cAPUaK+Abvf eJuI1MePpSlS/kn3Ile12ANvQoG5NoVdS+9Rj6VhKgNdK6HMCl7NXs+YBkorF/CmXJDS GLfZ8hHddAs4wvBU57kqSQlkTG3gyAPftEGrCti6DtdOCn/RBX7TnMJQpeqDSOSBxlZh za8Q== X-Gm-Message-State: AOJu0YyIKrqhWbaAWqpR35BLJkYshqmajBHGU2Zd6wTaArUiPDHRHUTT whdGzw8TtDW5ixrqMidUP+oa28M27XwZaAYONbMCl/Sbmhpte20Ez67A7GYP X-Received: by 2002:a17:902:eac6:b0:1d5:6d76:997a with SMTP id p6-20020a170902eac600b001d56d76997amr5336482pld.28.1707677839143; Sun, 11 Feb 2024 10:57:19 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id q13-20020a170902a3cd00b001d8accb025fsm4778166plb.197.2024.02.11.10.57.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 10:57:18 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Feb 2024 15:57:01 -0300 Message-ID: <20240211185701.9327-4-jamrial@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240211185701.9327-1-jamrial@gmail.com> References: <20240211185701.9327-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4 v2] fate/mov: add tests for HEIF samples with derived images 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: I8mcMpDhe6XX Signed-off-by: James Almer --- tests/fate/mov.mak | 8 +++++ .../ref/fate/mov-heic-demux-still-image-grid | 32 +++++++++++++++++++ .../ref/fate/mov-heic-demux-still-image-iovl | 18 +++++++++++ 3 files changed, 58 insertions(+) create mode 100644 tests/ref/fate/mov-heic-demux-still-image-grid create mode 100644 tests/ref/fate/mov-heic-demux-still-image-iovl diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index 1be7a0d15a..a8206a1b58 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -163,6 +163,14 @@ FATE_MOV_FFMPEG-$(call FRAMEMD5, MOV, HEVC, HEVC_PARSER) \ += fate-mov-heic-demux-still-image-multiple-items fate-mov-heic-demux-still-image-multiple-items: CMD = framemd5 -i $(TARGET_SAMPLES)/heif-conformance/C003.heic -c:v copy -map 0 +FATE_MOV_FFMPEG-$(call FRAMEMD5, MOV, HEVC, HEVC_PARSER) \ + += fate-mov-heic-demux-still-image-grid +fate-mov-heic-demux-still-image-grid: CMD = framemd5 -i $(TARGET_SAMPLES)/heif-conformance/C007.heic -c:v copy -map 0:g:0 + +FATE_MOV_FFMPEG-$(call FRAMEMD5, MOV, HEVC, HEVC_PARSER) \ + += fate-mov-heic-demux-still-image-iovl +fate-mov-heic-demux-still-image-iovl: CMD = framemd5 -i $(TARGET_SAMPLES)/heif-conformance/C015.heic -c:v copy -map 0:g:0 + # 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-heic-demux-still-image-grid b/tests/ref/fate/mov-heic-demux-still-image-grid new file mode 100644 index 0000000000..6fde8fff28 --- /dev/null +++ b/tests/ref/fate/mov-heic-demux-still-image-grid @@ -0,0 +1,32 @@ +#format: frame checksums +#version: 2 +#hash: MD5 +#extradata 0, 100, 5444bf01e03182c73ae957179d560f4d +#extradata 1, 100, 5444bf01e03182c73ae957179d560f4d +#extradata 2, 100, 5444bf01e03182c73ae957179d560f4d +#extradata 3, 100, 5444bf01e03182c73ae957179d560f4d +#tb 0: 1/1 +#media_type 0: video +#codec_id 0: hevc +#dimensions 0: 1280x720 +#sar 0: 0/1 +#tb 1: 1/1 +#media_type 1: video +#codec_id 1: hevc +#dimensions 1: 1280x720 +#sar 1: 0/1 +#tb 2: 1/1 +#media_type 2: video +#codec_id 2: hevc +#dimensions 2: 1280x720 +#sar 2: 0/1 +#tb 3: 1/1 +#media_type 3: video +#codec_id 3: hevc +#dimensions 3: 1280x720 +#sar 3: 0/1 +#stream#, dts, pts, duration, size, hash +0, 0, 0, 1, 111554, 03ceabfab39afd2e2e796b9362111f32 +1, 0, 0, 1, 111481, e5db978adbe4de7ee50fe73abc39fcfa +2, 0, 0, 1, 111451, 08700213113cadbb6628ecb8253c1c2a +3, 0, 0, 1, 111353, 5de942e14c848e5e22fad5d88fb13776 diff --git a/tests/ref/fate/mov-heic-demux-still-image-iovl b/tests/ref/fate/mov-heic-demux-still-image-iovl new file mode 100644 index 0000000000..753cef267a --- /dev/null +++ b/tests/ref/fate/mov-heic-demux-still-image-iovl @@ -0,0 +1,18 @@ +#format: frame checksums +#version: 2 +#hash: MD5 +#extradata 0, 100, 5444bf01e03182c73ae957179d560f4d +#extradata 1, 100, 5444bf01e03182c73ae957179d560f4d +#tb 0: 1/1 +#media_type 0: video +#codec_id 0: hevc +#dimensions 0: 1280x720 +#sar 0: 0/1 +#tb 1: 1/1 +#media_type 1: video +#codec_id 1: hevc +#dimensions 1: 1280x720 +#sar 1: 0/1 +#stream#, dts, pts, duration, size, hash +0, 0, 0, 1, 111554, 03ceabfab39afd2e2e796b9362111f32 +1, 0, 0, 1, 112393, daa001d351c088a5bc328459e2501c95