From patchwork Fri Feb 9 22:28:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 46145 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:a586:b0:19e:8a94:b663 with SMTP id gd6csp1238472pzc; Fri, 9 Feb 2024 14:29:17 -0800 (PST) X-Google-Smtp-Source: AGHT+IEVhvrb1L4N7DNVB/DTFC+BZab8VINGRwbzZyCJy0xCY33PiNZjy04HPY8UhJDHUVCVNou3 X-Received: by 2002:aa7:d8ce:0:b0:560:e6b1:f73 with SMTP id k14-20020aa7d8ce000000b00560e6b10f73mr220443eds.16.1707517757675; Fri, 09 Feb 2024 14:29:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707517757; cv=none; d=google.com; s=arc-20160816; b=vQjJccnvqvlPMkIi/N2+ypK23VyCj5BMvAXqd9dxeHg/VdtBcUK81vw81r/pn4J1v+ THkdTNSt8QGxC2MDY11yaopJTtaoA71jUuqIvmDRt7yQ7I7xyJWiRho8WnpW41rrCZK8 ZVvjxqfIziB8ZA3xx1bTzRi+x5VfJ6TK4HQDzvdCVhcbPqt9PSpvMYFu+7HuXTNXNdcJ 5VZyH5vrMYLBxR5jnsy9bOtCfOmXps1KVcLa1cY/KUYAATYeksHQvV7g+FoSeEm/ozxE Sp+ZyjI4DZf7kKK2pufVp8JQN/oRnJovOW2WotadbxGx6Gg0WItgFYphhckKaErezdhb GT4w== 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=QO72Ho7HGBjd60lWYh/HfRmvGbDdIhJQGP+PihJiOOg=; fh=KVKbc9N0Ici0pOk4OPezEPaWsCxNzoL2qlxTJoh0WiM=; b=NWrrPNdLAuIT+ge31elNkjwd6/NadZkvoGidFmd1f+/zdReXliVtJLs4nIlSdyCLyP NeHvRd9U2YJJZgAQdNLtSWt2lJvhl2Qv2aitr+4UjsdGQtB0J9yZToGhITjmoCC44CY/ f2I9ruaZ1upVvm2l4sip2PntqQo3iGyl6c+84bEbNOh7mo7ALPYtK1r6/Ienln1JRtkg Pjb+NOzS34W3zc70sk0RtA8/jYo54GKH5oGpLaMC8UGIM3L1x7lzJq/AJOKJZ67fW8r0 io2AjzyNdQuytCSrKzvIDnSIjmgX7lB0WLT5hhw5eK/fOdjrEPckZ8+JP75NBxrP9f5l 8WNQ==; 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=ONsssr0f; 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; AJvYcCVhjJ2Vh9y3OpAV4+Nb+dY4+4jY8/WaI/NMj574ax9V0+QNXId8vINKebhz7v/awwy9Rsv4cLaz8vT2TEEp4NCkFE7bDs5sMHfQdKXC+s0BedeQsXOWECxWGuvjaMNGBy3hBRS69GRmn3XbBmiaQHpQ74GqNw1cPmfGFkLQr42g8QhBUOEO2rtUuL2JFaAKY+SnlV0FfCewInU80jjx8Qq1oePJHH7sG1eIp7RECJ7UDa5AQWArFlaNfPbKE+qnc1ykIwEbB9YDPoZ5PEKNFDe5h0kDhbt0f/1bbAD0KNGxPm8ekgXhrs93NWA54/7I5ZrZABqeKk8yWWxcwOGyq0bARwEEvztC4CIniSGM+jNvNQ0nW5frmh59lIhE7UvVxpBnjkuazVWE/QrOtJKnNXKHRC9G7RW7yualg09E2F9OjbqKG61oK2d/i/9BWKaojXGE99l07IXr294Jbv2Us1Z3ZPE8W5aFqhbdHSF+oscgLsvNwHlGfhXq29fVW6ha20UvnqZfXCIde1dzKVdI4KFMOT8Q/zcQudTKxBzoD/OPTF2ETIMWUX/b4rBVNTywcrjx2+Hq5s3o79vIeB41d1kcON0wHbXTMHuGhJx1gzeVaL0dD3RC06yXPyJmtTxAFKupDofyaxSWxZM4DbHHIqy+gPS3WAn8EDXTeeE7B1NT77GID7D1jiN6xX59C5HpvfN7CsJAyDrU5/BBclFHJ4blpqIxaFgPfIPms7hDqQpoQ3ggDJrliX7bJvxHrxu56qLBxXJSZUJDQVPj5P4qlMBuQJEk8f3M2GkcdSkPGZvajO5etLVjcLB0MdVFvfqpRKgyTDjdOgvsinl5mF5CogFVM4tgdpS2De6iY3edYph+oN9b44U7SVu3MHc6tG49F1s752RoWiei2GiDyjA15AEpiY+ORsS7aqzrHo/CCv1/DKCmn/N3dS1/+8ZmY7VQ89FyGZ 8cA7l3dRD3rCW/u78hvDz9EiMJA/GA10H6J0jb3tBP2yGHCsdSPRSWV6GPSHLxqGMBfUHOQSYhfOeYUWrttd6e/RHtJ+6STZl2lfhxzuxePM/r3QChfto82BG/IMzsxRJ/542oZiEWhloD+7RjQYLIkFYZDymC/gsG5+ZXwD4lRtoW4e/ZEaC5QzbtsJUfdAAl8lfK1JakKCZu2rr+pONTu5mDdVzkCI5iqi/ux3l0otDbby2+SF5zA13KTW6XB97k3b6gaRsm4URfHz2mQhWX2orfUZq0CYry0O2DEsl6h+/els83sEgCjYUonJGz9ZDQzgWvagozkHWOudiPp0/dHgT4g/ndZtdqF3a3uJVyPH2J/SxqtM6p9FkII4nZTiH56otFkET+wWm5igc1nijfXryAiVmkV7wVdHm52DOAQ9tk0nk2W2KgxhKOfUg4DaEf7u0qMqjlDFM47rB6GeOVyF2jX9TAp1PgRtuJd3qEzsq53li9m3ikMDhMozwg+KtKSJ7zVpFhVAoHw+UbmIjOdJHWsRxZQWjhZduwMMFWepEiDlIoXCq7pk+TSNmhd33kVBM7LRdzhIdfKNiy4Mgs8a30WY1Su0v5HwejZowyX9mZnwxkITkoM+HF7BNd Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dj2-20020a05640231a200b00560fdf343e3si177302edb.679.2024.02.09.14.29.03; Fri, 09 Feb 2024 14:29:17 -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=ONsssr0f; 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 4093968D0B4; Sat, 10 Feb 2024 00:29:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 311B768CEAB for ; Sat, 10 Feb 2024 00:28:54 +0200 (EET) Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-2906bcae4feso1056558a91.3 for ; Fri, 09 Feb 2024 14:28:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707517731; x=1708122531; 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=Q94xUkXUYB7cjoxirJE809N12lXqz6h7Ilm+SoViwWA=; b=ONsssr0fcEDOHhn86kaXO1VWMtm7+Y2tDMc0T8eZZDYtm9C5kAygP9XHKQiTa6I8jw bR8YRNbPNGAFPFKyrjkZQlxK3CeFcW0hxmNuEgWEqX7LIl1bCwoj1wyS8WsOU7aX63Tt mUZLTvdK1Y886y9hXUSVUtffyxkkg9ZDkVocU4TNeGPi/tU4q9Lz7UfSFSvo5Bo3w3tN 40qqj9WOFs6nVnxOQcS1eIgpU6uDqFTMicB8CZfaQZItk/hAvZ8TS6RDTgXlL/9nosza o4PsbvyaMmhi+Q3PNfuMyV2dJ2wPqJuBADL+1fo5QYo4sM0tf5sjJbRv57hok99l5B64 HCtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707517731; x=1708122531; 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=Q94xUkXUYB7cjoxirJE809N12lXqz6h7Ilm+SoViwWA=; b=NGkGmD8/HjD5boQ+Aa3aW5ijcc+Jml97xJcN2YlOAnzXfGdP8aLVjmxEhZ/slr6Gog sc2L3pzKlt6PKeYFYYmCGWFyEDYSxDYi0tyxY3K1aaLZ96f/LA2lkNulT0QLk+UGJS+M ofk6+YBv1Vfpj5iLOwywD2riv84ycyvShzwMVhudmUQkjF5iS2ng83e/TO9nh94Ow+rZ gYVh2zZKJf2qXOZF846QlaksW3Fd8fKwaTTic5yixHfnroazMg/7cYmPHO8vj+VWl0np VgNVWVnqhJrlC9Bp3mziqExu9g/WAUceqoT5q9ZiDin3K5ucLZ64UVv9ygg7EkfsKlEK CDGA== X-Gm-Message-State: AOJu0YyedmjI/0Sic/ZZuLlYTuICYoTU5xRzbYIuuSzJOoRdTZCCZcNo wuZZEgqhvvcEpqeo7dvB2ERJDdQcG3y8cMjwP8g+CvFO/yAsxL2fmKB44yZx X-Received: by 2002:a17:90b:34a:b0:296:a462:454d with SMTP id fh10-20020a17090b034a00b00296a462454dmr405712pjb.28.1707517731262; Fri, 09 Feb 2024 14:28:51 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id ca1-20020a17090af30100b00296bf413fd0sm2330888pjb.35.2024.02.09.14.28.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Feb 2024 14:28:50 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 9 Feb 2024 19:28:15 -0300 Message-ID: <20240209222817.13543-1-jamrial@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3 v9] 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: k/I3bIGoX/9/ This will be used to support tiled image formats like HEIF. Signed-off-by: James Almer --- Changed the API to support overlaping tiles, as well as leaving pixels unfilled. This allows us to implement Image Overlay HEIF support. libavformat/avformat.c | 5 ++ libavformat/avformat.h | 127 +++++++++++++++++++++++++++++++++++++++++ libavformat/dump.c | 29 ++++++++++ libavformat/options.c | 34 +++++++++++ 4 files changed, 195 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..97f68531ac 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1018,10 +1018,136 @@ 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; + + /** + * Width of the canvas. + * + * Must be > 0. + */ + int coded_width; + /** + * Width of the canvas. + * + * Must be > 0. + */ + int coded_height; + + /** + * An @ref AVStreamGroup.nb_streams "nb_streams" 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 { + int x; + int y; + } *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 +1188,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; }