From patchwork Fri Mar 8 20:24:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 46909 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c995:b0:1a1:738b:6bc0 with SMTP id gy21csp1192080pzb; Fri, 8 Mar 2024 12:24:57 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCU0emY82cAcOmniuJ0k2PXUomKMxB74ESGRtPu1urKe34veQHCbR2Mo8y+KP/SsiPGzJI/EE+Py//yiMeUeW/o2EFoPfknmZH8elw== X-Google-Smtp-Source: AGHT+IFq7r94fzkfpddGsNF8/lcOdcP7IXJoNzl2jHW/h43n4VioAJkNU3ulHC1ajr02yDnBi9At X-Received: by 2002:a50:d7d4:0:b0:566:a235:7f14 with SMTP id m20-20020a50d7d4000000b00566a2357f14mr206806edj.16.1709929496798; Fri, 08 Mar 2024 12:24:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709929496; cv=none; d=google.com; s=arc-20160816; b=kwFlbbKSIejEcPT8P0y9VUJglnsYE3sUNZ1RkTZmz4nEVA9VzwfRLcoti2Ln8MTU9W 4aEhfkbrHRlIqlEuZgGUFTJdES8O1lXT32FNcS9HsZzr7yoaATtcBmZF7nQV65gd0N3z kLKxntAr6amwgjvsNwDpY3c+2czjowOCfqc2LIlF42ICABGZwUPojz9BxCQiXXbqOz/k BywG545f9yWvfP8qoGa8tvIREj/LMWQI8IXHhLpO9gE10iBMHl/oNxtJdIuSZgdAoP+e iZZY67iGWOjy2P28thchsuBy2vNNivC4vJy7GmN2Rxw55kfMsPy9PEidFjrxtqXA0IDh DmDQ== 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=hVrjAg1FFxcPs/cQ3wli9IgoyBlvwMqdKJpoC0HQq6Y=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=V5cuq2BvUTebSGu7r9f3Il6SYi2Y/ThC3RdR28ZDGqwKrajs3afX0cc5l+CCRNxiGd 6tDMMuP14285GcZQ7mdUPCWD7W7/8m1mulwMsjHolJe3Rp4W68hUq/kPiSWPhX3FcOpp ImmFLQv26YeCgYpoZ5KaCmCqUQgwtOrN3pxOspQfNcnNzqr6SjIqhoUjXRheG2KzcTqN Bssj/zj14S+UttGSsQgEzSRp7oZnRPKEWG1xWU/SZS5z2GcwD8uAT2ZPQLb2kM0YMnOz 6AoNUpivPsxatIAgfPHXiBehmgKoJDWuLVEno3zr7AqPPlThsedC4dF1YUvYEUT0Q3ir QR9g==; 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=nQE8v14y; 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 m29-20020a50931d000000b00564432b527dsi101730eda.551.2024.03.08.12.24.56; Fri, 08 Mar 2024 12:24:56 -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=nQE8v14y; 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 07EC268CF92; Fri, 8 Mar 2024 22:24:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 51A9668CEE7 for ; Fri, 8 Mar 2024 22:24:46 +0200 (EET) Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-6e62c65865cso2119158b3a.2 for ; Fri, 08 Mar 2024 12:24:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709929483; x=1710534283; 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=x6Imlmspm/mlsSuX9OOtmdLHT1IE9yHYxZzrNvWLGd0=; b=nQE8v14y+uaoVF9RQrNoBsjbA65I72wEaLGtZt5z3QvBIi0IEnzV7dgOTp35sEGMRS dD0+7ujGLMzPRfmVd9gRMtlmzwcvExps1jdwv8PRYEmDs7pkuV4chYVtcFiUulA8LBcf j38oJ0SJl9aTRRjbWB/cAn4VF11XQayVvUCDjzPn914OVyOcQdtQHK92hH6gkNTJma3x nyN97kW4LxIAmdOFdn8t50JsHuo+qeEXRhuY3RKoGLI5FSSRnZ9BIPlHBdxVBlmt93db FY9kQMhPUJEm2u5CWJhtzBvcbnmLB0jW02rIdJmQoj3q4F+IPloqmrH4fyYtn3TtsXnK sc0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709929483; x=1710534283; 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=x6Imlmspm/mlsSuX9OOtmdLHT1IE9yHYxZzrNvWLGd0=; b=QnhiPYBBrxr6GaL/577wN7J/sLiySkqSqDFuHBGVRCmxcozy9YxneTYR8izEq2tzsv RRf0x4xr/op0+NHRYhYUfghIaXgZhtjSHygDjOozk6eRuZ1b7Tyrpl3twpbza1OeE93o LwT7DgcOe+5q8Z4+g8b5qNABdruPWl7jlZ7o9/DzbefwPVW92wIxBRM4c8Ua503TC1do JRpFJdVL7yL2MtDz6KyqNfNHGc90F9oHYSh9dst1OsRWjuZwBL5fl15oSq9LZziWEUp6 H4wzfrFwu/zp8nxBPoid8lIQtcp+nVuqiSb2OTD3pVak9VuPo6PZi2jIhWjpKsQZF50N I3Rw== X-Gm-Message-State: AOJu0YxcCZq9OmSIKYC5xRCudg7wSnKUwXruOh8G+fmwT2te+ZJVkmo/ FUVkTCMeFzXyZEfjEMXgUJxgtnPS8QlxjXJkHWW+JQd5a1XNxRmrqYGh5DWI X-Received: by 2002:a05:6a20:a10d:b0:1a1:847f:8e8c with SMTP id q13-20020a056a20a10d00b001a1847f8e8cmr128396pzk.20.1709929483088; Fri, 08 Mar 2024 12:24:43 -0800 (PST) Received: from localhost.localdomain ([190.194.169.124]) by smtp.gmail.com with ESMTPSA id p18-20020aa79e92000000b006e55016966fsm100253pfq.81.2024.03.08.12.24.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Mar 2024 12:24:42 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Mar 2024 17:24:47 -0300 Message-ID: <20240308202448.62576-1-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2 v3] fftools/ffprobe: export Tile Grid Stream Group parameters 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: CVQ2493hrYZg Signed-off-by: James Almer --- doc/ffprobe.xsd | 50 +++++++++++++++++ fftools/ffprobe.c | 53 ++++++++++++++++--- tests/fate/mov.mak | 6 +-- .../ref/fate/mov-heic-demux-still-image-grid | 29 ++++++++++ .../ref/fate/mov-heic-demux-still-image-iovl | 19 +++++++ .../fate/mov-heic-demux-still-image-iovl-2 | 19 +++++++ 6 files changed, 165 insertions(+), 11 deletions(-) I'll factorize the tests arguments later. diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd index 5010c5a45f..bd52000725 100644 --- a/doc/ffprobe.xsd +++ b/doc/ffprobe.xsd @@ -15,6 +15,7 @@ + @@ -229,6 +230,12 @@ + + + + + + @@ -325,6 +332,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index e003ac6cfd..bf635ffbd6 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -114,6 +114,7 @@ static int do_show_frames = 0; static int do_show_packets = 0; static int do_show_programs = 0; static int do_show_stream_groups = 0; +static int do_show_stream_group_components = 0; static int do_show_streams = 0; static int do_show_stream_disposition = 0; static int do_show_stream_group_disposition = 0; @@ -210,6 +211,10 @@ typedef enum { SECTION_ID_STREAM_GROUP_STREAM_DISPOSITION, SECTION_ID_STREAM_GROUP_STREAM_TAGS, SECTION_ID_STREAM_GROUP, + SECTION_ID_STREAM_GROUP_COMPONENTS, + SECTION_ID_STREAM_GROUP_COMPONENT, + SECTION_ID_STREAM_GROUP_SUBCOMPONENTS, + SECTION_ID_STREAM_GROUP_SUBCOMPONENT, SECTION_ID_STREAM_GROUP_STREAMS, SECTION_ID_STREAM_GROUP_STREAM, SECTION_ID_STREAM_GROUP_DISPOSITION, @@ -310,7 +315,11 @@ static struct section sections[] = { [SECTION_ID_PROGRAMS] = { SECTION_ID_PROGRAMS, "programs", SECTION_FLAG_IS_ARRAY, { SECTION_ID_PROGRAM, -1 } }, [SECTION_ID_STREAM_GROUP_STREAM_DISPOSITION] = { SECTION_ID_STREAM_GROUP_STREAM_DISPOSITION, "disposition", 0, { -1 }, .unique_name = "stream_group_stream_disposition" }, [SECTION_ID_STREAM_GROUP_STREAM_TAGS] = { SECTION_ID_STREAM_GROUP_STREAM_TAGS, "tags", SECTION_FLAG_HAS_VARIABLE_FIELDS, { -1 }, .element_name = "tag", .unique_name = "stream_group_stream_tags" }, - [SECTION_ID_STREAM_GROUP] = { SECTION_ID_STREAM_GROUP, "stream_group", SECTION_FLAG_HAS_TYPE, { SECTION_ID_STREAM_GROUP_TAGS, SECTION_ID_STREAM_GROUP_DISPOSITION, SECTION_ID_STREAM_GROUP_STREAMS, -1 }, .get_type = get_stream_group_type }, + [SECTION_ID_STREAM_GROUP] = { SECTION_ID_STREAM_GROUP, "stream_group", 0, { SECTION_ID_STREAM_GROUP_TAGS, SECTION_ID_STREAM_GROUP_DISPOSITION, SECTION_ID_STREAM_GROUP_COMPONENTS, SECTION_ID_STREAM_GROUP_STREAMS, -1 } }, + [SECTION_ID_STREAM_GROUP_COMPONENTS] = { SECTION_ID_STREAM_GROUP_COMPONENTS, "components", SECTION_FLAG_IS_ARRAY, { SECTION_ID_STREAM_GROUP_COMPONENT, -1 }, .element_name = "component", .unique_name = "stream_group_components" }, + [SECTION_ID_STREAM_GROUP_COMPONENT] = { SECTION_ID_STREAM_GROUP_COMPONENT, "component", SECTION_FLAG_HAS_VARIABLE_FIELDS|SECTION_FLAG_HAS_TYPE, { SECTION_ID_STREAM_GROUP_SUBCOMPONENTS, -1 }, .unique_name = "stream_group_component", .element_name = "component_entry", .get_type = get_stream_group_type }, + [SECTION_ID_STREAM_GROUP_SUBCOMPONENTS] = { SECTION_ID_STREAM_GROUP_SUBCOMPONENTS, "subcomponents", SECTION_FLAG_IS_ARRAY, { SECTION_ID_STREAM_GROUP_SUBCOMPONENT, -1 }, .element_name = "component" }, + [SECTION_ID_STREAM_GROUP_SUBCOMPONENT] = { SECTION_ID_STREAM_GROUP_SUBCOMPONENT, "subcomponent", SECTION_FLAG_HAS_VARIABLE_FIELDS|SECTION_FLAG_HAS_TYPE, { -1 }, .element_name = "subcomponent_entry", .get_type = get_raw_string_type }, [SECTION_ID_STREAM_GROUP_STREAMS] = { SECTION_ID_STREAM_GROUP_STREAMS, "streams", SECTION_FLAG_IS_ARRAY, { SECTION_ID_STREAM_GROUP_STREAM, -1 }, .unique_name = "stream_group_streams" }, [SECTION_ID_STREAM_GROUP_STREAM] = { SECTION_ID_STREAM_GROUP_STREAM, "stream", 0, { SECTION_ID_STREAM_GROUP_STREAM_DISPOSITION, SECTION_ID_STREAM_GROUP_STREAM_TAGS, -1 }, .unique_name = "stream_group_stream" }, [SECTION_ID_STREAM_GROUP_DISPOSITION] = { SECTION_ID_STREAM_GROUP_DISPOSITION, "disposition", 0, { -1 }, .unique_name = "stream_group_disposition" }, @@ -3491,13 +3500,35 @@ static int show_programs(WriterContext *w, InputFile *ifile) return ret; } +static void print_tile_grid_params(WriterContext *w, const AVStreamGroup *stg, + const AVStreamGroupTileGrid *tile_grid) +{ + writer_print_section_header(w, stg, SECTION_ID_STREAM_GROUP_COMPONENT); + print_int("nb_tiles", tile_grid->nb_tiles); + print_int("coded_width", tile_grid->coded_width); + print_int("coded_height", tile_grid->coded_height); + print_int("horizontal_offset", tile_grid->horizontal_offset); + print_int("vertical_offset", tile_grid->vertical_offset); + print_int("width", tile_grid->width); + print_int("height", tile_grid->height); + writer_print_section_header(w, NULL, SECTION_ID_STREAM_GROUP_SUBCOMPONENTS); + for (int i = 0; i < tile_grid->nb_tiles; i++) { + writer_print_section_header(w, "tile_offset", SECTION_ID_STREAM_GROUP_SUBCOMPONENT); + print_int("stream_index", tile_grid->offsets[i].idx); + print_int("tile_horizontal_offset", tile_grid->offsets[i].horizontal); + print_int("tile_vertical_offset", tile_grid->offsets[i].vertical); + writer_print_section_footer(w); + } + writer_print_section_footer(w); + writer_print_section_footer(w); +} + static void print_stream_group_params(WriterContext *w, AVStreamGroup *stg) { - const char *unknown = "unknown"; - if (stg->type != AV_STREAM_GROUP_PARAMS_NONE) - print_str("type", av_x_if_null(avformat_stream_group_name(stg->type), unknown)); - else - print_str_opt("type", unknown); + writer_print_section_header(w, NULL, SECTION_ID_STREAM_GROUP_COMPONENTS); + if (stg->type == AV_STREAM_GROUP_PARAMS_TILE_GRID) + print_tile_grid_params(w, stg, stg->params.tile_grid); + writer_print_section_footer(w); // SECTION_ID_STREAM_GROUP_COMPONENTS } static int show_stream_group(WriterContext *w, InputFile *ifile, AVStreamGroup *stg) @@ -3507,12 +3538,17 @@ static int show_stream_group(WriterContext *w, InputFile *ifile, AVStreamGroup * int i, ret = 0; av_bprint_init(&pbuf, 1, AV_BPRINT_SIZE_UNLIMITED); - writer_print_section_header(w, stg, SECTION_ID_STREAM_GROUP); + writer_print_section_header(w, NULL, SECTION_ID_STREAM_GROUP); print_int("index", stg->index); if (fmt_ctx->iformat->flags & AVFMT_SHOW_IDS) print_fmt ("id", "0x%"PRIx64, stg->id); else print_str_opt("id", "N/A"); print_int("nb_streams", stg->nb_streams); - print_stream_group_params(w, stg); + if (stg->type != AV_STREAM_GROUP_PARAMS_NONE) + print_str("type", av_x_if_null(avformat_stream_group_name(stg->type), "unknown")); + else + print_str_opt("type", "unknown"); + if (do_show_stream_group_components) + print_stream_group_params(w, stg); /* Print disposition information */ if (do_show_stream_group_disposition) @@ -4439,6 +4475,7 @@ int main(int argc, char **argv) SET_DO_SHOW(PROGRAMS, programs); SET_DO_SHOW(STREAM_GROUP_DISPOSITION, stream_group_disposition); SET_DO_SHOW(STREAM_GROUPS, stream_groups); + SET_DO_SHOW(STREAM_GROUP_COMPONENTS, stream_group_components); SET_DO_SHOW(STREAMS, streams); SET_DO_SHOW(STREAM_DISPOSITION, stream_disposition); SET_DO_SHOW(PROGRAM_STREAM_DISPOSITION, stream_disposition); diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index 49077ecfb3..6dc5b5f5af 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -166,19 +166,19 @@ fate-mov-heic-demux-still-image-multiple-items: CMD = framecrc -i $(TARGET_SAMPL FATE_MOV_FFMPEG_FFPROBE_SAMPLES-$(call DEMMUX, MOV, FRAMECRC, HEVC_DECODER HEVC_PARSER) \ += fate-mov-heic-demux-still-image-grid fate-mov-heic-demux-still-image-grid: CMD = stream_demux mov $(TARGET_SAMPLES)/heif-conformance/C007.heic "" "-c:v copy -map 0:g:0" \ - "-show_entries stream_group=index,id,nb_streams,type:stream_group_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition" + "-show_entries stream_group=index,id,nb_streams,type:stream_group_components:stream_group_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition" # heic demuxing - still image with multiple items in an overlay canvas. FATE_MOV_FFMPEG_FFPROBE_SAMPLES-$(call DEMMUX, MOV, FRAMECRC, HEVC_DECODER HEVC_PARSER) \ += fate-mov-heic-demux-still-image-iovl fate-mov-heic-demux-still-image-iovl: CMD = stream_demux mov $(TARGET_SAMPLES)/heif-conformance/C015.heic "" "-c:v copy -map 0:g:0" \ - "-show_entries stream_group=index,id,nb_streams,type:stream_group_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition" + "-show_entries stream_group=index,id,nb_streams,type:stream_group_components:stream_group_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition" # heic demuxing - still image where one image item is placed twice on an overlay canvas. FATE_MOV_FFMPEG_FFPROBE_SAMPLES-$(call DEMMUX, MOV, FRAMECRC, HEVC_DECODER HEVC_PARSER) \ += fate-mov-heic-demux-still-image-iovl-2 fate-mov-heic-demux-still-image-iovl-2: CMD = stream_demux mov $(TARGET_SAMPLES)/heif-conformance/C021.heic "" "-c:v copy -map 0:g:0" \ - "-show_entries stream_group=index,id,nb_streams,type:stream_group_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition" + "-show_entries stream_group=index,id,nb_streams,type:stream_group_components:stream_group_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition" # Resulting remux should have: # 1. first audio stream with AV_DISPOSITION_HEARING_IMPAIRED diff --git a/tests/ref/fate/mov-heic-demux-still-image-grid b/tests/ref/fate/mov-heic-demux-still-image-grid index b15ce91e1a..d8dfccea8f 100644 --- a/tests/ref/fate/mov-heic-demux-still-image-grid +++ b/tests/ref/fate/mov-heic-demux-still-image-grid @@ -31,6 +31,35 @@ index=0 id=0x3f1 nb_streams=4 type=Tile Grid +[COMPONENT] +nb_tiles=4 +coded_width=2560 +coded_height=1440 +horizontal_offset=0 +vertical_offset=0 +width=2560 +height=1440 +[SUBCOMPONENT] +stream_index=0 +tile_horizontal_offset=0 +tile_vertical_offset=0 +[/SUBCOMPONENT] +[SUBCOMPONENT] +stream_index=1 +tile_horizontal_offset=1280 +tile_vertical_offset=0 +[/SUBCOMPONENT] +[SUBCOMPONENT] +stream_index=2 +tile_horizontal_offset=0 +tile_vertical_offset=720 +[/SUBCOMPONENT] +[SUBCOMPONENT] +stream_index=3 +tile_horizontal_offset=1280 +tile_vertical_offset=720 +[/SUBCOMPONENT] +[/COMPONENT] DISPOSITION:default=1 DISPOSITION:dub=0 DISPOSITION:original=0 diff --git a/tests/ref/fate/mov-heic-demux-still-image-iovl b/tests/ref/fate/mov-heic-demux-still-image-iovl index 113b251c00..2b211267a4 100644 --- a/tests/ref/fate/mov-heic-demux-still-image-iovl +++ b/tests/ref/fate/mov-heic-demux-still-image-iovl @@ -17,6 +17,25 @@ index=0 id=0x3ee nb_streams=2 type=Tile Grid +[COMPONENT] +nb_tiles=2 +coded_width=1440 +coded_height=960 +horizontal_offset=0 +vertical_offset=0 +width=1440 +height=960 +[SUBCOMPONENT] +stream_index=0 +tile_horizontal_offset=0 +tile_vertical_offset=0 +[/SUBCOMPONENT] +[SUBCOMPONENT] +stream_index=1 +tile_horizontal_offset=160 +tile_vertical_offset=240 +[/SUBCOMPONENT] +[/COMPONENT] DISPOSITION:default=0 DISPOSITION:dub=0 DISPOSITION:original=0 diff --git a/tests/ref/fate/mov-heic-demux-still-image-iovl-2 b/tests/ref/fate/mov-heic-demux-still-image-iovl-2 index 8ee3543e43..492f404a3c 100644 --- a/tests/ref/fate/mov-heic-demux-still-image-iovl-2 +++ b/tests/ref/fate/mov-heic-demux-still-image-iovl-2 @@ -10,6 +10,25 @@ index=0 id=0x3eb nb_streams=1 type=Tile Grid +[COMPONENT] +nb_tiles=2 +coded_width=640 +coded_height=360 +horizontal_offset=0 +vertical_offset=0 +width=640 +height=360 +[SUBCOMPONENT] +stream_index=0 +tile_horizontal_offset=0 +tile_vertical_offset=0 +[/SUBCOMPONENT] +[SUBCOMPONENT] +stream_index=0 +tile_horizontal_offset=64896 +tile_vertical_offset=65176 +[/SUBCOMPONENT] +[/COMPONENT] DISPOSITION:default=0 DISPOSITION:dub=0 DISPOSITION:original=0 From patchwork Fri Mar 8 20:24:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 46910 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c995:b0:1a1:738b:6bc0 with SMTP id gy21csp1192157pzb; Fri, 8 Mar 2024 12:25:07 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCW4KphKGymbgmgtkTDZCp6/57EmI1jY06wQpXaQicbzHWDW7noxt5eF+jhv5JWSgmHTbGjkc65au24Op0fJ2ikq5rPOgWTME7x7Pg== X-Google-Smtp-Source: AGHT+IHSGU5b+yw38mdBskaXhjRsuPo7tR3i8dwNwP8wsteufcPdi6M7rtC9CJmURgvmUYQEMWCX X-Received: by 2002:a17:906:a111:b0:a44:b96:2809 with SMTP id t17-20020a170906a11100b00a440b962809mr1275377ejy.24.1709929507048; Fri, 08 Mar 2024 12:25:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709929507; cv=none; d=google.com; s=arc-20160816; b=k/0ECmHoYlWUm32mj/Y026lnScOzFdvio8M0dhh6bTomnI0eNcI8sDUF7KybPn/D/6 YqYVCRGzsllFj/4aTo7c9+0FlRejI1WOT8E+0r+/EBzDMeuLrlQPWOYUuWqzZj20pckI Sqw//f08rVvM5uukeH15SoUZQ5WX5VuMhvWHieq/VDhAeq6M6UWGuCYQUa0u5gYbvRBu jDkHOcCmF8/+0qS3nRmticsE+tcYkcaLqGp/5Goz7ZsTZ5tXGYkPVn2lNzqk2ktJlDL2 cLVqMBKJEiC5U0WYquGPc7p50e2vXbVVdr9xp1VMTlYUhiWiWTYu1zYBd0KVOYHIxZrN hSNA== 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=2D0cpb/B9ORmTpkUcHFn8cvX54GUFw8OL+5ZZIqnSfo=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=bUDQD2U4EoqZyF5DXKRSvXGJgvpj/vXJzewKWA/UIHyjUYSnl9gsmw7JTsyqRkvQhq 0NoibM1sq7Zk1f9kUeGa7TFKcl8nHxKK4dDleu3HY7lHsqyreys3fXNhTdGjhYWPzZ9v OZ2CX9OUlAMycjJVdqGqyCdtIy3RZXqQAPOz8rYfxyStTCfJPqGak+jx/LUT1brhVCq/ adX/yA0I2v+KFvjPW/N18Uq8/mW7dkSpxN/BtzwMththBva5paprzSEFIqehk+vLrOfo Io8ZeWdNyDBUu/YKmKlglyH8VtMYxaUmfl3bNvGiVcealQwtrPeND2r18Fr7GOpJpRZu BnyQ==; 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=eqYuTUyC; 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 d24-20020a1709064c5800b00a3f89681212si114539ejw.101.2024.03.08.12.25.06; Fri, 08 Mar 2024 12:25:07 -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=eqYuTUyC; 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 48B4E68CFEC; Fri, 8 Mar 2024 22:24:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4229A68CFC8 for ; Fri, 8 Mar 2024 22:24:48 +0200 (EET) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-6e5760eeb7aso1906712b3a.1 for ; Fri, 08 Mar 2024 12:24:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709929485; x=1710534285; 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=JLJfYO5bFLntGIpgMNAy1Kv2pSiUyfEwV/pt3theByg=; b=eqYuTUyC59d46EAzBwYYQSt1KIuiqr+ZTuq7u9XH8n7HJmSPlobPnsiHS0NekPf5ZI BRxIxwizYIsibRKtBmjv0M1GGgFvEO6pgT8hGAbPcj1Dtvnof0y29IXTR7+CaJMaYEIa amXAvToRfj4A3c1n73kUH0VRgzIWOLfUS/NnmiNv+AddE5J+7RP54cXxDF/yZ4OMZPPt IrPOe5r7n0lLl8pavCzt9hlIVDr/I9Q4n4t0a/9O5YpRNFumvMG+ZChYakyZ53Gbaafm +hnkD8vJPk1PneGyJY3UpAqLoJ2VJIKOm4109fJUoyYVu5G6o6NfM0uuAbWQhgJaYR6g OEcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709929485; x=1710534285; 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=JLJfYO5bFLntGIpgMNAy1Kv2pSiUyfEwV/pt3theByg=; b=cOrLoKgC86FGXTE0OdkAAxs7BbroJMaCzd0nrp7YgGaYsj3PCk7RhFYpwR7KDnZt9z MAQuaPyoW8fxNIH1Tq8PWaEh3QhplPbcOgu0/Arwmy1orl571E2bW/hrOn93Ts0CSuyO CF8Sv1ZRMz/TGg1XDmK0Qv88JrU5Zk4O3Ud92VF2//j0zJQN5PtqEePrMOfTYNt8PEIf Fk6xG6dLQ+PkFHIyDo84FsQCDELQbBf4xBp+VhvnuDHimuoMyAUW5GAydy/JUInxnSdd ftG/9LtvcbMgpjRoYipR8OSOuYuUoHgdtDl1LV8c3xgOSYO1ZhhozcDIT9mExWwXkpYt vSFg== X-Gm-Message-State: AOJu0YwRIvEzNlZvo50lNo/2Dy1jXMLBMqh70OZoU4yjz2IRN0mCpt9B SaSD0EtKsK/s3k7dAvDSILqhntFS6AvV+5zrc9Aodqqo+XouKZbloYVM8FWy X-Received: by 2002:a05:6a20:d388:b0:19e:a36c:36ef with SMTP id iq8-20020a056a20d38800b0019ea36c36efmr94641pzb.48.1709929484956; Fri, 08 Mar 2024 12:24:44 -0800 (PST) Received: from localhost.localdomain ([190.194.169.124]) by smtp.gmail.com with ESMTPSA id p18-20020aa79e92000000b006e55016966fsm100253pfq.81.2024.03.08.12.24.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Mar 2024 12:24:44 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Mar 2024 17:24:48 -0300 Message-ID: <20240308202448.62576-2-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240308202448.62576-1-jamrial@gmail.com> References: <20240308202448.62576-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2 v2] fftools/ffprobe: export IAMF Stream Group parameters 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: 5DVARLjrXPih Signed-off-by: James Almer --- doc/ffprobe.xsd | 39 ++++++ fftools/ffprobe.c | 160 +++++++++++++++++++++++- tests/fate/iamf.mak | 12 +- tests/fate/mov.mak | 8 +- tests/ref/fate/iamf-5_1_4 | 92 ++++++++++++++ tests/ref/fate/iamf-7_1_4 | 92 ++++++++++++++ tests/ref/fate/iamf-ambisonic_1 | 39 ++++++ tests/ref/fate/iamf-stereo | 67 ++++++++++ tests/ref/fate/mov-mp4-iamf-5_1_4 | 92 ++++++++++++++ tests/ref/fate/mov-mp4-iamf-7_1_4 | 92 ++++++++++++++ tests/ref/fate/mov-mp4-iamf-ambisonic_1 | 39 ++++++ tests/ref/fate/mov-mp4-iamf-stereo | 67 ++++++++++ 12 files changed, 787 insertions(+), 12 deletions(-) diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd index bd52000725..6d5d094d97 100644 --- a/doc/ffprobe.xsd +++ b/doc/ffprobe.xsd @@ -366,10 +366,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index bf635ffbd6..58fb5427b1 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -42,6 +42,7 @@ #include "libavutil/film_grain_params.h" #include "libavutil/hash.h" #include "libavutil/hdr_dynamic_metadata.h" +#include "libavutil/iamf.h" #include "libavutil/mastering_display_metadata.h" #include "libavutil/hdr_dynamic_vivid_metadata.h" #include "libavutil/dovi_meta.h" @@ -215,6 +216,12 @@ typedef enum { SECTION_ID_STREAM_GROUP_COMPONENT, SECTION_ID_STREAM_GROUP_SUBCOMPONENTS, SECTION_ID_STREAM_GROUP_SUBCOMPONENT, + SECTION_ID_STREAM_GROUP_PIECES, + SECTION_ID_STREAM_GROUP_PIECE, + SECTION_ID_STREAM_GROUP_SUBPIECES, + SECTION_ID_STREAM_GROUP_SUBPIECE, + SECTION_ID_STREAM_GROUP_BLOCKS, + SECTION_ID_STREAM_GROUP_BLOCK, SECTION_ID_STREAM_GROUP_STREAMS, SECTION_ID_STREAM_GROUP_STREAM, SECTION_ID_STREAM_GROUP_DISPOSITION, @@ -288,8 +295,8 @@ static struct section sections[] = { [SECTION_ID_FRAME_SIDE_DATA_TIMECODE] = { SECTION_ID_FRAME_SIDE_DATA_TIMECODE, "timecode", 0, { -1 } }, [SECTION_ID_FRAME_SIDE_DATA_COMPONENT_LIST] = { SECTION_ID_FRAME_SIDE_DATA_COMPONENT_LIST, "components", SECTION_FLAG_IS_ARRAY, { SECTION_ID_FRAME_SIDE_DATA_COMPONENT, -1 }, .element_name = "component", .unique_name = "frame_side_data_components" }, [SECTION_ID_FRAME_SIDE_DATA_COMPONENT] = { SECTION_ID_FRAME_SIDE_DATA_COMPONENT, "component", SECTION_FLAG_HAS_VARIABLE_FIELDS|SECTION_FLAG_HAS_TYPE, { SECTION_ID_FRAME_SIDE_DATA_PIECE_LIST, -1 }, .unique_name = "frame_side_data_component", .element_name = "component_entry", .get_type = get_raw_string_type }, - [SECTION_ID_FRAME_SIDE_DATA_PIECE_LIST] = { SECTION_ID_FRAME_SIDE_DATA_PIECE_LIST, "pieces", SECTION_FLAG_IS_ARRAY, { SECTION_ID_FRAME_SIDE_DATA_PIECE, -1 }, .element_name = "piece" }, - [SECTION_ID_FRAME_SIDE_DATA_PIECE] = { SECTION_ID_FRAME_SIDE_DATA_PIECE, "piece", SECTION_FLAG_HAS_VARIABLE_FIELDS|SECTION_FLAG_HAS_TYPE, { -1 }, .element_name = "piece_entry", .get_type = get_raw_string_type }, + [SECTION_ID_FRAME_SIDE_DATA_PIECE_LIST] = { SECTION_ID_FRAME_SIDE_DATA_PIECE_LIST, "pieces", SECTION_FLAG_IS_ARRAY, { SECTION_ID_FRAME_SIDE_DATA_PIECE, -1 }, .element_name = "piece", .unique_name = "frame_side_data_pieces" }, + [SECTION_ID_FRAME_SIDE_DATA_PIECE] = { SECTION_ID_FRAME_SIDE_DATA_PIECE, "piece", SECTION_FLAG_HAS_VARIABLE_FIELDS|SECTION_FLAG_HAS_TYPE, { -1 }, .element_name = "piece_entry", .unique_name = "frame_side_data_piece", .get_type = get_raw_string_type }, [SECTION_ID_FRAME_LOGS] = { SECTION_ID_FRAME_LOGS, "logs", SECTION_FLAG_IS_ARRAY, { SECTION_ID_FRAME_LOG, -1 } }, [SECTION_ID_FRAME_LOG] = { SECTION_ID_FRAME_LOG, "log", 0, { -1 }, }, [SECTION_ID_LIBRARY_VERSIONS] = { SECTION_ID_LIBRARY_VERSIONS, "library_versions", SECTION_FLAG_IS_ARRAY, { SECTION_ID_LIBRARY_VERSION, -1 } }, @@ -319,7 +326,13 @@ static struct section sections[] = { [SECTION_ID_STREAM_GROUP_COMPONENTS] = { SECTION_ID_STREAM_GROUP_COMPONENTS, "components", SECTION_FLAG_IS_ARRAY, { SECTION_ID_STREAM_GROUP_COMPONENT, -1 }, .element_name = "component", .unique_name = "stream_group_components" }, [SECTION_ID_STREAM_GROUP_COMPONENT] = { SECTION_ID_STREAM_GROUP_COMPONENT, "component", SECTION_FLAG_HAS_VARIABLE_FIELDS|SECTION_FLAG_HAS_TYPE, { SECTION_ID_STREAM_GROUP_SUBCOMPONENTS, -1 }, .unique_name = "stream_group_component", .element_name = "component_entry", .get_type = get_stream_group_type }, [SECTION_ID_STREAM_GROUP_SUBCOMPONENTS] = { SECTION_ID_STREAM_GROUP_SUBCOMPONENTS, "subcomponents", SECTION_FLAG_IS_ARRAY, { SECTION_ID_STREAM_GROUP_SUBCOMPONENT, -1 }, .element_name = "component" }, - [SECTION_ID_STREAM_GROUP_SUBCOMPONENT] = { SECTION_ID_STREAM_GROUP_SUBCOMPONENT, "subcomponent", SECTION_FLAG_HAS_VARIABLE_FIELDS|SECTION_FLAG_HAS_TYPE, { -1 }, .element_name = "subcomponent_entry", .get_type = get_raw_string_type }, + [SECTION_ID_STREAM_GROUP_SUBCOMPONENT] = { SECTION_ID_STREAM_GROUP_SUBCOMPONENT, "subcomponent", SECTION_FLAG_HAS_VARIABLE_FIELDS|SECTION_FLAG_HAS_TYPE, { SECTION_ID_STREAM_GROUP_PIECES, -1 }, .element_name = "subcomponent_entry", .get_type = get_raw_string_type }, + [SECTION_ID_STREAM_GROUP_PIECES] = { SECTION_ID_STREAM_GROUP_PIECES, "pieces", SECTION_FLAG_IS_ARRAY, { SECTION_ID_STREAM_GROUP_PIECE, -1 }, .element_name = "piece", .unique_name = "stream_group_pieces" }, + [SECTION_ID_STREAM_GROUP_PIECE] = { SECTION_ID_STREAM_GROUP_PIECE, "piece", SECTION_FLAG_HAS_VARIABLE_FIELDS|SECTION_FLAG_HAS_TYPE, { SECTION_ID_STREAM_GROUP_SUBPIECES, -1 }, .unique_name = "stream_group_piece", .element_name = "piece_entry", .get_type = get_raw_string_type }, + [SECTION_ID_STREAM_GROUP_SUBPIECES] = { SECTION_ID_STREAM_GROUP_SUBPIECES, "subpieces", SECTION_FLAG_IS_ARRAY, { SECTION_ID_STREAM_GROUP_SUBPIECE, -1 }, .element_name = "subpiece" }, + [SECTION_ID_STREAM_GROUP_SUBPIECE] = { SECTION_ID_STREAM_GROUP_SUBPIECE, "subpiece", SECTION_FLAG_HAS_VARIABLE_FIELDS|SECTION_FLAG_HAS_TYPE, { SECTION_ID_STREAM_GROUP_BLOCKS, -1 }, .element_name = "subpiece_entry", .get_type = get_raw_string_type }, + [SECTION_ID_STREAM_GROUP_BLOCKS] = { SECTION_ID_STREAM_GROUP_BLOCKS, "blocks", SECTION_FLAG_IS_ARRAY, { SECTION_ID_STREAM_GROUP_BLOCK, -1 }, .element_name = "block" }, + [SECTION_ID_STREAM_GROUP_BLOCK] = { SECTION_ID_STREAM_GROUP_BLOCK, "block", SECTION_FLAG_HAS_VARIABLE_FIELDS|SECTION_FLAG_HAS_TYPE, { -1 }, .element_name = "block_entry", .get_type = get_raw_string_type }, [SECTION_ID_STREAM_GROUP_STREAMS] = { SECTION_ID_STREAM_GROUP_STREAMS, "streams", SECTION_FLAG_IS_ARRAY, { SECTION_ID_STREAM_GROUP_STREAM, -1 }, .unique_name = "stream_group_streams" }, [SECTION_ID_STREAM_GROUP_STREAM] = { SECTION_ID_STREAM_GROUP_STREAM, "stream", 0, { SECTION_ID_STREAM_GROUP_STREAM_DISPOSITION, SECTION_ID_STREAM_GROUP_STREAM_TAGS, -1 }, .unique_name = "stream_group_stream" }, [SECTION_ID_STREAM_GROUP_DISPOSITION] = { SECTION_ID_STREAM_GROUP_DISPOSITION, "disposition", 0, { -1 }, .unique_name = "stream_group_disposition" }, @@ -524,7 +537,7 @@ typedef struct Writer { int flags; ///< a combination or WRITER_FLAG_* } Writer; -#define SECTION_MAX_NB_LEVELS 10 +#define SECTION_MAX_NB_LEVELS 12 struct WriterContext { const AVClass *class; ///< class of the writer @@ -3523,11 +3536,150 @@ static void print_tile_grid_params(WriterContext *w, const AVStreamGroup *stg, writer_print_section_footer(w); } +static void print_iamf_param_definition(WriterContext *w, const char *name, + const AVIAMFParamDefinition *param, SectionID section_id) +{ + SectionID subsection_id, parameter_section_id; + subsection_id = sections[section_id].children_ids[0]; + av_assert0(subsection_id != -1); + parameter_section_id = sections[subsection_id].children_ids[0]; + av_assert0(parameter_section_id != -1); + writer_print_section_header(w, "IAMF Param Definition", section_id); + print_str("name", name); + print_int("nb_subblocks", param->nb_subblocks); + print_int("type", param->type); + print_int("parameter_id", param->parameter_id); + print_int("parameter_rate", param->parameter_rate); + print_int("duration", param->duration); + print_int("constant_subblock_duration", param->constant_subblock_duration); + if (param->nb_subblocks > 0) + writer_print_section_header(w, NULL, subsection_id); + for (int i = 0; i < param->nb_subblocks; i++) { + const void *subblock = av_iamf_param_definition_get_subblock(param, i); + switch(param->type) { + case AV_IAMF_PARAMETER_DEFINITION_MIX_GAIN: { + const AVIAMFMixGain *mix = subblock; + writer_print_section_header(w, "IAMF Mix Gain Parameters", parameter_section_id); + print_int("subblock_duration", mix->subblock_duration); + print_int("animation_type", mix->animation_type); + print_q("start_point_value", mix->start_point_value, '/'); + print_q("end_point_value", mix->end_point_value, '/'); + print_q("control_point_value", mix->control_point_value, '/'); + print_q("control_point_relative_time", mix->control_point_relative_time, '/'); + writer_print_section_footer(w); // parameter_section_id + break; + } + case AV_IAMF_PARAMETER_DEFINITION_DEMIXING: { + const AVIAMFDemixingInfo *demix = subblock; + writer_print_section_header(w, "IAMF Demixing Info", parameter_section_id); + print_int("subblock_duration", demix->subblock_duration); + print_int("dmixp_mode", demix->dmixp_mode); + writer_print_section_footer(w); // parameter_section_id + break; + } + case AV_IAMF_PARAMETER_DEFINITION_RECON_GAIN: { + const AVIAMFReconGain *recon = subblock; + writer_print_section_header(w, "IAMF Recon Gain", parameter_section_id); + print_int("subblock_duration", recon->subblock_duration); + writer_print_section_footer(w); // parameter_section_id + break; + } + } + } + if (param->nb_subblocks > 0) + writer_print_section_footer(w); // subsection_id + writer_print_section_footer(w); // section_id +} + +static void print_iamf_audio_element_params(WriterContext *w, const AVStreamGroup *stg, + const AVIAMFAudioElement *audio_element) +{ + writer_print_section_header(w, stg, SECTION_ID_STREAM_GROUP_COMPONENT); + print_int("nb_layers", audio_element->nb_layers); + print_int("audio_element_type", audio_element->audio_element_type); + print_int("default_w", audio_element->default_w); + writer_print_section_header(w, NULL, SECTION_ID_STREAM_GROUP_SUBCOMPONENTS); + for (int i = 0; i < audio_element->nb_layers; i++) { + const AVIAMFLayer *layer = audio_element->layers[i]; + char val_str[128]; + writer_print_section_header(w, "IAMF Audio Layer", SECTION_ID_STREAM_GROUP_SUBCOMPONENT); + av_channel_layout_describe(&layer->ch_layout, val_str, sizeof(val_str)); + print_str("channel_layout", val_str); + if (audio_element->audio_element_type == AV_IAMF_AUDIO_ELEMENT_TYPE_CHANNEL) { + print_int("output_gain_flags", layer->output_gain_flags); + print_q("output_gain", layer->output_gain, '/'); + } else if (audio_element->audio_element_type == AV_IAMF_AUDIO_ELEMENT_TYPE_SCENE) + print_int("ambisonics_mode", layer->ambisonics_mode); + writer_print_section_footer(w); // SECTION_ID_STREAM_GROUP_SUBCOMPONENT + } + if (audio_element->demixing_info) + print_iamf_param_definition(w, "demixing_info", audio_element->demixing_info, + SECTION_ID_STREAM_GROUP_SUBCOMPONENT); + if (audio_element->recon_gain_info) + print_iamf_param_definition(w, "recon_gain_info", audio_element->recon_gain_info, + SECTION_ID_STREAM_GROUP_SUBCOMPONENT); + writer_print_section_footer(w); // SECTION_ID_STREAM_GROUP_SUBCOMPONENTS + writer_print_section_footer(w); // SECTION_ID_STREAM_GROUP_COMPONENT +} + +static void print_iamf_submix_params(WriterContext *w, const AVIAMFSubmix *submix) +{ + writer_print_section_header(w, "IAMF Submix", SECTION_ID_STREAM_GROUP_SUBCOMPONENT); + print_int("nb_elements", submix->nb_elements); + print_int("nb_layouts", submix->nb_layouts); + print_q("default_mix_gain", submix->default_mix_gain, '/'); + writer_print_section_header(w, NULL, SECTION_ID_STREAM_GROUP_PIECES); + for (int i = 0; i < submix->nb_elements; i++) { + const AVIAMFSubmixElement *element = submix->elements[i]; + writer_print_section_header(w, "IAMF Submix Element", SECTION_ID_STREAM_GROUP_PIECE); + print_int("stream_id", element->audio_element_id); + print_q("default_mix_gain", element->default_mix_gain, '/'); + print_int("headphones_rendering_mode", element->headphones_rendering_mode); + writer_print_section_header(w, NULL, SECTION_ID_STREAM_GROUP_SUBPIECES); + if (element->element_mix_config) + print_iamf_param_definition(w, "element_mix_config", element->element_mix_config, + SECTION_ID_STREAM_GROUP_SUBPIECE); + writer_print_section_footer(w); // SECTION_ID_STREAM_GROUP_SUBPIECES + writer_print_section_footer(w); // SECTION_ID_STREAM_GROUP_PIECE + } + for (int i = 0; i < submix->nb_layouts; i++) { + const AVIAMFSubmixLayout *layout = submix->layouts[i]; + char val_str[128]; + writer_print_section_header(w, "IAMF Submix Layout", SECTION_ID_STREAM_GROUP_PIECE); + av_channel_layout_describe(&layout->sound_system, val_str, sizeof(val_str)); + print_str("sound_system", val_str); + print_q("integrated_loudness", layout->integrated_loudness, '/'); + print_q("digital_peak", layout->digital_peak, '/'); + print_q("true_peak", layout->true_peak, '/'); + print_q("dialogue_anchored_loudness", layout->dialogue_anchored_loudness, '/'); + print_q("album_anchored_loudness", layout->album_anchored_loudness, '/'); + writer_print_section_footer(w); // SECTION_ID_STREAM_GROUP_PIECE + } + writer_print_section_footer(w); // SECTION_ID_STREAM_GROUP_PIECES + writer_print_section_footer(w); // SECTION_ID_STREAM_GROUP_SUBCOMPONENT +} + +static void print_iamf_mix_presentation_params(WriterContext *w, const AVStreamGroup *stg, + const AVIAMFMixPresentation *mix_presentation) +{ + writer_print_section_header(w, stg, SECTION_ID_STREAM_GROUP_COMPONENT); + print_int("nb_submixes", mix_presentation->nb_submixes); + writer_print_section_header(w, NULL, SECTION_ID_STREAM_GROUP_SUBCOMPONENTS); + for (int i = 0; i < mix_presentation->nb_submixes; i++) + print_iamf_submix_params(w, mix_presentation->submixes[i]); + writer_print_section_footer(w); // SECTION_ID_STREAM_GROUP_SUBCOMPONENTS + writer_print_section_footer(w); // SECTION_ID_STREAM_GROUP_COMPONENT +} + static void print_stream_group_params(WriterContext *w, AVStreamGroup *stg) { writer_print_section_header(w, NULL, SECTION_ID_STREAM_GROUP_COMPONENTS); if (stg->type == AV_STREAM_GROUP_PARAMS_TILE_GRID) print_tile_grid_params(w, stg, stg->params.tile_grid); + else if (stg->type == AV_STREAM_GROUP_PARAMS_IAMF_AUDIO_ELEMENT) + print_iamf_audio_element_params(w, stg, stg->params.iamf_audio_element); + else if (stg->type == AV_STREAM_GROUP_PARAMS_IAMF_MIX_PRESENTATION) + print_iamf_mix_presentation_params(w, stg, stg->params.iamf_mix_presentation); writer_print_section_footer(w); // SECTION_ID_STREAM_GROUP_COMPONENTS } diff --git a/tests/fate/iamf.mak b/tests/fate/iamf.mak index 46d4f41c5f..6fe0d54762 100644 --- a/tests/fate/iamf.mak +++ b/tests/fate/iamf.mak @@ -4,7 +4,8 @@ fate-iamf-stereo: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav fate-iamf-stereo: CMD = transcode wav $(SRC) iamf " \ -/stream_group $(TARGET_PATH)/tests/data/streamgroups/audio_element-stereo \ -/stream_group $(TARGET_PATH)/tests/data/streamgroups/mix_presentation-stereo \ - -streamid 0:0 -c:a flac -t 1" "-c:a copy -map 0" "-show_entries stream_group=index,id,nb_streams,type:stream_group_stream=index,id:stream_group_stream_disposition" + -streamid 0:0 -c:a flac -t 1" "-c:a copy -map 0" \ + "-show_entries stream_group=index,id,nb_streams,type:stream_group_components:stream_group_stream=index,id:stream_group_stream_disposition" FATE_IAMF += fate-iamf-5_1_4 fate-iamf-5_1_4: tests/data/asynth-44100-10.wav tests/data/filtergraphs/iamf_5_1_4 tests/data/streamgroups/audio_element-5_1_4 tests/data/streamgroups/mix_presentation-5_1_4 @@ -13,7 +14,8 @@ fate-iamf-5_1_4: CMD = transcode wav $(SRC) iamf "-auto_conversion_filters \ -/filter_complex $(TARGET_PATH)/tests/data/filtergraphs/iamf_5_1_4 \ -/stream_group $(TARGET_PATH)/tests/data/streamgroups/audio_element-5_1_4 \ -/stream_group $(TARGET_PATH)/tests/data/streamgroups/mix_presentation-5_1_4 \ - -streamid 0:0 -streamid 1:1 -streamid 2:2 -streamid 3:3 -streamid 4:4 -streamid 5:5 -map [FRONT] -map [BACK] -map [CENTER] -map [LFE] -map [TOP_FRONT] -map [TOP_BACK] -c:a flac -t 1" "-c:a copy -map 0" "-show_entries stream_group=index,id,nb_streams,type:stream_group_stream=index,id:stream_group_stream_disposition" + -streamid 0:0 -streamid 1:1 -streamid 2:2 -streamid 3:3 -streamid 4:4 -streamid 5:5 -map [FRONT] -map [BACK] -map [CENTER] -map [LFE] -map [TOP_FRONT] -map [TOP_BACK] -c:a flac -t 1" "-c:a copy -map 0" \ + "-show_entries stream_group=index,id,nb_streams,type:stream_group_components:stream_group_stream=index,id:stream_group_stream_disposition" FATE_IAMF += fate-iamf-7_1_4 fate-iamf-7_1_4: tests/data/asynth-44100-12.wav tests/data/filtergraphs/iamf_7_1_4 tests/data/streamgroups/audio_element-7_1_4 tests/data/streamgroups/mix_presentation-7_1_4 @@ -22,7 +24,8 @@ fate-iamf-7_1_4: CMD = transcode wav $(SRC) iamf "-auto_conversion_filters \ -/filter_complex $(TARGET_PATH)/tests/data/filtergraphs/iamf_7_1_4 \ -/stream_group $(TARGET_PATH)/tests/data/streamgroups/audio_element-7_1_4 \ -/stream_group $(TARGET_PATH)/tests/data/streamgroups/mix_presentation-7_1_4 \ - -streamid 0:0 -streamid 1:1 -streamid 2:2 -streamid 3:3 -streamid 4:4 -streamid 5:5 -streamid 6:6 -map [FRONT] -map [BACK] -map [CENTER] -map [LFE] -map [SIDE] -map [TOP_FRONT] -map [TOP_BACK] -c:a flac -t 1" "-c:a copy -map 0" "-show_entries stream_group=index,id,nb_streams,type:stream_group_stream=index,id:stream_group_stream_disposition" + -streamid 0:0 -streamid 1:1 -streamid 2:2 -streamid 3:3 -streamid 4:4 -streamid 5:5 -streamid 6:6 -map [FRONT] -map [BACK] -map [CENTER] -map [LFE] -map [SIDE] -map [TOP_FRONT] -map [TOP_BACK] -c:a flac -t 1" "-c:a copy -map 0" \ + "-show_entries stream_group=index,id,nb_streams,type:stream_group_components:stream_group_stream=index,id:stream_group_stream_disposition" FATE_IAMF += fate-iamf-ambisonic_1 fate-iamf-ambisonic_1: tests/data/asynth-44100-4.wav tests/data/filtergraphs/iamf_ambisonic_1 tests/data/streamgroups/audio_element-ambisonic_1 tests/data/streamgroups/mix_presentation-ambisonic_1 @@ -31,7 +34,8 @@ fate-iamf-ambisonic_1: CMD = transcode wav $(SRC) iamf "-auto_conversion_filters -/filter_complex $(TARGET_PATH)/tests/data/filtergraphs/iamf_ambisonic_1 \ -/stream_group $(TARGET_PATH)/tests/data/streamgroups/audio_element-ambisonic_1 \ -/stream_group $(TARGET_PATH)/tests/data/streamgroups/mix_presentation-ambisonic_1 \ - -streamid 0:0 -streamid 1:1 -streamid 2:2 -streamid 3:3 -map [MONO0] -map [MONO1] -map [MONO2] -map [MONO3] -c:a flac -t 1" "-c:a copy -map 0" "-show_entries stream_group=index,id,nb_streams,type:stream_group_stream=index,id:stream_group_stream_disposition" + -streamid 0:0 -streamid 1:1 -streamid 2:2 -streamid 3:3 -map [MONO0] -map [MONO1] -map [MONO2] -map [MONO3] -c:a flac -t 1" "-c:a copy -map 0" \ + "-show_entries stream_group=index,id,nb_streams,type:stream_group_components:stream_group_stream=index,id:stream_group_stream_disposition" FATE_IAMF-$(call TRANSCODE, FLAC, IAMF, WAV_DEMUXER PCM_S16LE_DECODER) += $(FATE_IAMF) diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index 6dc5b5f5af..51fd5fa2f3 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -223,7 +223,7 @@ fate-mov-mp4-iamf-stereo: CMD = transcode wav $(SRC) mp4 " \ -/stream_group $(TARGET_PATH)/tests/data/streamgroups/audio_element-stereo \ -/stream_group $(TARGET_PATH)/tests/data/streamgroups/mix_presentation-stereo \ -streamid 0:0 -c:a flac -t 1" "-c:a copy -map 0" \ - "-show_entries stream_group=index,id,nb_streams,type:stream_group_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition" + "-show_entries stream_group=index,id,nb_streams,type:stream_group_components:stream_group_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition" FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MOV, WAV_DEMUXER PCM_S16LE_DECODER) += fate-mov-mp4-iamf-5_1_4 fate-mov-mp4-iamf-5_1_4: tests/data/asynth-44100-10.wav tests/data/filtergraphs/iamf_5_1_4 tests/data/streamgroups/audio_element-5_1_4 tests/data/streamgroups/mix_presentation-5_1_4 @@ -233,7 +233,7 @@ fate-mov-mp4-iamf-5_1_4: CMD = transcode wav $(SRC) mp4 "-auto_conversion_filter -/stream_group $(TARGET_PATH)/tests/data/streamgroups/audio_element-5_1_4 \ -/stream_group $(TARGET_PATH)/tests/data/streamgroups/mix_presentation-5_1_4 \ -streamid 0:0 -streamid 1:1 -streamid 2:2 -streamid 3:3 -streamid 4:4 -streamid 5:5 -map [FRONT] -map [BACK] -map [CENTER] -map [LFE] -map [TOP_FRONT] -map [TOP_BACK] -c:a flac -t 1" "-c:a copy -map 0" \ - "-show_entries stream_group=index,id,nb_streams,type:stream_group_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition" + "-show_entries stream_group=index,id,nb_streams,type:stream_group_components:stream_group_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition" FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MOV, WAV_DEMUXER PCM_S16LE_DECODER) += fate-mov-mp4-iamf-7_1_4 fate-mov-mp4-iamf-7_1_4: tests/data/asynth-44100-12.wav tests/data/filtergraphs/iamf_7_1_4 tests/data/streamgroups/audio_element-7_1_4 tests/data/streamgroups/mix_presentation-7_1_4 @@ -243,7 +243,7 @@ fate-mov-mp4-iamf-7_1_4: CMD = transcode wav $(SRC) mp4 "-auto_conversion_filter -/stream_group $(TARGET_PATH)/tests/data/streamgroups/audio_element-7_1_4 \ -/stream_group $(TARGET_PATH)/tests/data/streamgroups/mix_presentation-7_1_4 \ -streamid 0:0 -streamid 1:1 -streamid 2:2 -streamid 3:3 -streamid 4:4 -streamid 5:5 -streamid 6:6 -map [FRONT] -map [BACK] -map [CENTER] -map [LFE] -map [SIDE] -map [TOP_FRONT] -map [TOP_BACK] -c:a flac -t 1" "-c:a copy -map 0" \ - "-show_entries stream_group=index,id,nb_streams,type:stream_group_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition" + "-show_entries stream_group=index,id,nb_streams,type:stream_group_components:stream_group_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition" FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, FLAC, MOV, WAV_DEMUXER PCM_S16LE_DECODER) += fate-mov-mp4-iamf-ambisonic_1 fate-mov-mp4-iamf-ambisonic_1: tests/data/asynth-44100-4.wav tests/data/filtergraphs/iamf_ambisonic_1 tests/data/streamgroups/audio_element-ambisonic_1 tests/data/streamgroups/mix_presentation-ambisonic_1 @@ -253,7 +253,7 @@ fate-mov-mp4-iamf-ambisonic_1: CMD = transcode wav $(SRC) mp4 "-auto_conversion_ -/stream_group $(TARGET_PATH)/tests/data/streamgroups/audio_element-ambisonic_1 \ -/stream_group $(TARGET_PATH)/tests/data/streamgroups/mix_presentation-ambisonic_1 \ -streamid 0:0 -streamid 1:1 -streamid 2:2 -streamid 3:3 -map [MONO0] -map [MONO1] -map [MONO2] -map [MONO3] -c:a flac -t 1" "-c:a copy -map 0" \ - "-show_entries stream_group=index,id,nb_streams,type:stream_group_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition" + "-show_entries stream_group=index,id,nb_streams,type:stream_group_components:stream_group_disposition:stream_group_tags:stream_group_stream=index,id:stream_group_stream_disposition" FATE_FFMPEG += $(FATE_MOV_FFMPEG-yes) FATE_FFMPEG_FFPROBE += $(FATE_MOV_FFMPEG_FFPROBE-yes) diff --git a/tests/ref/fate/iamf-5_1_4 b/tests/ref/fate/iamf-5_1_4 index a19b49852d..d792c0b9ed 100644 --- a/tests/ref/fate/iamf-5_1_4 +++ b/tests/ref/fate/iamf-5_1_4 @@ -101,6 +101,44 @@ index=0 id=0x1 nb_streams=6 type=IAMF Audio Element +[COMPONENT] +nb_layers=4 +audio_element_type=0 +default_w=10 +[SUBCOMPONENT] +channel_layout=stereo +output_gain_flags=0 +output_gain=0/1 +[/SUBCOMPONENT] +[SUBCOMPONENT] +channel_layout=5.1 +output_gain_flags=0 +output_gain=0/1 +[/SUBCOMPONENT] +[SUBCOMPONENT] +channel_layout=5.1.2 +output_gain_flags=0 +output_gain=0/1 +[/SUBCOMPONENT] +[SUBCOMPONENT] +channel_layout=5.1.4 +output_gain_flags=0 +output_gain=0/1 +[/SUBCOMPONENT] +[SUBCOMPONENT] +name=demixing_info +nb_subblocks=1 +type=1 +parameter_id=998 +parameter_rate=44100 +duration=4608 +constant_subblock_duration=4608 +[PIECE] +subblock_duration=4608 +dmixp_mode=1 +[/PIECE] +[/SUBCOMPONENT] +[/COMPONENT] [STREAM] index=0 id=0x0 @@ -239,6 +277,60 @@ index=1 id=0x2 nb_streams=6 type=IAMF Mix Presentation +[COMPONENT] +nb_submixes=1 +[SUBCOMPONENT] +nb_elements=1 +nb_layouts=4 +default_mix_gain=256/256 +[PIECE] +stream_id=1 +default_mix_gain=0/256 +headphones_rendering_mode=0 +[SUBPIECE] +name=element_mix_config +nb_subblocks=0 +type=0 +parameter_id=100 +parameter_rate=48000 +duration=0 +constant_subblock_duration=0 +[/SUBPIECE] +[/PIECE] +[PIECE] +sound_system=stereo +integrated_loudness=256/256 +digital_peak=0/256 +true_peak=0/1 +dialogue_anchored_loudness=0/1 +album_anchored_loudness=0/1 +[/PIECE] +[PIECE] +sound_system=5.1 +integrated_loudness=0/256 +digital_peak=0/256 +true_peak=0/1 +dialogue_anchored_loudness=0/1 +album_anchored_loudness=0/1 +[/PIECE] +[PIECE] +sound_system=5.1.2 +integrated_loudness=0/256 +digital_peak=0/256 +true_peak=0/1 +dialogue_anchored_loudness=0/1 +album_anchored_loudness=0/1 +[/PIECE] +[PIECE] +sound_system=5.1.4 +integrated_loudness=0/256 +digital_peak=0/256 +true_peak=0/1 +dialogue_anchored_loudness=0/1 +album_anchored_loudness=0/1 +[/PIECE] +[/SUBCOMPONENT] +[/COMPONENT] [STREAM] index=0 id=0x0 diff --git a/tests/ref/fate/iamf-7_1_4 b/tests/ref/fate/iamf-7_1_4 index 66e1dd8be4..132b10a9fc 100644 --- a/tests/ref/fate/iamf-7_1_4 +++ b/tests/ref/fate/iamf-7_1_4 @@ -117,6 +117,44 @@ index=0 id=0x1 nb_streams=7 type=IAMF Audio Element +[COMPONENT] +nb_layers=4 +audio_element_type=0 +default_w=10 +[SUBCOMPONENT] +channel_layout=stereo +output_gain_flags=0 +output_gain=0/1 +[/SUBCOMPONENT] +[SUBCOMPONENT] +channel_layout=3.1.2 +output_gain_flags=0 +output_gain=0/1 +[/SUBCOMPONENT] +[SUBCOMPONENT] +channel_layout=7.1.2 +output_gain_flags=0 +output_gain=0/1 +[/SUBCOMPONENT] +[SUBCOMPONENT] +channel_layout=7.1.4 +output_gain_flags=0 +output_gain=0/1 +[/SUBCOMPONENT] +[SUBCOMPONENT] +name=demixing_info +nb_subblocks=1 +type=1 +parameter_id=998 +parameter_rate=44100 +duration=4608 +constant_subblock_duration=4608 +[PIECE] +subblock_duration=4608 +dmixp_mode=1 +[/PIECE] +[/SUBCOMPONENT] +[/COMPONENT] [STREAM] index=0 id=0x0 @@ -277,6 +315,60 @@ index=1 id=0x2 nb_streams=7 type=IAMF Mix Presentation +[COMPONENT] +nb_submixes=1 +[SUBCOMPONENT] +nb_elements=1 +nb_layouts=4 +default_mix_gain=256/256 +[PIECE] +stream_id=1 +default_mix_gain=0/256 +headphones_rendering_mode=0 +[SUBPIECE] +name=element_mix_config +nb_subblocks=0 +type=0 +parameter_id=100 +parameter_rate=48000 +duration=0 +constant_subblock_duration=0 +[/SUBPIECE] +[/PIECE] +[PIECE] +sound_system=stereo +integrated_loudness=256/256 +digital_peak=0/256 +true_peak=0/1 +dialogue_anchored_loudness=0/1 +album_anchored_loudness=0/1 +[/PIECE] +[PIECE] +sound_system=3.1.2 +integrated_loudness=0/256 +digital_peak=0/256 +true_peak=0/1 +dialogue_anchored_loudness=0/1 +album_anchored_loudness=0/1 +[/PIECE] +[PIECE] +sound_system=7.1.2 +integrated_loudness=0/256 +digital_peak=0/256 +true_peak=0/1 +dialogue_anchored_loudness=0/1 +album_anchored_loudness=0/1 +[/PIECE] +[PIECE] +sound_system=7.1.4 +integrated_loudness=0/256 +digital_peak=0/256 +true_peak=0/1 +dialogue_anchored_loudness=0/1 +album_anchored_loudness=0/1 +[/PIECE] +[/SUBCOMPONENT] +[/COMPONENT] [STREAM] index=0 id=0x0 diff --git a/tests/ref/fate/iamf-ambisonic_1 b/tests/ref/fate/iamf-ambisonic_1 index b6cdb95d4d..a115934df0 100644 --- a/tests/ref/fate/iamf-ambisonic_1 +++ b/tests/ref/fate/iamf-ambisonic_1 @@ -69,6 +69,15 @@ index=0 id=0x1 nb_streams=4 type=IAMF Audio Element +[COMPONENT] +nb_layers=1 +audio_element_type=1 +default_w=0 +[SUBCOMPONENT] +channel_layout=ambisonic 1 +ambisonics_mode=0 +[/SUBCOMPONENT] +[/COMPONENT] [STREAM] index=0 id=0x0 @@ -163,6 +172,36 @@ index=1 id=0x2 nb_streams=4 type=IAMF Mix Presentation +[COMPONENT] +nb_submixes=1 +[SUBCOMPONENT] +nb_elements=1 +nb_layouts=1 +default_mix_gain=0/256 +[PIECE] +stream_id=1 +default_mix_gain=0/256 +headphones_rendering_mode=0 +[SUBPIECE] +name=element_mix_config +nb_subblocks=0 +type=0 +parameter_id=100 +parameter_rate=48000 +duration=0 +constant_subblock_duration=0 +[/SUBPIECE] +[/PIECE] +[PIECE] +sound_system=stereo +integrated_loudness=0/256 +digital_peak=0/256 +true_peak=0/1 +dialogue_anchored_loudness=0/1 +album_anchored_loudness=0/1 +[/PIECE] +[/SUBCOMPONENT] +[/COMPONENT] [STREAM] index=0 id=0x0 diff --git a/tests/ref/fate/iamf-stereo b/tests/ref/fate/iamf-stereo index 7e3597fa32..deed948655 100644 --- a/tests/ref/fate/iamf-stereo +++ b/tests/ref/fate/iamf-stereo @@ -21,6 +21,16 @@ index=0 id=0x1 nb_streams=1 type=IAMF Audio Element +[COMPONENT] +nb_layers=1 +audio_element_type=0 +default_w=0 +[SUBCOMPONENT] +channel_layout=stereo +output_gain_flags=0 +output_gain=0/1 +[/SUBCOMPONENT] +[/COMPONENT] [STREAM] index=0 id=0x0 @@ -49,6 +59,63 @@ index=1 id=0x2 nb_streams=1 type=IAMF Mix Presentation +[COMPONENT] +nb_submixes=2 +[SUBCOMPONENT] +nb_elements=1 +nb_layouts=1 +default_mix_gain=256/256 +[PIECE] +stream_id=1 +default_mix_gain=0/256 +headphones_rendering_mode=0 +[SUBPIECE] +name=element_mix_config +nb_subblocks=0 +type=0 +parameter_id=100 +parameter_rate=48000 +duration=0 +constant_subblock_duration=0 +[/SUBPIECE] +[/PIECE] +[PIECE] +sound_system=stereo +integrated_loudness=256/256 +digital_peak=0/256 +true_peak=0/1 +dialogue_anchored_loudness=0/1 +album_anchored_loudness=0/1 +[/PIECE] +[/SUBCOMPONENT] +[SUBCOMPONENT] +nb_elements=1 +nb_layouts=1 +default_mix_gain=0/256 +[PIECE] +stream_id=1 +default_mix_gain=256/256 +headphones_rendering_mode=1 +[SUBPIECE] +name=element_mix_config +nb_subblocks=0 +type=0 +parameter_id=100 +parameter_rate=48000 +duration=0 +constant_subblock_duration=0 +[/SUBPIECE] +[/PIECE] +[PIECE] +sound_system=0 channels +integrated_loudness=0/256 +digital_peak=0/256 +true_peak=0/1 +dialogue_anchored_loudness=0/1 +album_anchored_loudness=0/1 +[/PIECE] +[/SUBCOMPONENT] +[/COMPONENT] [STREAM] index=0 id=0x0 diff --git a/tests/ref/fate/mov-mp4-iamf-5_1_4 b/tests/ref/fate/mov-mp4-iamf-5_1_4 index 750e642984..4a364a8635 100644 --- a/tests/ref/fate/mov-mp4-iamf-5_1_4 +++ b/tests/ref/fate/mov-mp4-iamf-5_1_4 @@ -101,6 +101,44 @@ index=0 id=0x1 nb_streams=6 type=IAMF Audio Element +[COMPONENT] +nb_layers=4 +audio_element_type=0 +default_w=10 +[SUBCOMPONENT] +channel_layout=stereo +output_gain_flags=0 +output_gain=0/1 +[/SUBCOMPONENT] +[SUBCOMPONENT] +channel_layout=5.1 +output_gain_flags=0 +output_gain=0/1 +[/SUBCOMPONENT] +[SUBCOMPONENT] +channel_layout=5.1.2 +output_gain_flags=0 +output_gain=0/1 +[/SUBCOMPONENT] +[SUBCOMPONENT] +channel_layout=5.1.4 +output_gain_flags=0 +output_gain=0/1 +[/SUBCOMPONENT] +[SUBCOMPONENT] +name=demixing_info +nb_subblocks=1 +type=1 +parameter_id=998 +parameter_rate=44100 +duration=4608 +constant_subblock_duration=4608 +[PIECE] +subblock_duration=4608 +dmixp_mode=1 +[/PIECE] +[/SUBCOMPONENT] +[/COMPONENT] DISPOSITION:default=0 DISPOSITION:dub=0 DISPOSITION:original=0 @@ -260,6 +298,60 @@ index=1 id=0x2 nb_streams=6 type=IAMF Mix Presentation +[COMPONENT] +nb_submixes=1 +[SUBCOMPONENT] +nb_elements=1 +nb_layouts=4 +default_mix_gain=256/256 +[PIECE] +stream_id=1 +default_mix_gain=0/256 +headphones_rendering_mode=0 +[SUBPIECE] +name=element_mix_config +nb_subblocks=0 +type=0 +parameter_id=100 +parameter_rate=48000 +duration=0 +constant_subblock_duration=0 +[/SUBPIECE] +[/PIECE] +[PIECE] +sound_system=stereo +integrated_loudness=256/256 +digital_peak=0/256 +true_peak=0/1 +dialogue_anchored_loudness=0/1 +album_anchored_loudness=0/1 +[/PIECE] +[PIECE] +sound_system=5.1 +integrated_loudness=0/256 +digital_peak=0/256 +true_peak=0/1 +dialogue_anchored_loudness=0/1 +album_anchored_loudness=0/1 +[/PIECE] +[PIECE] +sound_system=5.1.2 +integrated_loudness=0/256 +digital_peak=0/256 +true_peak=0/1 +dialogue_anchored_loudness=0/1 +album_anchored_loudness=0/1 +[/PIECE] +[PIECE] +sound_system=5.1.4 +integrated_loudness=0/256 +digital_peak=0/256 +true_peak=0/1 +dialogue_anchored_loudness=0/1 +album_anchored_loudness=0/1 +[/PIECE] +[/SUBCOMPONENT] +[/COMPONENT] DISPOSITION:default=0 DISPOSITION:dub=0 DISPOSITION:original=0 diff --git a/tests/ref/fate/mov-mp4-iamf-7_1_4 b/tests/ref/fate/mov-mp4-iamf-7_1_4 index 518210eb8c..e9e243a043 100644 --- a/tests/ref/fate/mov-mp4-iamf-7_1_4 +++ b/tests/ref/fate/mov-mp4-iamf-7_1_4 @@ -117,6 +117,44 @@ index=0 id=0x1 nb_streams=7 type=IAMF Audio Element +[COMPONENT] +nb_layers=4 +audio_element_type=0 +default_w=10 +[SUBCOMPONENT] +channel_layout=stereo +output_gain_flags=0 +output_gain=0/1 +[/SUBCOMPONENT] +[SUBCOMPONENT] +channel_layout=3.1.2 +output_gain_flags=0 +output_gain=0/1 +[/SUBCOMPONENT] +[SUBCOMPONENT] +channel_layout=7.1.2 +output_gain_flags=0 +output_gain=0/1 +[/SUBCOMPONENT] +[SUBCOMPONENT] +channel_layout=7.1.4 +output_gain_flags=0 +output_gain=0/1 +[/SUBCOMPONENT] +[SUBCOMPONENT] +name=demixing_info +nb_subblocks=1 +type=1 +parameter_id=998 +parameter_rate=44100 +duration=4608 +constant_subblock_duration=4608 +[PIECE] +subblock_duration=4608 +dmixp_mode=1 +[/PIECE] +[/SUBCOMPONENT] +[/COMPONENT] DISPOSITION:default=0 DISPOSITION:dub=0 DISPOSITION:original=0 @@ -298,6 +336,60 @@ index=1 id=0x2 nb_streams=7 type=IAMF Mix Presentation +[COMPONENT] +nb_submixes=1 +[SUBCOMPONENT] +nb_elements=1 +nb_layouts=4 +default_mix_gain=256/256 +[PIECE] +stream_id=1 +default_mix_gain=0/256 +headphones_rendering_mode=0 +[SUBPIECE] +name=element_mix_config +nb_subblocks=0 +type=0 +parameter_id=100 +parameter_rate=48000 +duration=0 +constant_subblock_duration=0 +[/SUBPIECE] +[/PIECE] +[PIECE] +sound_system=stereo +integrated_loudness=256/256 +digital_peak=0/256 +true_peak=0/1 +dialogue_anchored_loudness=0/1 +album_anchored_loudness=0/1 +[/PIECE] +[PIECE] +sound_system=3.1.2 +integrated_loudness=0/256 +digital_peak=0/256 +true_peak=0/1 +dialogue_anchored_loudness=0/1 +album_anchored_loudness=0/1 +[/PIECE] +[PIECE] +sound_system=7.1.2 +integrated_loudness=0/256 +digital_peak=0/256 +true_peak=0/1 +dialogue_anchored_loudness=0/1 +album_anchored_loudness=0/1 +[/PIECE] +[PIECE] +sound_system=7.1.4 +integrated_loudness=0/256 +digital_peak=0/256 +true_peak=0/1 +dialogue_anchored_loudness=0/1 +album_anchored_loudness=0/1 +[/PIECE] +[/SUBCOMPONENT] +[/COMPONENT] DISPOSITION:default=0 DISPOSITION:dub=0 DISPOSITION:original=0 diff --git a/tests/ref/fate/mov-mp4-iamf-ambisonic_1 b/tests/ref/fate/mov-mp4-iamf-ambisonic_1 index fd2cf82c4d..483341289e 100644 --- a/tests/ref/fate/mov-mp4-iamf-ambisonic_1 +++ b/tests/ref/fate/mov-mp4-iamf-ambisonic_1 @@ -69,6 +69,15 @@ index=0 id=0x1 nb_streams=4 type=IAMF Audio Element +[COMPONENT] +nb_layers=1 +audio_element_type=1 +default_w=0 +[SUBCOMPONENT] +channel_layout=ambisonic 1 +ambisonics_mode=0 +[/SUBCOMPONENT] +[/COMPONENT] DISPOSITION:default=0 DISPOSITION:dub=0 DISPOSITION:original=0 @@ -184,6 +193,36 @@ index=1 id=0x2 nb_streams=4 type=IAMF Mix Presentation +[COMPONENT] +nb_submixes=1 +[SUBCOMPONENT] +nb_elements=1 +nb_layouts=1 +default_mix_gain=0/256 +[PIECE] +stream_id=1 +default_mix_gain=0/256 +headphones_rendering_mode=0 +[SUBPIECE] +name=element_mix_config +nb_subblocks=0 +type=0 +parameter_id=100 +parameter_rate=48000 +duration=0 +constant_subblock_duration=0 +[/SUBPIECE] +[/PIECE] +[PIECE] +sound_system=stereo +integrated_loudness=0/256 +digital_peak=0/256 +true_peak=0/1 +dialogue_anchored_loudness=0/1 +album_anchored_loudness=0/1 +[/PIECE] +[/SUBCOMPONENT] +[/COMPONENT] DISPOSITION:default=0 DISPOSITION:dub=0 DISPOSITION:original=0 diff --git a/tests/ref/fate/mov-mp4-iamf-stereo b/tests/ref/fate/mov-mp4-iamf-stereo index 79e7a20b71..bbbe5cb8ed 100644 --- a/tests/ref/fate/mov-mp4-iamf-stereo +++ b/tests/ref/fate/mov-mp4-iamf-stereo @@ -21,6 +21,16 @@ index=0 id=0x1 nb_streams=1 type=IAMF Audio Element +[COMPONENT] +nb_layers=1 +audio_element_type=0 +default_w=0 +[SUBCOMPONENT] +channel_layout=stereo +output_gain_flags=0 +output_gain=0/1 +[/SUBCOMPONENT] +[/COMPONENT] DISPOSITION:default=0 DISPOSITION:dub=0 DISPOSITION:original=0 @@ -70,6 +80,63 @@ index=1 id=0x2 nb_streams=1 type=IAMF Mix Presentation +[COMPONENT] +nb_submixes=2 +[SUBCOMPONENT] +nb_elements=1 +nb_layouts=1 +default_mix_gain=256/256 +[PIECE] +stream_id=1 +default_mix_gain=0/256 +headphones_rendering_mode=0 +[SUBPIECE] +name=element_mix_config +nb_subblocks=0 +type=0 +parameter_id=100 +parameter_rate=48000 +duration=0 +constant_subblock_duration=0 +[/SUBPIECE] +[/PIECE] +[PIECE] +sound_system=stereo +integrated_loudness=256/256 +digital_peak=0/256 +true_peak=0/1 +dialogue_anchored_loudness=0/1 +album_anchored_loudness=0/1 +[/PIECE] +[/SUBCOMPONENT] +[SUBCOMPONENT] +nb_elements=1 +nb_layouts=1 +default_mix_gain=0/256 +[PIECE] +stream_id=1 +default_mix_gain=256/256 +headphones_rendering_mode=1 +[SUBPIECE] +name=element_mix_config +nb_subblocks=0 +type=0 +parameter_id=100 +parameter_rate=48000 +duration=0 +constant_subblock_duration=0 +[/SUBPIECE] +[/PIECE] +[PIECE] +sound_system=0 channels +integrated_loudness=0/256 +digital_peak=0/256 +true_peak=0/1 +dialogue_anchored_loudness=0/1 +album_anchored_loudness=0/1 +[/PIECE] +[/SUBCOMPONENT] +[/COMPONENT] DISPOSITION:default=0 DISPOSITION:dub=0 DISPOSITION:original=0