From patchwork Wed Jan 31 17:47:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 45945 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:2c82:b0:199:de12:6fa6 with SMTP id g2csp17223pzj; Wed, 31 Jan 2024 09:47:42 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXujDVtREiMW3pOg2IDie+9a9eRO5a1dQFYqkx20UqzT7wSulFansJMcaa/bg5BspwdSw0aJ+1yBcuBJi1tdzSTflwWJ9rT6GBRJw== X-Google-Smtp-Source: AGHT+IGMBxm+SOvJkr5V42hOzV/qlGnCuF3trSHVWuR9LcCtdwVSA+6ZAuh8HOhCKhqKy/721Jfo X-Received: by 2002:a05:651c:199e:b0:2d0:41df:70ab with SMTP id bx30-20020a05651c199e00b002d041df70abmr54036ljb.3.1706723262596; Wed, 31 Jan 2024 09:47:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706723262; cv=none; d=google.com; s=arc-20160816; b=PC1Xg2FcZz94fKRH287jQcOeR1psUKoVQj4k/Q+dhRwFZLmuyVmWmLd4yJhURm47fR 3YVgj2f0zCFIrRKjppalsmY3bXTTiaMyDIwNKg/O0KKwA2DxkwDX3mJS/2D22L6Ng2Ez aAzKf3EvUbk9Ew3Jx3pXwT7QsIWmlqRRqPiO0MIqH/FKPKxpS786gu4sLYzAj9Ds9eN4 7UHHvk7c2Tlidm1sFVo3GHtwTpjaqmcR5XXId0km81HhRqa2GmFm9ztlx++fqoThf3G+ 5/2bKSxZHzaEHryXD4ClOxC4/R0wXsIbA3dSnh+r7tYjkRqwNFNYOGuc4GL/+uOA847n vrUw== 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=cqZFpLxgpKQDpkiSZF6TmPEwC+aYk4qvOc6ICDWRL6k=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=gpBwaza3+3hpFM7uxl/RpfaHyOfL/1QdJZ1HHb3Q7G3Ro5LLLzkysFrXh50oRbGuPT D4CbYWC4dh6OetVQP8ToTNRkD98+4UO79BfbaWgglMMn3zfzcQs8bhtGaedDs04De3g/ vBpgcmuFAKB/ubiPaHRe7nE39H6bbpLB5Uwvgm8TffcYfqIEVpdt35WQ6AqYS2JQVQmJ JEJjfzTRWW+b2qbkUoQn5ZjhRI652ODwvhvDg2JmxkZam9j5oy7a5AFpsqdlgwrY460q fSMpnOh+hatuDiRx7xpaW+iWlSQ+ph5vLPepFazghpQ3PhB1WUgCLXZRZDXKcVLuOm4g ws3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=RvvI5ieH; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id en26-20020a056402529a00b0055d3654f5c7si5579662edb.303.2024.01.31.09.47.29; Wed, 31 Jan 2024 09:47:42 -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=RvvI5ieH; 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 E4C6C68D0E1; Wed, 31 Jan 2024 19:47:18 +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 7B19668D0B1 for ; Wed, 31 Jan 2024 19:47:11 +0200 (EET) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1d94323d547so89995ad.3 for ; Wed, 31 Jan 2024 09:47:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706723229; x=1707328029; 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=/WmBOd711ETK4VbjONAzbigebq20yux66jeCaErxX84=; b=RvvI5ieHaN2h0yhPDLPUcz5gDGTlNe2oOu8DFFxNr5Ci2ioVWHmMOVXL3uxU9eo5Fc bzFRq74pOwA+vgc6n1ar0s7LGeDvKxNnVNoMSAZKH/iSDxTYdO9ALUAkOEW4cGcUUEN2 PLpvaA7EFMkXYgNIPimBTokDxUcdIl0+DfbSWMuOvNSHhnmoVOJGivmsw5xFnEFbLVWG 2p8otfjNe65f11xr0DX1VO+dX3Uk/HNgOZqx4RFXDr9t64mBIOzwIBgRXuocnx3Jir/B BdRk1qydVPvtTO8setWvYLa+I3c9cI8bFREBdmtPoXsd/TPMAfy6l9ysrjlvI7ZUjFiX Za6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706723229; x=1707328029; 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=/WmBOd711ETK4VbjONAzbigebq20yux66jeCaErxX84=; b=YnUSL5FnOgVmRhH4AiDL3ix7a+lYfzBVcHkV+UXarfr3+ZtMzqrbiMfAMcP0utpjdf Re+1wT3ceukGRmomoS5Q8Nj3klmPkEwCI4QvWxv1/gnXZWnY3JzxdYGP4yon0AId5gYB ReUUVR1hPe2tSc0gfDbH+6gZWdele3T6TwbtF2oLrYz7J5/rQoW4aIQkqUcwdhR6uITz f7vR2XKGosnyiNZYTRNLzJsNt6wFD9d8Og+g5Yt0QEFNfgJVVfVDIYihpisgh6J2uT/u qoy/yMG9FFflrJhYoQVKKT3XTbdtf8XAZ2WmqTE5oY9RZ0ruZLcqQqJyH6TCyCJFRYy/ rOfQ== X-Gm-Message-State: AOJu0YxJvqVsFThhsuutPTNCH+9L1NZewihMVTZzwQktR+go1pJiCYwt rNWbXvpk4h0sinMgNaBLUrHDMtpCWHpiNzu9i3lrhv9fX30KNYdZmUTDSLvI X-Received: by 2002:a17:902:dac4:b0:1d5:e413:c139 with SMTP id q4-20020a170902dac400b001d5e413c139mr2780691plx.24.1706723229026; Wed, 31 Jan 2024 09:47:09 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id r20-20020a170902c61400b001d91b608a9csm627159plr.279.2024.01.31.09.47.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jan 2024 09:47:08 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 31 Jan 2024 14:47:16 -0300 Message-ID: <20240131174718.17829-2-jamrial@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240131174718.17829-1-jamrial@gmail.com> References: <20240131174718.17829-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4 v6] 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: KjNEhU4IWpdl This will be used to support tiled image formats like HEIF. Signed-off-by: James Almer --- libavformat/avformat.c | 5 +++ libavformat/avformat.h | 100 +++++++++++++++++++++++++++++++++++++++++ libavformat/dump.c | 29 ++++++++++++ libavformat/options.c | 32 +++++++++++++ 4 files changed, 166 insertions(+) diff --git a/libavformat/avformat.c b/libavformat/avformat.c index 8e8c6fbe55..32ef440207 100644 --- a/libavformat/avformat.c +++ b/libavformat/avformat.c @@ -100,6 +100,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..6577f13ef1 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1018,10 +1018,109 @@ typedef struct AVStream { int pts_wrap_bits; } AVStream; +/** + * AVStreamGroupTileGrid holds information on how to combine several + * independent images on a single grid for presentation. None of the tiles may + * overlap inside the grid. + * + * 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. + * + * sizeof(AVStreamGroupTileGrid) is not a part of the ABI. No new fields may be + * added to this struct without a major version bump. + */ +typedef struct AVStreamGroupTileGrid { + const AVClass *av_class; + + /** + * Width of the final image in the grid. + * + * Must be > 0. + */ + int coded_width; + /** + * Width of the final image in the grid. + * + * 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 grid, 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; + + /** + * Offset in pixels from the left edge of the grid 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 grid 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 bototm 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 +1161,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 aff51b43f6..c9b7369bcd 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" @@ -721,6 +722,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 75ec86ce05..ed96ba4afb 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -337,6 +337,26 @@ 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 image", OFFSET(coded_width), + AV_OPT_TYPE_IMAGE_SIZE, { .str = NULL }, 0, INT_MAX, 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 }, + { "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 }, + { 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; @@ -346,6 +366,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; } @@ -368,6 +390,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; } @@ -429,6 +454,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; }