From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 982D748872 for ; Sat, 20 Jan 2024 22:04:47 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BCD4A68D08A; Sun, 21 Jan 2024 00:04:36 +0200 (EET) Received: from mail-oi1-f176.google.com (mail-oi1-f176.google.com [209.85.167.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F26B968CACA for ; Sun, 21 Jan 2024 00:04:28 +0200 (EET) Received: by mail-oi1-f176.google.com with SMTP id 5614622812f47-3bd4e6a7cb0so1424352b6e.3 for ; Sat, 20 Jan 2024 14:04:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705788267; x=1706393067; 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=mzjCmpB5udAXVQA1jA7syO2547SdNvnUygG0yF/eMNA=; b=I3yRLnyjACoD3809vcK/Ap/ptzsgReapmstbB2T0EdoHvLhGyn31nqziTwM4pki4Ii kQFFlm0MydT5wrfDF8i9J2wi0o2gp5WfxhOqAbdsegTkRh7KnpniTgeP9vCs6gV5eimZ iMBthwinidHkDSfQPCpHLIizGVWaeacBs4dr4EDswKzf0wE5tbUVCA5fDPfeuJJLGCVA +KP54m8boZI1zq5H2dbou672tW2ckXjK3Tr4IHZsiSyU2k1JLmwqmERXvAI5zDYJKHp6 ttN584s0t4sqKr2Mmff0q1NFTX2OzkHrIyb+bdya44ABGYB04UMlibS/QlLp+oWdxAPe amAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705788267; x=1706393067; 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=mzjCmpB5udAXVQA1jA7syO2547SdNvnUygG0yF/eMNA=; b=eFECPPnYCOQVhZLZ+27rhxl8DyFqktSfNbKPkI5WCiSQ7jSx9cOG+DDJnojizfHQOV NxwxMdLcXGacS8lWXOFXmzCd+BqN0oBVADnUyWlC10tDdNfqPA5+I149kKAFWLN69Mzz Nfmhc6Bbq5gcT8oBw61hnxa8bWrwE1SpEQ/zGNsGbQ8Mzz6BcvURr5qU4+ueHw+nGpOT c+4KcJiKCLmBPn/iF49K2rUV+/0tm49DxbKa9CFtqowaBX9fRN7vtjvB0MZLeFqr1Vce 4m5i30Q4xNoJIDgV7AumDGOuLHy9YOBPm9LxRkr+rSdOxVXdfzdqwec8HIvkeICounvm i/sQ== X-Gm-Message-State: AOJu0Yx2H46TrXz93SjZ2KbVe/3u+K2jhqQdySlIao9zg94EEmqGHMcV yMxOLOk/SKw2U0HRDjwhChcagMIEYg8xe7UcrclZ2dWdmCq/qpPIHuxFaRh6 X-Google-Smtp-Source: AGHT+IGJq80AkA+9GSQK172Ek3FJNwwrW7SQo+UP9EHtA10D3wAz6u7tMnUtuaocX7lCxsaw88aQ8A== X-Received: by 2002:a54:4405:0:b0:3bd:4df7:eb70 with SMTP id k5-20020a544405000000b003bd4df7eb70mr2190808oiw.104.1705788266817; Sat, 20 Jan 2024 14:04:26 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id f1-20020a63dc41000000b005c6617b52e6sm5747206pgj.5.2024.01.20.14.04.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Jan 2024 14:04:26 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 20 Jan 2024 19:04:07 -0300 Message-ID: <20240120220407.64141-2-jamrial@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240120220407.64141-1-jamrial@gmail.com> References: <20240120220407.64141-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2 v2] 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This will be used to support tiled image formats like HEIF. Signed-off-by: James Almer --- libavformat/avformat.c | 5 +++++ libavformat/avformat.h | 3 +++ libavformat/dump.c | 46 ++++++++++++++++++++++++++++++++++++++++++ libavformat/options.c | 9 +++++++++ 4 files changed, 63 insertions(+) diff --git a/libavformat/avformat.c b/libavformat/avformat.c index 882927f7b1..a7bd959db5 100644 --- a/libavformat/avformat.c +++ b/libavformat/avformat.c @@ -30,6 +30,7 @@ #include "libavutil/opt.h" #include "libavutil/pixfmt.h" #include "libavutil/samplefmt.h" +#include "libavutil/tile.h" #include "libavcodec/avcodec.h" #include "libavcodec/codec.h" #include "libavcodec/bsf.h" @@ -100,6 +101,10 @@ 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_tile_grid_free(&stg->params.tile_grid); + break; + } default: break; } diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 5d0fe82250..f259ad1367 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1022,10 +1022,12 @@ 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; struct AVIAMFMixPresentation; +struct AVTileGrid; typedef struct AVStreamGroup { /** @@ -1062,6 +1064,7 @@ typedef struct AVStreamGroup { union { struct AVIAMFAudioElement *iamf_audio_element; struct AVIAMFMixPresentation *iamf_mix_presentation; + struct AVTileGrid *tile_grid; } params; /** diff --git a/libavformat/dump.c b/libavformat/dump.c index aff51b43f6..2927c790a8 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" @@ -35,6 +36,7 @@ #include "libavutil/spherical.h" #include "libavutil/stereo3d.h" #include "libavutil/timecode.h" +#include "libavutil/tile.h" #include "libavcodec/avcodec.h" @@ -720,6 +722,50 @@ static void dump_stream_group(const AVFormatContext *ic, uint8_t *printed, } } break; + case AV_STREAM_GROUP_PARAMS_TILE_GRID: { + const AVTileGrid *tile_grid = stg->params.tile_grid; + AVCodecContext *avctx = avcodec_alloc_context3(NULL); + const char *ptr = NULL; + av_log(NULL, AV_LOG_INFO, " Tile Grid:"); + av_log(NULL, AV_LOG_VERBOSE, " %d rows, %d columns,", tile_grid->tile_rows, tile_grid->tile_cols); + if (avctx && stg->nb_streams && !avcodec_parameters_to_context(avctx, stg->streams[0]->codecpar)) { + int coded_width = 0, coded_height = 0; + avctx->width = tile_grid->output_width; + avctx->height = tile_grid->output_height; + switch (tile_grid->type) { + case AV_TILE_DIMENSION_TYPE_UNIFORM: + coded_width = FFALIGN(tile_grid->output_width, tile_grid->w.tile_width); + coded_height = FFALIGN(tile_grid->output_height, tile_grid->h.tile_height); + break; + case AV_TILE_DIMENSION_TYPE_VARIABLE: { + int size = tile_grid->tile_rows * tile_grid->tile_cols; + for (int j = 0; j < tile_grid->tile_cols; j++) + coded_width += tile_grid->w.tile_widths[j]; + for (int j = 0; j < size; j += tile_grid->tile_cols) + coded_height += tile_grid->h.tile_heights[j]; + break; + } + } + avctx->coded_width = coded_width; + avctx->coded_height = 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..b6b7eddd40 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -30,6 +30,7 @@ #include "libavutil/internal.h" #include "libavutil/intmath.h" #include "libavutil/opt.h" +#include "libavutil/tile.h" /** * @file @@ -368,6 +369,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 = av_tile_grid_get_class(); + break; default: break; } @@ -429,6 +433,11 @@ 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_tile_grid_alloc(); + if (!stg->params.tile_grid) + goto fail; + break; default: goto fail; } -- 2.43.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".