From patchwork Sun Mar 3 18:09:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 46724 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp2419106pzb; Sun, 3 Mar 2024 10:09:50 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXvAx3isjWsfLnVaj6H0mdfjatL9ENr0UCNvDCaVl3aKYNQ1ZEoxlzsEdlURdx5NOgz18hCT+hnkFWoHn3u8t21ycBPNV5KmAy4LA== X-Google-Smtp-Source: AGHT+IGPGEcfGw2eMtYsKd7oleBukhpkf59uiBPNWBZDFsI/cHPZzTvx2mh94DdchZA4ss/mG7G6 X-Received: by 2002:aa7:d586:0:b0:567:610:cc3f with SMTP id r6-20020aa7d586000000b005670610cc3fmr2810809edq.3.1709489390541; Sun, 03 Mar 2024 10:09:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709489390; cv=none; d=google.com; s=arc-20160816; b=eCmveujApGeWyDSQ9ECrAOHYwOqmMnahgA5mswbLEF4bBXSv7+bHnH5n3yIIURPqGE 45Z5s4oD9CVmG8oU9IWuNbxm+PPlD0w82mHOZpd4UfWPzvSzcNbqXeYCWhgLmKzlmZ5m WdCdpUaHcHhRQNCdY83cSOwzSZKOcUktD9Bf9+T47wI4BJ1XI6275DKDhcRFkRJ2fPjy mIbjAxOmnXnsuB4NLO95n7Sh1BGoPX9xu7TGH0PZMBdgfYyRzr2AeNUelsOP/wJmEglc JRB5GHMq72DkVKm6THOZ5JdJqe5OtPGjyjeoyi1+ml+uXBtDOoEVTDV1Bi2EPgoDAGzC jVkA== 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=OoIRJ6lRenOuJpVOgPQuZ9ofqTyj4poTpfONd4ggPhs=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=UJgRo+NwoOsU2ebU78G/kZE5ZM8cRlB3VpLPqXoPAxGaNIsWKb0RsreUNpqW4mAYRP ZNUNVLZT7H4ggEtai10MTRYb1d7TR0XCAIzOAE5ZDd76Zzxh6AUrhX9pzcn7IsLmMGhK koAPN4J9FZ43BZcfQ1tTsQfew1qSXlsDOY/EH5bzNB/Ft/HxzP5yEm82SYVRDMtjI/Z9 ls6pEUhgo3786F+q4jZiVGrUqiQstOrxSLdbNO2luvrqORwM0Misehdp1GJ4c+Vth/hi 7ucSiFOy90jywVhQAr55trHyJQ4jC4zMY4P6j5GzzpxsOn5WhHvBTLQ/itgmk9zqkp9r iWgg==; 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="ZeTG3/Wm"; 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 e18-20020a056402191200b0056647dca813si3276430edz.107.2024.03.03.10.09.49; Sun, 03 Mar 2024 10:09:50 -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="ZeTG3/Wm"; 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 BB22D68D3AC; Sun, 3 Mar 2024 20:09:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9659568D28A for ; Sun, 3 Mar 2024 20:09:38 +0200 (EET) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1dc75972f25so30749385ad.1 for ; Sun, 03 Mar 2024 10:09:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709489376; x=1710094176; 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=oq30OzZS1dAByOL7ayZ3AzstRYdi5KKkSMpjzYLsi78=; b=ZeTG3/WmokeHxecN4i0oGthq56suQX2asxOfh815fwnEtyay4kTq+flobnoeiUjny8 o/tvdBXZUbuJEi8+4sTsBP2o1S7665fqnQ1wycMbqXxrBpH7eYcPsp5eZCqftOshjfhq iMO+acuh0LiKVhaPaJJGORiHlj0O1OGvzAqYMGuUxNBLYugJkpd137pfxicCYmy1NxPN 4G0rhzN6kB889DC/ErcMnxbDIo/AhZ47Q22jPnZBINB7hBJiIHmQPXtSHPzFKCyMaBhf Fk0u4bI5TLzykfrARGrAfaAUuDYAdFTDdB41SnW5qzNMjK80gxFfZvQErnOyCikHj9Dq d/cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709489376; x=1710094176; 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=oq30OzZS1dAByOL7ayZ3AzstRYdi5KKkSMpjzYLsi78=; b=hyj3IKj5hDJogjzcXzPk847WGCg4LkImV0xceVvM1/Z+SenGUCXkYXc/rXOuUHZNWE qbGCjUhcZDB0dEDKQ2JXL+xidyuqx0C4CsmR4eaHg/KRlw48LlZXf8bChve2VEtiPrRM xY1qekDh85HWhwy7tul7c6NJ0XvbBePifeQV8HIAkXXqGVak8cI/QB864FmAVi2pfSuh S+6ZyCTtxJ+IgwX5qRGgaTFKqq8FO3Jm+Aaa4Gq0r+2fCzYf2AwSDmfXg1hTWuKtJ9+g 33bhzlgUd1I0YJz/rb2+5qVz8RV4+syVu8jfloW8r9Ax+zaSh1/ZWi8i3j9XNEpv94CI /c8A== X-Gm-Message-State: AOJu0YzHX4+9sxyYEDZxn2akaVEkuMI9pSS4KLxOlI8MIsiA5miXgJus paXVVeWBpEW2o0iPA0P4IYrVs1vvYJhx4yw5iHDBynKp0mrtksujnhvcs2dO X-Received: by 2002:a17:903:2286:b0:1dc:3ab7:cc80 with SMTP id b6-20020a170903228600b001dc3ab7cc80mr7901716plh.48.1709489374813; Sun, 03 Mar 2024 10:09:34 -0800 (PST) Received: from localhost.localdomain ([190.194.169.124]) by smtp.gmail.com with ESMTPSA id k9-20020a170902c40900b001db5ea825b2sm5511316plk.123.2024.03.03.10.09.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Mar 2024 10:09:34 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Mar 2024 15:09:19 -0300 Message-ID: <20240303180929.56930-1-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/8 v2] fftools/ffprobe: add support for Stream Groups 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: PWvJUqnRjoUj Signed-off-by: James Almer --- doc/ffprobe.xsd | 1 + fftools/ffprobe.c | 145 ++++++++++++++++-- tests/ref/fate/cavs-demux | 2 +- tests/ref/fate/ffprobe_compact | 2 +- tests/ref/fate/ffprobe_csv | 2 +- tests/ref/fate/ffprobe_default | 1 + tests/ref/fate/ffprobe_flat | 1 + tests/ref/fate/ffprobe_ini | 1 + tests/ref/fate/ffprobe_json | 1 + tests/ref/fate/ffprobe_xml | 2 +- tests/ref/fate/ffprobe_xsd | 2 +- tests/ref/fate/flv-demux | 2 +- tests/ref/fate/gapless-mp3-side-data | 2 +- .../ref/fate/mov-mp4-disposition-mpegts-remux | 3 + tests/ref/fate/mov-mp4-ttml-dfxp | 3 + tests/ref/fate/mov-mp4-ttml-stpp | 3 + tests/ref/fate/oggopus-demux | 2 +- tests/ref/fate/ts-demux | 2 +- tests/ref/fate/ts-opus-demux | 2 +- tests/ref/fate/ts-small-demux | 2 +- tests/ref/fate/ts-timed-id3-demux | 2 +- 21 files changed, 160 insertions(+), 23 deletions(-) diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd index 23d97ed11a..08f2909c02 100644 --- a/doc/ffprobe.xsd +++ b/doc/ffprobe.xsd @@ -305,6 +305,7 @@ + diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index ac6b92f5d6..548c5e0948 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -112,8 +112,10 @@ static int do_show_format = 0; 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_streams = 0; static int do_show_stream_disposition = 0; +static int do_show_stream_group_disposition = 0; static int do_show_data = 0; static int do_show_program_version = 0; static int do_show_library_versions = 0; @@ -126,6 +128,7 @@ static int do_show_chapter_tags = 0; static int do_show_format_tags = 0; static int do_show_frame_tags = 0; static int do_show_program_tags = 0; +static int do_show_stream_group_tags = 0; static int do_show_stream_tags = 0; static int do_show_packet_tags = 0; @@ -159,7 +162,7 @@ static int find_stream_info = 1; /* section structure definition */ -#define SECTION_MAX_NB_CHILDREN 10 +#define SECTION_MAX_NB_CHILDREN 11 typedef enum { SECTION_ID_NONE = -1, @@ -203,6 +206,14 @@ typedef enum { SECTION_ID_PROGRAM_TAGS, SECTION_ID_PROGRAM_VERSION, SECTION_ID_PROGRAMS, + SECTION_ID_STREAM_GROUP_STREAM_DISPOSITION, + SECTION_ID_STREAM_GROUP_STREAM_TAGS, + SECTION_ID_STREAM_GROUP, + SECTION_ID_STREAM_GROUP_STREAMS, + SECTION_ID_STREAM_GROUP_STREAM, + SECTION_ID_STREAM_GROUP_DISPOSITION, + SECTION_ID_STREAM_GROUP_TAGS, + SECTION_ID_STREAM_GROUPS, SECTION_ID_ROOT, SECTION_ID_STREAM, SECTION_ID_STREAM_DISPOSITION, @@ -285,8 +296,16 @@ static struct section sections[] = { [SECTION_ID_PROGRAM_TAGS] = { SECTION_ID_PROGRAM_TAGS, "tags", SECTION_FLAG_HAS_VARIABLE_FIELDS, { -1 }, .element_name = "tag", .unique_name = "program_tags" }, [SECTION_ID_PROGRAM_VERSION] = { SECTION_ID_PROGRAM_VERSION, "program_version", 0, { -1 } }, [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", 0, { SECTION_ID_STREAM_GROUP_TAGS, SECTION_ID_STREAM_GROUP_DISPOSITION, SECTION_ID_STREAM_GROUP_STREAMS, -1 } }, + [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" }, + [SECTION_ID_STREAM_GROUP_TAGS] = { SECTION_ID_STREAM_GROUP_TAGS, "tags", SECTION_FLAG_HAS_VARIABLE_FIELDS, { -1 }, .element_name = "tag", .unique_name = "stream_group_tags" }, + [SECTION_ID_STREAM_GROUPS] = { SECTION_ID_STREAM_GROUPS, "stream_groups", SECTION_FLAG_IS_ARRAY, { SECTION_ID_STREAM_GROUP, -1 } }, [SECTION_ID_ROOT] = { SECTION_ID_ROOT, "root", SECTION_FLAG_IS_WRAPPER, - { SECTION_ID_CHAPTERS, SECTION_ID_FORMAT, SECTION_ID_FRAMES, SECTION_ID_PROGRAMS, SECTION_ID_STREAMS, + { SECTION_ID_CHAPTERS, SECTION_ID_FORMAT, SECTION_ID_FRAMES, SECTION_ID_PROGRAMS, SECTION_ID_STREAM_GROUPS, SECTION_ID_STREAMS, SECTION_ID_PACKETS, SECTION_ID_ERROR, SECTION_ID_PROGRAM_VERSION, SECTION_ID_LIBRARY_VERSIONS, SECTION_ID_PIXEL_FORMATS, -1} }, [SECTION_ID_STREAMS] = { SECTION_ID_STREAMS, "streams", SECTION_FLAG_IS_ARRAY, { SECTION_ID_STREAM, -1 } }, @@ -3051,7 +3070,10 @@ static void print_dispositions(WriterContext *w, uint32_t disposition, SectionID writer_print_section_footer(w); } -static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_idx, InputStream *ist, int in_program) +#define IN_PROGRAM 1 +#define IN_STREAM_GROUP 2 + +static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_idx, InputStream *ist, int container) { AVStream *stream = ist->st; AVCodecParameters *par; @@ -3061,12 +3083,29 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id AVRational sar, dar; AVBPrint pbuf; const AVCodecDescriptor *cd; + const SectionID section_header[] = { + SECTION_ID_STREAM, + SECTION_ID_PROGRAM_STREAM, + SECTION_ID_STREAM_GROUP_STREAM, + }; + const SectionID section_disposition[] = { + SECTION_ID_STREAM_DISPOSITION, + SECTION_ID_PROGRAM_STREAM_DISPOSITION, + SECTION_ID_STREAM_GROUP_STREAM_DISPOSITION, + }; + const SectionID section_tags[] = { + SECTION_ID_STREAM_TAGS, + SECTION_ID_PROGRAM_STREAM_TAGS, + SECTION_ID_STREAM_GROUP_STREAM_TAGS, + }; int ret = 0; const char *profile = NULL; + av_assert0(container < FF_ARRAY_ELEMS(section_header)); + av_bprint_init(&pbuf, 1, AV_BPRINT_SIZE_UNLIMITED); - writer_print_section_header(w, NULL, in_program ? SECTION_ID_PROGRAM_STREAM : SECTION_ID_STREAM); + writer_print_section_header(w, NULL, section_header[container]); print_int("index", stream->index); @@ -3228,13 +3267,14 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id /* Print disposition information */ if (do_show_stream_disposition) { - print_dispositions(w, stream->disposition, - in_program ? SECTION_ID_PROGRAM_STREAM_DISPOSITION - : SECTION_ID_STREAM_DISPOSITION); + av_assert0(container < FF_ARRAY_ELEMS(section_disposition)); + print_dispositions(w, stream->disposition, section_disposition[container]); } - if (do_show_stream_tags) - ret = show_tags(w, stream->metadata, in_program ? SECTION_ID_PROGRAM_STREAM_TAGS : SECTION_ID_STREAM_TAGS); + if (do_show_stream_tags) { + av_assert0(container < FF_ARRAY_ELEMS(section_tags)); + ret = show_tags(w, stream->metadata, section_tags[container]); + } if (stream->codecpar->nb_coded_side_data) { writer_print_section_header(w, NULL, SECTION_ID_STREAM_SIDE_DATA_LIST); @@ -3289,7 +3329,7 @@ static int show_program(WriterContext *w, InputFile *ifile, AVProgram *program) writer_print_section_header(w, NULL, SECTION_ID_PROGRAM_STREAMS); for (i = 0; i < program->nb_stream_indexes; i++) { if (selected_streams[program->stream_index[i]]) { - ret = show_stream(w, fmt_ctx, program->stream_index[i], &ifile->streams[program->stream_index[i]], 1); + ret = show_stream(w, fmt_ctx, program->stream_index[i], &ifile->streams[program->stream_index[i]], IN_PROGRAM); if (ret < 0) break; } @@ -3319,6 +3359,76 @@ static int show_programs(WriterContext *w, InputFile *ifile) return ret; } + +static void print_stream_group_params(WriterContext *w, AVStreamGroup *stg) +{ + if (stg->type == AV_STREAM_GROUP_PARAMS_IAMF_AUDIO_ELEMENT) + print_str("type", "IAMF Audio Element"); + else if (stg->type == AV_STREAM_GROUP_PARAMS_IAMF_MIX_PRESENTATION) + print_str("type", "IAMF Mix Presentation"); + else if (stg->type == AV_STREAM_GROUP_PARAMS_TILE_GRID) { + print_str("type", "Tile Grid"); + } else + print_str_opt("type", "unknown"); +} + +static int show_stream_group(WriterContext *w, InputFile *ifile, AVStreamGroup *stg) +{ + AVFormatContext *fmt_ctx = ifile->fmt_ctx; + AVBPrint pbuf; + int i, ret = 0; + + av_bprint_init(&pbuf, 1, AV_BPRINT_SIZE_UNLIMITED); + 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); + + /* Print disposition information */ + if (do_show_stream_group_disposition) + print_dispositions(w, stg->disposition, SECTION_ID_STREAM_GROUP_DISPOSITION); + + if (do_show_stream_group_tags) + ret = show_tags(w, stg->metadata, SECTION_ID_STREAM_GROUP_TAGS); + if (ret < 0) + goto end; + + writer_print_section_header(w, NULL, SECTION_ID_STREAM_GROUP_STREAMS); + for (i = 0; i < stg->nb_streams; i++) { + if (selected_streams[stg->streams[i]->index]) { + ret = show_stream(w, fmt_ctx, stg->streams[i]->index, &ifile->streams[stg->streams[i]->index], IN_STREAM_GROUP); + if (ret < 0) + break; + } + } + writer_print_section_footer(w); + +end: + av_bprint_finalize(&pbuf, NULL); + writer_print_section_footer(w); + return ret; +} + +static int show_stream_groups(WriterContext *w, InputFile *ifile) +{ + AVFormatContext *fmt_ctx = ifile->fmt_ctx; + int i, ret = 0; + + writer_print_section_header(w, NULL, SECTION_ID_STREAM_GROUPS); + for (i = 0; i < fmt_ctx->nb_stream_groups; i++) { + AVStreamGroup *stg = fmt_ctx->stream_groups[i]; + if (!stg) + continue; + ret = show_stream_group(w, ifile, stg); + if (ret < 0) + break; + } + writer_print_section_footer(w); + return ret; +} + static int show_chapters(WriterContext *w, InputFile *ifile) { AVFormatContext *fmt_ctx = ifile->fmt_ctx; @@ -3355,6 +3465,7 @@ static int show_format(WriterContext *w, InputFile *ifile) print_str_validate("filename", fmt_ctx->url); print_int("nb_streams", fmt_ctx->nb_streams); print_int("nb_programs", fmt_ctx->nb_programs); + print_int("nb_stream_groups", fmt_ctx->nb_stream_groups); print_str("format_name", fmt_ctx->iformat->name); if (!do_bitexact) { if (fmt_ctx->iformat->long_name) print_str ("format_long_name", fmt_ctx->iformat->long_name); @@ -3580,6 +3691,11 @@ static int probe_file(WriterContext *wctx, const char *filename, CHECK_END; } + if (do_show_stream_groups) { + ret = show_stream_groups(wctx, &ifile); + CHECK_END; + } + if (do_show_streams) { ret = show_streams(wctx, &ifile); CHECK_END; @@ -4078,6 +4194,7 @@ DEFINE_OPT_SHOW_SECTION(pixel_formats, PIXEL_FORMATS) DEFINE_OPT_SHOW_SECTION(program_version, PROGRAM_VERSION) DEFINE_OPT_SHOW_SECTION(streams, STREAMS) DEFINE_OPT_SHOW_SECTION(programs, PROGRAMS) +DEFINE_OPT_SHOW_SECTION(stream_groups, STREAM_GROUPS) static const OptionDef real_options[] = { CMDUTILS_COMMON_OPTIONS @@ -4108,6 +4225,7 @@ static const OptionDef real_options[] = { #endif { "show_packets", OPT_TYPE_FUNC, 0, { .func_arg = &opt_show_packets }, "show packets info" }, { "show_programs", OPT_TYPE_FUNC, 0, { .func_arg = &opt_show_programs }, "show programs info" }, + { "show_stream_groups", OPT_TYPE_FUNC, 0, { .func_arg = &opt_show_stream_groups }, "show stream groups info" }, { "show_streams", OPT_TYPE_FUNC, 0, { .func_arg = &opt_show_streams }, "show streams info" }, { "show_chapters", OPT_TYPE_FUNC, 0, { .func_arg = &opt_show_chapters }, "show chapters info" }, { "count_frames", OPT_TYPE_BOOL, 0, { &do_count_frames }, "count the number of frames per stream" }, @@ -4192,16 +4310,21 @@ int main(int argc, char **argv) SET_DO_SHOW(PIXEL_FORMAT_COMPONENTS, pixel_format_components); SET_DO_SHOW(PROGRAM_VERSION, program_version); SET_DO_SHOW(PROGRAMS, programs); + SET_DO_SHOW(STREAM_GROUP_DISPOSITION, stream_group_disposition); + SET_DO_SHOW(STREAM_GROUPS, stream_groups); SET_DO_SHOW(STREAMS, streams); SET_DO_SHOW(STREAM_DISPOSITION, stream_disposition); SET_DO_SHOW(PROGRAM_STREAM_DISPOSITION, stream_disposition); + SET_DO_SHOW(STREAM_GROUP_STREAM_DISPOSITION, stream_disposition); SET_DO_SHOW(CHAPTER_TAGS, chapter_tags); SET_DO_SHOW(FORMAT_TAGS, format_tags); SET_DO_SHOW(FRAME_TAGS, frame_tags); SET_DO_SHOW(PROGRAM_TAGS, program_tags); + SET_DO_SHOW(STREAM_GROUP_TAGS, stream_group_tags); SET_DO_SHOW(STREAM_TAGS, stream_tags); SET_DO_SHOW(PROGRAM_STREAM_TAGS, stream_tags); + SET_DO_SHOW(STREAM_GROUP_STREAM_TAGS, stream_tags); SET_DO_SHOW(PACKET_TAGS, packet_tags); if (do_bitexact && (do_show_program_version || do_show_library_versions)) { @@ -4266,7 +4389,7 @@ int main(int argc, char **argv) ffprobe_show_pixel_formats(wctx); if (!input_filename && - ((do_show_format || do_show_programs || do_show_streams || do_show_chapters || do_show_packets || do_show_error) || + ((do_show_format || do_show_programs || do_show_stream_groups || do_show_streams || do_show_chapters || do_show_packets || do_show_error) || (!do_show_program_version && !do_show_library_versions && !do_show_pixel_formats))) { show_usage(); av_log(NULL, AV_LOG_ERROR, "You have to specify one input file.\n"); diff --git a/tests/ref/fate/cavs-demux b/tests/ref/fate/cavs-demux index 000b32ab05..016e40e782 100644 --- a/tests/ref/fate/cavs-demux +++ b/tests/ref/fate/cavs-demux @@ -59,4 +59,4 @@ packet|codec_type=video|stream_index=0|pts=2320000|pts_time=1.933333|dts=2320000 packet|codec_type=video|stream_index=0|pts=2360000|pts_time=1.966667|dts=2360000|dts_time=1.966667|duration=40000|duration_time=0.033333|size=83|pos=172252|flags=K__|data_hash=CRC32:a941bdf0 packet|codec_type=video|stream_index=0|pts=2400000|pts_time=2.000000|dts=2400000|dts_time=2.000000|duration=40000|duration_time=0.033333|size=5417|pos=172335|flags=K__|data_hash=CRC32:9d0d503b stream|index=0|codec_name=cavs|profile=unknown|codec_type=video|codec_tag_string=[0][0][0][0]|codec_tag=0x0000|width=1280|height=720|coded_width=1280|coded_height=720|closed_captions=0|film_grain=0|has_b_frames=0|sample_aspect_ratio=N/A|display_aspect_ratio=N/A|pix_fmt=yuv420p|level=-99|color_range=unknown|color_space=unknown|color_transfer=unknown|color_primaries=unknown|chroma_location=unspecified|field_order=unknown|refs=1|id=N/A|r_frame_rate=30/1|avg_frame_rate=25/1|time_base=1/1200000|start_pts=N/A|start_time=N/A|duration_ts=N/A|duration=N/A|bit_rate=N/A|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=N/A|nb_read_packets=60|extradata_size=18|extradata_hash=CRC32:1255d52e|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|disposition:non_diegetic=0|disposition:captions=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0 -format|filename=bunny.mp4|nb_streams=1|nb_programs=0|format_name=cavsvideo|start_time=N/A|duration=N/A|size=177752|bit_rate=N/A|probe_score=51 +format|filename=bunny.mp4|nb_streams=1|nb_programs=0|nb_stream_groups=0|format_name=cavsvideo|start_time=N/A|duration=N/A|size=177752|bit_rate=N/A|probe_score=51 diff --git a/tests/ref/fate/ffprobe_compact b/tests/ref/fate/ffprobe_compact index dfcd7d3f3c..5f807818d9 100644 --- a/tests/ref/fate/ffprobe_compact +++ b/tests/ref/fate/ffprobe_compact @@ -29,4 +29,4 @@ frame|media_type=video|stream_index=2|key_frame=1|pts=6144|pts_time=0.120000|pkt stream|index=0|codec_name=pcm_s16le|profile=unknown|codec_type=audio|codec_tag_string=PSD[16]|codec_tag=0x10445350|sample_fmt=s16|sample_rate=44100|channels=1|channel_layout=unknown|bits_per_sample=16|initial_padding=0|id=N/A|r_frame_rate=0/0|avg_frame_rate=0/0|time_base=1/44100|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=705600|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=6|nb_read_packets=6|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|disposition:non_diegetic=0|disposition:captions=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0|tag:E=mc²|tag:encoder=Lavc pcm_s16le stream|index=1|codec_name=rawvideo|profile=unknown|codec_type=video|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=320|height=240|coded_width=320|coded_height=240|closed_captions=0|film_grain=0|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=4:3|pix_fmt=rgb24|level=-99|color_range=unknown|color_space=unknown|color_transfer=unknown|color_primaries=unknown|chroma_location=unspecified|field_order=unknown|refs=1|id=N/A|r_frame_rate=25/1|avg_frame_rate=25/1|time_base=1/51200|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=N/A|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=4|nb_read_packets=4|disposition:default=1|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|disposition:non_diegetic=0|disposition:captions=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0|tag:title=foobar|tag:duration_ts=field-and-tags-conflict-attempt|tag:encoder=Lavc rawvideo stream|index=2|codec_name=rawvideo|profile=unknown|codec_type=video|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=100|height=100|coded_width=100|coded_height=100|closed_captions=0|film_grain=0|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=1:1|pix_fmt=rgb24|level=-99|color_range=unknown|color_space=unknown|color_transfer=unknown|color_primaries=unknown|chroma_location=unspecified|field_order=unknown|refs=1|id=N/A|r_frame_rate=25/1|avg_frame_rate=25/1|time_base=1/51200|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=N/A|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=4|nb_read_packets=4|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|disposition:non_diegetic=0|disposition:captions=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0|tag:encoder=Lavc rawvideo -format|filename=tests/data/ffprobe-test.nut|nb_streams=3|nb_programs=0|format_name=nut|start_time=0.000000|duration=0.120000|size=1053646|bit_rate=70243066|probe_score=100|tag:title=ffprobe test file|tag:comment='A comment with CSV, XML & JSON special chars': |tag:comment2=I ♥ Üñîçød€ +format|filename=tests/data/ffprobe-test.nut|nb_streams=3|nb_programs=0|nb_stream_groups=0|format_name=nut|start_time=0.000000|duration=0.120000|size=1053646|bit_rate=70243066|probe_score=100|tag:title=ffprobe test file|tag:comment='A comment with CSV, XML & JSON special chars': |tag:comment2=I ♥ Üñîçød€ diff --git a/tests/ref/fate/ffprobe_csv b/tests/ref/fate/ffprobe_csv index 677b352dfd..3a7a4240d8 100644 --- a/tests/ref/fate/ffprobe_csv +++ b/tests/ref/fate/ffprobe_csv @@ -29,4 +29,4 @@ frame,video,2,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,2048,0.0 stream,0,pcm_s16le,unknown,audio,PSD[16],0x10445350,s16,44100,1,unknown,16,0,N/A,0/0,0/0,1/44100,0,0.000000,N/A,N/A,705600,N/A,N/A,N/A,6,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,mc²,Lavc pcm_s16le stream,1,rawvideo,unknown,video,RGB[24],0x18424752,320,240,320,240,0,0,0,1:1,4:3,rgb24,-99,unknown,unknown,unknown,unknown,unspecified,unknown,1,N/A,25/1,25/1,1/51200,0,0.000000,N/A,N/A,N/A,N/A,N/A,N/A,4,4,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,foobar,field-and-tags-conflict-attempt,Lavc rawvideo stream,2,rawvideo,unknown,video,RGB[24],0x18424752,100,100,100,100,0,0,0,1:1,1:1,rgb24,-99,unknown,unknown,unknown,unknown,unspecified,unknown,1,N/A,25/1,25/1,1/51200,0,0.000000,N/A,N/A,N/A,N/A,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,Lavc rawvideo -format,tests/data/ffprobe-test.nut,3,0,nut,0.000000,0.120000,1053646,70243066,100,ffprobe test file,"'A comment with CSV, XML & JSON special chars': ",I ♥ Üñîçød€ +format,tests/data/ffprobe-test.nut,3,0,0,nut,0.000000,0.120000,1053646,70243066,100,ffprobe test file,"'A comment with CSV, XML & JSON special chars': ",I ♥ Üñîçød€ diff --git a/tests/ref/fate/ffprobe_default b/tests/ref/fate/ffprobe_default index 954725b91b..12bb069ba3 100644 --- a/tests/ref/fate/ffprobe_default +++ b/tests/ref/fate/ffprobe_default @@ -766,6 +766,7 @@ TAG:encoder=Lavc rawvideo filename=tests/data/ffprobe-test.nut nb_streams=3 nb_programs=0 +nb_stream_groups=0 format_name=nut start_time=0.000000 duration=0.120000 diff --git a/tests/ref/fate/ffprobe_flat b/tests/ref/fate/ffprobe_flat index cea6039307..a577dc6678 100644 --- a/tests/ref/fate/ffprobe_flat +++ b/tests/ref/fate/ffprobe_flat @@ -703,6 +703,7 @@ streams.stream.2.tags.encoder="Lavc rawvideo" format.filename="tests/data/ffprobe-test.nut" format.nb_streams=3 format.nb_programs=0 +format.nb_stream_groups=0 format.format_name="nut" format.start_time="0.000000" format.duration="0.120000" diff --git a/tests/ref/fate/ffprobe_ini b/tests/ref/fate/ffprobe_ini index 497154ee7e..80885903c3 100644 --- a/tests/ref/fate/ffprobe_ini +++ b/tests/ref/fate/ffprobe_ini @@ -780,6 +780,7 @@ encoder=Lavc rawvideo filename=tests/data/ffprobe-test.nut nb_streams=3 nb_programs=0 +nb_stream_groups=0 format_name=nut start_time=0.000000 duration=0.120000 diff --git a/tests/ref/fate/ffprobe_json b/tests/ref/fate/ffprobe_json index fe392fb47a..974b8dc900 100644 --- a/tests/ref/fate/ffprobe_json +++ b/tests/ref/fate/ffprobe_json @@ -729,6 +729,7 @@ "filename": "tests/data/ffprobe-test.nut", "nb_streams": 3, "nb_programs": 0, + "nb_stream_groups": 0, "format_name": "nut", "start_time": "0.000000", "duration": "0.120000", diff --git a/tests/ref/fate/ffprobe_xml b/tests/ref/fate/ffprobe_xml index 038dd36372..f4e07ba8d5 100644 --- a/tests/ref/fate/ffprobe_xml +++ b/tests/ref/fate/ffprobe_xml @@ -55,7 +55,7 @@ - + diff --git a/tests/ref/fate/ffprobe_xsd b/tests/ref/fate/ffprobe_xsd index 7ecaaa4ec0..5dd45ff956 100644 --- a/tests/ref/fate/ffprobe_xsd +++ b/tests/ref/fate/ffprobe_xsd @@ -55,7 +55,7 @@ - + diff --git a/tests/ref/fate/flv-demux b/tests/ref/fate/flv-demux index fd85b7a0f5..a9cbcc46e0 100644 --- a/tests/ref/fate/flv-demux +++ b/tests/ref/fate/flv-demux @@ -603,4 +603,4 @@ packet|codec_type=audio|stream_index=1|pts=11656|pts_time=11.656000|dts=11656|dt packet|codec_type=video|stream_index=0|pts=11678|pts_time=11.678000|dts=11678|dts_time=11.678000|duration=33|duration_time=0.033000|size=1190|pos=510794|flags=__C|data_hash=CRC32:a0206c90 stream|index=0|codec_name=h264|profile=77|codec_type=video|codec_tag_string=[0][0][0][0]|codec_tag=0x0000|width=426|height=240|coded_width=426|coded_height=240|closed_captions=0|film_grain=0|has_b_frames=1|sample_aspect_ratio=1:1|display_aspect_ratio=71:40|pix_fmt=yuv420p|level=21|color_range=unknown|color_space=unknown|color_transfer=unknown|color_primaries=unknown|chroma_location=left|field_order=progressive|refs=1|is_avc=true|nal_length_size=4|missing_streams=0|id=N/A|r_frame_rate=30000/1001|avg_frame_rate=30/1|time_base=1/1000|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=393929|max_bit_rate=N/A|bits_per_raw_sample=8|nb_frames=N/A|nb_read_frames=N/A|nb_read_packets=351|extradata_size=39|extradata_hash=CRC32:07b85ca9|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|disposition:non_diegetic=0|disposition:captions=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0 stream|index=1|codec_name=aac|profile=1|codec_type=audio|codec_tag_string=[0][0][0][0]|codec_tag=0x0000|sample_fmt=fltp|sample_rate=22050|channels=2|channel_layout=stereo|bits_per_sample=0|initial_padding=0|missing_streams=0|id=N/A|r_frame_rate=0/0|avg_frame_rate=0/0|time_base=1/1000|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=67874|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=N/A|nb_read_packets=252|extradata_size=2|extradata_hash=CRC32:d039c029|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|disposition:non_diegetic=0|disposition:captions=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0 -format|filename=Enigma_Principles_of_Lust-part.flv|nb_streams=2|nb_programs=0|format_name=flv|start_time=0.000000|duration=210.209999|size=512000|bit_rate=19485|probe_score=100|tag:hasKeyframes=true|tag:hasMetadata=true|tag:datasize=11970544|tag:hasVideo=true|tag:canSeekToEnd=false|tag:lasttimestamp=210|tag:lastkeyframetimestamp=210|tag:audiosize=1791332|tag:hasAudio=true|tag:audiodelay=0|tag:videosize=10176110|tag:metadatadate=2011-02-27T11:00:33.125000Z|tag:metadatacreator=inlet media FLVTool2 v1.0.6 - http://www.inlet-media.de/flvtool2|tag:hasCuePoints=false +format|filename=Enigma_Principles_of_Lust-part.flv|nb_streams=2|nb_programs=0|nb_stream_groups=0|format_name=flv|start_time=0.000000|duration=210.209999|size=512000|bit_rate=19485|probe_score=100|tag:hasKeyframes=true|tag:hasMetadata=true|tag:datasize=11970544|tag:hasVideo=true|tag:canSeekToEnd=false|tag:lasttimestamp=210|tag:lastkeyframetimestamp=210|tag:audiosize=1791332|tag:hasAudio=true|tag:audiodelay=0|tag:videosize=10176110|tag:metadatadate=2011-02-27T11:00:33.125000Z|tag:metadatacreator=inlet media FLVTool2 v1.0.6 - http://www.inlet-media.de/flvtool2|tag:hasCuePoints=false diff --git a/tests/ref/fate/gapless-mp3-side-data b/tests/ref/fate/gapless-mp3-side-data index f013650ec1..87a99661f9 100644 --- a/tests/ref/fate/gapless-mp3-side-data +++ b/tests/ref/fate/gapless-mp3-side-data @@ -594,4 +594,4 @@ packet|codec_type=audio|stream_index=0|pts=218234880|pts_time=15.464490|dts=2182 packet|codec_type=audio|stream_index=0|pts=218603520|pts_time=15.490612|dts=218603520|dts_time=15.490612|duration=368640|duration_time=0.026122|size=418|pos=249300|flags=K__|data_hash=CRC32:d5fb5f9c|side_datum/skip_samples:side_data_type=Skip Samples|side_datum/skip_samples:skip_samples=0|side_datum/skip_samples:discard_padding=303|side_datum/skip_samples:skip_reason=0|side_datum/skip_samples:discard_reason=0 packet|codec_type=audio|stream_index=0|pts=218972160|pts_time=15.516735|dts=218972160|dts_time=15.516735|duration=368640|duration_time=0.026122|size=418|pos=249718|flags=K__|data_hash=CRC32:3789f3cf|side_datum/skip_samples:side_data_type=Skip Samples|side_datum/skip_samples:skip_samples=0|side_datum/skip_samples:discard_padding=1152|side_datum/skip_samples:skip_reason=0|side_datum/skip_samples:discard_reason=0 stream|index=0|codec_name=mp3|profile=unknown|codec_type=audio|codec_tag_string=[0][0][0][0]|codec_tag=0x0000|sample_fmt=fltp|sample_rate=44100|channels=2|channel_layout=stereo|bits_per_sample=0|initial_padding=0|id=N/A|r_frame_rate=0/0|avg_frame_rate=0/0|time_base=1/14112000|start_pts=353600|start_time=0.025057|duration_ts=219340800|duration=15.542857|bit_rate=128000|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=N/A|nb_read_packets=595|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|disposition:non_diegetic=0|disposition:captions=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0|tag:encoder=LAME3.93 -format|filename=gapless.mp3|nb_streams=1|nb_programs=0|format_name=mp3|start_time=0.025057|duration=15.542857|size=250264|bit_rate=128812|probe_score=51|tag:title=test +format|filename=gapless.mp3|nb_streams=1|nb_programs=0|nb_stream_groups=0|format_name=mp3|start_time=0.025057|duration=15.542857|size=250264|bit_rate=128812|probe_score=51|tag:title=test diff --git a/tests/ref/fate/mov-mp4-disposition-mpegts-remux b/tests/ref/fate/mov-mp4-disposition-mpegts-remux index ea5a11d73c..3d103c98cf 100644 --- a/tests/ref/fate/mov-mp4-disposition-mpegts-remux +++ b/tests/ref/fate/mov-mp4-disposition-mpegts-remux @@ -19,6 +19,9 @@ adb3b95c07a5f3e0c86641dd62f01dae *tests/data/fate/mov-mp4-disposition-mpegts-rem { "programs": [ + ], + "stream_groups": [ + ], "streams": [ { diff --git a/tests/ref/fate/mov-mp4-ttml-dfxp b/tests/ref/fate/mov-mp4-ttml-dfxp index 2d60f3d964..b019b3f6cc 100644 --- a/tests/ref/fate/mov-mp4-ttml-dfxp +++ b/tests/ref/fate/mov-mp4-ttml-dfxp @@ -22,6 +22,9 @@ ], "programs": [ + ], + "stream_groups": [ + ], "streams": [ { diff --git a/tests/ref/fate/mov-mp4-ttml-stpp b/tests/ref/fate/mov-mp4-ttml-stpp index 0a8e423449..827296253e 100644 --- a/tests/ref/fate/mov-mp4-ttml-stpp +++ b/tests/ref/fate/mov-mp4-ttml-stpp @@ -23,6 +23,9 @@ cbd2c7ff864a663b0d893deac5a0caec *tests/data/fate/mov-mp4-ttml-stpp.mp4 ], "programs": [ + ], + "stream_groups": [ + ], "streams": [ { diff --git a/tests/ref/fate/oggopus-demux b/tests/ref/fate/oggopus-demux index baf81a7f50..05cdd94f43 100644 --- a/tests/ref/fate/oggopus-demux +++ b/tests/ref/fate/oggopus-demux @@ -40,4 +40,4 @@ packet|codec_type=audio|stream_index=0|pts=36124|pts_time=0.752583|dts=36124|dts packet|codec_type=audio|stream_index=0|pts=37084|pts_time=0.772583|dts=37084|dts_time=0.772583|duration=960|duration_time=0.020000|size=217|pos=841|flags=K__|data_hash=CRC32:06797ece packet|codec_type=audio|stream_index=0|pts=38044|pts_time=0.792583|dts=38044|dts_time=0.792583|duration=356|duration_time=0.007417|size=359|pos=841|flags=K__|data_hash=CRC32:01ca3f8f|side_datum/skip_samples:side_data_type=Skip Samples|side_datum/skip_samples:skip_samples=0|side_datum/skip_samples:discard_padding=604|side_datum/skip_samples:skip_reason=0|side_datum/skip_samples:discard_reason=0 stream|index=0|codec_name=opus|profile=unknown|codec_type=audio|codec_tag_string=[0][0][0][0]|codec_tag=0x0000|sample_fmt=fltp|sample_rate=48000|channels=2|channel_layout=stereo|bits_per_sample=0|initial_padding=356|id=N/A|r_frame_rate=0/0|avg_frame_rate=0/0|time_base=1/48000|start_pts=0|start_time=0.000000|duration_ts=38756|duration=0.807417|bit_rate=N/A|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=N/A|nb_read_packets=41|extradata_size=19|extradata_hash=CRC32:58ba5ff3|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|disposition:non_diegetic=0|disposition:captions=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0|tag:ENCODER=opusenc from opus-tools 0.1.9|tag:ENCODER_OPTIONS=--discard-comments -format|filename=intro-partial.opus|nb_streams=1|nb_programs=0|format_name=ogg|start_time=0.000000|duration=0.807417|size=10250|bit_rate=101558|probe_score=100 +format|filename=intro-partial.opus|nb_streams=1|nb_programs=0|nb_stream_groups=0|format_name=ogg|start_time=0.000000|duration=0.807417|size=10250|bit_rate=101558|probe_score=100 diff --git a/tests/ref/fate/ts-demux b/tests/ref/fate/ts-demux index b01f525c38..ec4aeb2034 100644 --- a/tests/ref/fate/ts-demux +++ b/tests/ref/fate/ts-demux @@ -26,4 +26,4 @@ packet|codec_type=audio|stream_index=2|pts=3912645580|pts_time=43473.839778|dts= stream|index=0|codec_name=mpeg2video|profile=4|codec_type=video|codec_tag_string=[2][0][0][0]|codec_tag=0x0002|width=1280|height=720|coded_width=0|coded_height=0|closed_captions=0|film_grain=0|has_b_frames=1|sample_aspect_ratio=1:1|display_aspect_ratio=16:9|pix_fmt=yuv420p|level=4|color_range=tv|color_space=unknown|color_transfer=unknown|color_primaries=unknown|chroma_location=left|field_order=progressive|refs=1|ts_id=32776|ts_packetsize=188|id=0x31|r_frame_rate=60000/1001|avg_frame_rate=60000/1001|time_base=1/90000|start_pts=3912669846|start_time=43474.109400|duration_ts=19519|duration=0.216878|bit_rate=15000000|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=N/A|nb_read_packets=15|extradata_size=150|extradata_hash=CRC32:53134fa8|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|disposition:non_diegetic=0|disposition:captions=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0|side_datum/cpb_properties:side_data_type=CPB properties|side_datum/cpb_properties:max_bitrate=15000000|side_datum/cpb_properties:min_bitrate=0|side_datum/cpb_properties:avg_bitrate=0|side_datum/cpb_properties:buffer_size=9781248|side_datum/cpb_properties:vbv_delay=-1 stream|index=1|codec_name=ac3|profile=unknown|codec_type=audio|codec_tag_string=[4][0][0][0]|codec_tag=0x0004|sample_fmt=fltp|sample_rate=48000|channels=6|channel_layout=5.1(side)|bits_per_sample=0|initial_padding=0|ts_id=32776|ts_packetsize=188|id=0x34|r_frame_rate=0/0|avg_frame_rate=0/0|time_base=1/90000|start_pts=3912633305|start_time=43473.703389|duration_ts=14400|duration=0.160000|bit_rate=384000|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=N/A|nb_read_packets=5|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|disposition:non_diegetic=0|disposition:captions=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0|tag:language=eng stream|index=2|codec_name=ac3|profile=unknown|codec_type=audio|codec_tag_string=[4][0][0][0]|codec_tag=0x0004|sample_fmt=fltp|sample_rate=48000|channels=2|channel_layout=stereo|bits_per_sample=0|initial_padding=0|ts_id=32776|ts_packetsize=188|id=0x35|r_frame_rate=0/0|avg_frame_rate=0/0|time_base=1/90000|start_pts=3912634060|start_time=43473.711778|duration_ts=14400|duration=0.160000|bit_rate=192000|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=N/A|nb_read_packets=5|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|disposition:non_diegetic=0|disposition:captions=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0|tag:language=es -format|filename=mp3ac325-4864-small.ts|nb_streams=3|nb_programs=1|format_name=mpegts|start_time=43473.703389|duration=0.622889|size=512000|bit_rate=6575810|probe_score=50 +format|filename=mp3ac325-4864-small.ts|nb_streams=3|nb_programs=1|nb_stream_groups=0|format_name=mpegts|start_time=43473.703389|duration=0.622889|size=512000|bit_rate=6575810|probe_score=50 diff --git a/tests/ref/fate/ts-opus-demux b/tests/ref/fate/ts-opus-demux index 3d14082ce5..961b7f2a92 100644 --- a/tests/ref/fate/ts-opus-demux +++ b/tests/ref/fate/ts-opus-demux @@ -511,4 +511,4 @@ packet|codec_type=audio|stream_index=0|pts=916200|pts_time=10.180000|dts=916200| packet|codec_type=audio|stream_index=0|pts=918000|pts_time=10.200000|dts=918000|dts_time=10.200000|duration=1800|duration_time=0.020000|size=761|pos=510044|flags=K__|data_hash=CRC32:75113c11|side_datum/mpegts_stream_id:side_data_type=MPEGTS Stream ID|side_datum/mpegts_stream_id:id=189 packet|codec_type=audio|stream_index=0|pts=919800|pts_time=10.220000|dts=919800|dts_time=10.220000|duration=1800|duration_time=0.020000|size=759|pos=510984|flags=K__|data_hash=CRC32:59fc266f|side_datum/mpegts_stream_id:side_data_type=MPEGTS Stream ID|side_datum/mpegts_stream_id:id=189 stream|index=0|codec_name=opus|profile=unknown|codec_type=audio|codec_tag_string=Opus|codec_tag=0x7375704f|sample_fmt=fltp|sample_rate=48000|channels=8|channel_layout=7.1|bits_per_sample=0|initial_padding=0|ts_id=51338|ts_packetsize=188|id=0x44|r_frame_rate=0/0|avg_frame_rate=0/0|time_base=1/90000|start_pts=0|start_time=0.000000|duration_ts=919800|duration=10.220000|bit_rate=N/A|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=N/A|nb_read_packets=512|extradata_size=29|extradata_hash=CRC32:6d6089a7|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|disposition:non_diegetic=0|disposition:captions=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0 -format|filename=test-8-7.1.opus-small.ts|nb_streams=1|nb_programs=1|format_name=mpegts|start_time=0.000000|duration=10.220000|size=512000|bit_rate=400782|probe_score=50 +format|filename=test-8-7.1.opus-small.ts|nb_streams=1|nb_programs=1|nb_stream_groups=0|format_name=mpegts|start_time=0.000000|duration=10.220000|size=512000|bit_rate=400782|probe_score=50 diff --git a/tests/ref/fate/ts-small-demux b/tests/ref/fate/ts-small-demux index eb37440c0f..233f73393e 100644 --- a/tests/ref/fate/ts-small-demux +++ b/tests/ref/fate/ts-small-demux @@ -73,4 +73,4 @@ packet|codec_type=video|stream_index=0|pts=552000|pts_time=6.133333|dts=552000|d packet|codec_type=video|stream_index=0|pts=558000|pts_time=6.200000|dts=558000|dts_time=6.200000|duration=6000|duration_time=0.066667|size=16|pos=15792|flags=___|data_hash=CRC32:27b943ef|side_datum/mpegts_stream_id:side_data_type=MPEGTS Stream ID|side_datum/mpegts_stream_id:id=224 packet|codec_type=video|stream_index=0|pts=564000|pts_time=6.266667|dts=564000|dts_time=6.266667|duration=6000|duration_time=0.066667|size=16|pos=16356|flags=___|data_hash=CRC32:f7116111 stream|index=0|codec_name=h264|profile=578|codec_type=video|codec_tag_string=[27][0][0][0]|codec_tag=0x001b|width=82|height=144|coded_width=82|coded_height=144|closed_captions=0|film_grain=0|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=41:72|pix_fmt=yuv420p|level=10|color_range=unknown|color_space=unknown|color_transfer=unknown|color_primaries=unknown|chroma_location=left|field_order=progressive|refs=1|is_avc=false|nal_length_size=0|ts_id=1|ts_packetsize=188|id=0x100|r_frame_rate=15/1|avg_frame_rate=15/1|time_base=1/90000|start_pts=126000|start_time=1.400000|duration_ts=444000|duration=4.933333|bit_rate=N/A|max_bit_rate=N/A|bits_per_raw_sample=8|nb_frames=N/A|nb_read_frames=N/A|nb_read_packets=74|extradata_size=35|extradata_hash=CRC32:e62cae27|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|disposition:non_diegetic=0|disposition:captions=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0 -format|filename=h264small.ts|nb_streams=1|nb_programs=1|format_name=mpegts|start_time=1.400000|duration=4.933333|size=16544|bit_rate=26828|probe_score=50 +format|filename=h264small.ts|nb_streams=1|nb_programs=1|nb_stream_groups=0|format_name=mpegts|start_time=1.400000|duration=4.933333|size=16544|bit_rate=26828|probe_score=50 diff --git a/tests/ref/fate/ts-timed-id3-demux b/tests/ref/fate/ts-timed-id3-demux index 3c3372da26..938b5326e4 100644 --- a/tests/ref/fate/ts-timed-id3-demux +++ b/tests/ref/fate/ts-timed-id3-demux @@ -1,4 +1,4 @@ packet|codec_type=data|stream_index=0|pts=126000|pts_time=1.400000|dts=126000|dts_time=1.400000|duration=N/A|duration_time=N/A|size=26|pos=564|flags=K__|data_hash=CRC32:469f474b|side_datum/mpegts_stream_id:side_data_type=MPEGTS Stream ID|side_datum/mpegts_stream_id:id=189 packet|codec_type=data|stream_index=0|pts=577350|pts_time=6.415000|dts=577350|dts_time=6.415000|duration=N/A|duration_time=N/A|size=26|pos=1316|flags=K__|data_hash=CRC32:469f474b|side_datum/mpegts_stream_id:side_data_type=MPEGTS Stream ID|side_datum/mpegts_stream_id:id=189 stream|index=0|codec_name=timed_id3|profile=unknown|codec_type=data|codec_tag_string=ID3 |codec_tag=0x20334449|ts_id=1|ts_packetsize=188|id=0x100|r_frame_rate=0/0|avg_frame_rate=0/0|time_base=1/90000|start_pts=126000|start_time=1.400000|duration_ts=451350|duration=5.015000|bit_rate=N/A|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=N/A|nb_read_packets=2|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|disposition:non_diegetic=0|disposition:captions=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0 -format|filename=id3.ts|nb_streams=1|nb_programs=1|format_name=mpegts|start_time=1.400000|duration=5.015000|size=1504|bit_rate=2399|probe_score=2 +format|filename=id3.ts|nb_streams=1|nb_programs=1|nb_stream_groups=0|format_name=mpegts|start_time=1.400000|duration=5.015000|size=1504|bit_rate=2399|probe_score=2 From patchwork Sun Mar 3 18:09:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 46725 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp2419182pzb; Sun, 3 Mar 2024 10:10:00 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUb845GBMq8L9HWGaTKEOTgXZKQogz3f5LNlT2p/QoZo7zbMI9x0dNHFwz+w3mqSDJ70tjJWXCRCg1/eu4tphOk91Zh0Gxf/lO4lg== X-Google-Smtp-Source: AGHT+IHvSNTWOJf76i1NtX9DVFqVE+RcltGMPbenGh3AlC2F46OD9+sG3CwWqCugGAO+Pqly6ssk X-Received: by 2002:ac2:424c:0:b0:513:2c5b:4a45 with SMTP id m12-20020ac2424c000000b005132c5b4a45mr5047914lfl.3.1709489400615; Sun, 03 Mar 2024 10:10:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709489400; cv=none; d=google.com; s=arc-20160816; b=hruOpg11ORY1I4paALq1x1wbBoaKUqdQLLTHYRH5d7tfnRdXI8D76k1iJJDY8CzByy 3lR/c5H7Vj/sPOU/dE7YttZ+bnQS4CFPDEGFMx9yuszq/F5lsQ+XvlxTRd0vLZCAcsgt 5KG7MoOs8qCwq+OfzMFL+doBi+cVMElrxHyMf1abp0YSROAUtv4vcSnfdf+/qJ0Wn7Ba CSLXafjRjPz/0k7CjUdusCdbqwJ29BbKh48xKwu9D/2urDJqFYeorISQPZJFcHTWrsKT Yh49IqKkIsMC7cUtHTXKAuU8+PvN74lKkhMN+84VVDB6zSfK//MZ1pyR+MCAYqIF8kmt FlpQ== 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=SNdzdM7wGlv2iEr16aGZT+NV4IGgxdL6dkIcnVGUulE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=VycNWxUly/+WdvvCQVcAJv3tTb0F6x4+4ZuknL5FN20TyozO7DGvW92uP8MYbdIfjt dS8mNzIfl90MgO08g9NWwE70xZHEYv1oapQJD7Ib8VkWlcuzneqPULqZgBNXLriNbttS ICkfOW/bKH9d+MkKE/XpI7sMzg8DCgOZ5yCiN7Uv0Q/GTrLar83CnZif0m+JLHQjYiZW kq0DPMN3k5YUa2HBwmHa0WI8YjZP94W5Y6xtZlHqn2ellXkf4gs4FmzMKlRZ3F6PS7lW A9qmfcnlC4uQXX4H7g7L0P7L2r85P9QJMGMuEDqgwb7XEcr95qv2jTR+JlsIRfZi3gXP sAbQ==; 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=HNoGz6PV; 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 q4-20020a170906770400b00a3eabc798basi3265691ejm.1019.2024.03.03.10.10.00; Sun, 03 Mar 2024 10:10:00 -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=HNoGz6PV; 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 067B468D3B1; Sun, 3 Mar 2024 20:09:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f178.google.com (mail-oi1-f178.google.com [209.85.167.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A031B68D33D for ; Sun, 3 Mar 2024 20:09:38 +0200 (EET) Received: by mail-oi1-f178.google.com with SMTP id 5614622812f47-3c1ea5f29a6so349632b6e.0 for ; Sun, 03 Mar 2024 10:09:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709489376; x=1710094176; 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=V0Y9lyssLkMy2io0GefH+W14S1flSRgtywNbJahUhnk=; b=HNoGz6PVur5hZodCnmTUooO35dUZwtfGWa7FDUfRoprsGweiRKG/B8VqL/nu5PKbK1 kwvvH2cuadIKj5KmeEpDkGu+VoH16b1XR2TmX9ikxgcvLAbndAw8fjDf++mTHnFOAXcl pGimRD2Wi9vaWTLBHZar4IzyFHurx2hHCWPmJkFwM9+FvMHXHirIrIHB0qP3RZ5tQg2V RrKDwnusOinTilWiLQMzBIHtHDfPzwJV844wg9VPv+XnL6YlBy9C5gBEOLRpc8+bnkF1 pqrB1HxNVcearrjurRCKhgjhhcehDdLBGLSvjcgHYZq7UeTPk7Y1/EmRcoLTiPvYyXB5 LObQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709489376; x=1710094176; 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=V0Y9lyssLkMy2io0GefH+W14S1flSRgtywNbJahUhnk=; b=UfuAjwdThNd7rGe5nQ9o4fVD1FpjDUragqD5kZjY4cpUXpHjIM4S5djJkKuWT2lLHO BYy1dAfrZvv06K3N+hd9kYc+Wj9X397gSDqfCSJeoqurijcTtaDXfexPWffaI4Ga6X3F EmE7BATvSAXVgbyFZsnjIIPd82/eUaFkVqMVnJLBAgaWpdjYU0AnCJAA1mJv0sSajC1f GiHjYbv7Da950pllt8eAMTE+++tWdJUjIVbnvWY/VULbX0ExuNq1Uk6nsN8927gG2wZU Fyt43NqdnHIQNGX6wiSehMsEIVsF2mzzmR9xWYkmdv9pz+tD04keSAgqKbDeFthN2nom 5ulw== X-Gm-Message-State: AOJu0Yx9YLJSVI2fSrItG9MekqvXjbRmE75xUqQZXP6APHNfCHSiqi2P zFG9wGCLh+53vQoCIwSrnJqqE0Gj5U2IOdTstq1gkUMdFLlFN4UChKlWAaHg X-Received: by 2002:a05:6808:eca:b0:3c1:c7cb:13f6 with SMTP id q10-20020a0568080eca00b003c1c7cb13f6mr9344940oiv.22.1709489376244; Sun, 03 Mar 2024 10:09:36 -0800 (PST) Received: from localhost.localdomain ([190.194.169.124]) by smtp.gmail.com with ESMTPSA id k9-20020a170902c40900b001db5ea825b2sm5511316plk.123.2024.03.03.10.09.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Mar 2024 10:09:35 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Mar 2024 15:09:20 -0300 Message-ID: <20240303180929.56930-2-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240303180929.56930-1-jamrial@gmail.com> References: <20240303180929.56930-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/8] fftools/ffprobe: print some basic 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: NOYGp0ZDAa1J Signed-off-by: James Almer --- fftools/ffprobe.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 548c5e0948..fef2a37d4c 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -3367,7 +3367,15 @@ static void print_stream_group_params(WriterContext *w, AVStreamGroup *stg) else if (stg->type == AV_STREAM_GROUP_PARAMS_IAMF_MIX_PRESENTATION) print_str("type", "IAMF Mix Presentation"); else if (stg->type == AV_STREAM_GROUP_PARAMS_TILE_GRID) { + AVStreamGroupTileGrid *tile_grid = stg->params.tile_grid; print_str("type", "Tile Grid"); + 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); } else print_str_opt("type", "unknown"); } From patchwork Sun Mar 3 18:09:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 46726 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp2419247pzb; Sun, 3 Mar 2024 10:10:09 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWqUR37HFz/XgqL0MuynjEXQK9tWkW3JXfMOk9cqAIzVWXHhMEQQ1SdNX3qax3Xwbl7E6BTqhwkZKdrhpix6XqbvNZBy6WOZZPBwA== X-Google-Smtp-Source: AGHT+IHd4aE37lFG55T7iuVYlH55BAbEKEIU3YVmu8lkyoM/r9fziOxJZFMijIOvbkaAOxZ0HaEa X-Received: by 2002:a17:907:a603:b0:a3e:9bce:b5b1 with SMTP id vt3-20020a170907a60300b00a3e9bceb5b1mr5819575ejc.5.1709489409551; Sun, 03 Mar 2024 10:10:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709489409; cv=none; d=google.com; s=arc-20160816; b=SILIoliWF8V3+CSAsQyvQ0Fj2X9xPalBYjeU+pmjTJaL1ywM5T7kAAhM1GmQpvCQrQ 5DOM3nrnGy2MI5KNuRvoBV32LS1Zaab7faBuJGg0hoBS3Q4t4QXcRD05HnaRzM5EfWlF LKWOiAo1ZW7sPmMh885GW3cwN3FoSTz2VkYfiqwlwaxUhhzbe71u1KHMzFjPemin4+r2 UaiO8O+0FLQyxrnyh0BanZrAm5BeUBGoZeOPQ49JHE5C1R4hemtiaPDaY0dOCc7R//ps 33QkfCHP862zKC+YWmqZNQXS/8HRpiR3VPaUKpDUTeLZuD0OOR5rgZooWtwflnMdUsBR UOtg== 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=qlySbXqg8OvwIDWkO5OYpdzDnsqQffK8pv/dnVgm3O4=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=zpLgXWej07F16AAoW1r+pZZuXvuHKuOwcs6le6IUxnkkmbqqS348jJ0OBevjHuKa1P 9z56hVre59+Fuzy594Jv3aha9ifJGGNbINA2gkKZ8Djq0Und68q1M6ksrMPApzuW5uiZ e1kyC4H7QpUJFNIRzQEIxpG8QFzpGVA08uad235nIqGvsX0GAUIfc3aPvKd3bfuCZM+i iNOBQbs28Cb7bp60bUyo1j4eenBST7DAdsYGT24g9A2kldO596fIDkJMnsSjJwmtTA5t 3PZ2zckJQIkC/MuhjkBkelQTg0+kmybehkivAWKcyv6+V/DC8pcbwx2CTp95s4yUZ3wV eFmw==; 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=LCuexGGh; 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 hq20-20020a1709073f1400b00a4515949090si670730ejc.390.2024.03.03.10.10.09; Sun, 03 Mar 2024 10:10:09 -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=LCuexGGh; 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 3226668D3AE; Sun, 3 Mar 2024 20:09:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 09FF568D3AD for ; Sun, 3 Mar 2024 20:09:40 +0200 (EET) Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-6e5eaf5bb3eso656933b3a.3 for ; Sun, 03 Mar 2024 10:09:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709489378; x=1710094178; 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=kjExAaG0MYcRAoc7ZPkHInE8248zmeZmFoSkzpyAgac=; b=LCuexGGhGV9a/BCca8LONVxOqpmK8+vod6TJBUyqvloqhQrBXKeA+IcDtAQxWani5a WTucPop6st+d5A/dEa4My5qbDVyIHI8pjYJKTw+dxoJMfV+OraDZIEtf+VyEQKSvU30g UUogxVeVrR7eN/kfXEWctzhidf6BvNIdAcwYmF85DAg6edOl/oRaFtvbnPr0qVBtwj4T JGwGJFmMHB5izhc9xkH65DtvyC4NufizuaP62T5Eg+XAs4MWanqeYtGvTe/JIxBYyTRh ewGzdM0RKIEXuOLl57NAkW+MpBIF0i6jfeGFLAjcWGVWZKaAArfbWKbZdWFeZUeuwaEw ndAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709489378; x=1710094178; 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=kjExAaG0MYcRAoc7ZPkHInE8248zmeZmFoSkzpyAgac=; b=DE1FBaQqKk788M89Lz/B60gQEGlb4qOhMc+khXXdcIFo2ZH43jsSuwNmQwLbnknfvg unxdL8VDDvGiiYB2RxgBFI68fMmFsYvpgz3oUqxxX8lh6w9dK7B7QNcCAQaDruB0eYr6 hOr3Lt4BUeAdQs9d615jZ5DtAnDPviljNGhrIR+yaUZJNjEl0Wxu+UHsrMNQIcxBF47u PZ+XJ7HEyn6IBNH3rKXDFR9b6JTzkC5z4kaAzY/L5r04IXTPOY5u+Yyg+kniugGoL+fL OCndyEYdQNBsKlvcDYq2fd6dXlKLRktXEcdmeWa3vrll+RSEZXwzKfRif6Ske2gykllo 9sFg== X-Gm-Message-State: AOJu0YzWElqqRHL/ZwwbtoFc98wL9hXKTWGWd4+TIb/yPrwNfCcj8wyt RPanogS5qoVoIvi2VC8f47sR4WuuHc7M3uNtdcGJIQXrDgiJ4gxG4xu7oNAO X-Received: by 2002:a17:903:2292:b0:1dc:abf0:14ee with SMTP id b18-20020a170903229200b001dcabf014eemr8870208plh.22.1709489377583; Sun, 03 Mar 2024 10:09:37 -0800 (PST) Received: from localhost.localdomain ([190.194.169.124]) by smtp.gmail.com with ESMTPSA id k9-20020a170902c40900b001db5ea825b2sm5511316plk.123.2024.03.03.10.09.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Mar 2024 10:09:37 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Mar 2024 15:09:21 -0300 Message-ID: <20240303180929.56930-3-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240303180929.56930-1-jamrial@gmail.com> References: <20240303180929.56930-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/8] fate/iamf: print stream group information 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: BcmON4bVlnXn Signed-off-by: James Almer --- tests/fate/iamf.mak | 8 ++-- tests/ref/fate/iamf-5_1_4 | 60 +++++++++++++++++++++++++++++ tests/ref/fate/iamf-7_1_4 | 68 +++++++++++++++++++++++++++++++++ tests/ref/fate/iamf-ambisonic_1 | 44 +++++++++++++++++++++ tests/ref/fate/iamf-stereo | 20 ++++++++++ 5 files changed, 196 insertions(+), 4 deletions(-) diff --git a/tests/fate/iamf.mak b/tests/fate/iamf.mak index 8b0de7f4b2..2257580871 100644 --- a/tests/fate/iamf.mak +++ b/tests/fate/iamf.mak @@ -4,7 +4,7 @@ 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" + -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" 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 +13,7 @@ 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" + -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" 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 +22,7 @@ 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" + -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" 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 +31,7 @@ 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" + -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" FATE_IAMF-$(call TRANSCODE, FLAC, IAMF, WAV_DEMUXER PCM_S16LE_DECODER) += $(FATE_IAMF) diff --git a/tests/ref/fate/iamf-5_1_4 b/tests/ref/fate/iamf-5_1_4 index e6eb356ff0..daa9653006 100644 --- a/tests/ref/fate/iamf-5_1_4 +++ b/tests/ref/fate/iamf-5_1_4 @@ -96,3 +96,63 @@ c447cbbc8943cfb751fdf1145a094250 *tests/data/fate/iamf-5_1_4.iamf 3, 41472, 41472, 4608, 923, 0xa7225edf 4, 41472, 41472, 4608, 926, 0xc26a5eae 5, 41472, 41472, 4608, 926, 0xc26a5eae +[STREAM_GROUP] +index=0 +id=0x1 +nb_streams=6 +type=IAMF Audio Element +[STREAM] +index=0 +id=0x0 +[/STREAM] +[STREAM] +index=1 +id=0x1 +[/STREAM] +[STREAM] +index=2 +id=0x2 +[/STREAM] +[STREAM] +index=3 +id=0x3 +[/STREAM] +[STREAM] +index=4 +id=0x4 +[/STREAM] +[STREAM] +index=5 +id=0x5 +[/STREAM] +[/STREAM_GROUP] +[STREAM_GROUP] +index=1 +id=0x2 +nb_streams=6 +type=IAMF Mix Presentation +[STREAM] +index=0 +id=0x0 +[/STREAM] +[STREAM] +index=1 +id=0x1 +[/STREAM] +[STREAM] +index=2 +id=0x2 +[/STREAM] +[STREAM] +index=3 +id=0x3 +[/STREAM] +[STREAM] +index=4 +id=0x4 +[/STREAM] +[STREAM] +index=5 +id=0x5 +[/STREAM] +[/STREAM_GROUP] diff --git a/tests/ref/fate/iamf-7_1_4 b/tests/ref/fate/iamf-7_1_4 index c176f4a1cd..6b677c697a 100644 --- a/tests/ref/fate/iamf-7_1_4 +++ b/tests/ref/fate/iamf-7_1_4 @@ -112,3 +112,71 @@ 4, 41472, 41472, 4608, 926, 0xc26a5eae 5, 41472, 41472, 4608, 926, 0xc26a5eae 6, 41472, 41472, 4608, 926, 0xc26a5eae +[STREAM_GROUP] +index=0 +id=0x1 +nb_streams=7 +type=IAMF Audio Element +[STREAM] +index=0 +id=0x0 +[/STREAM] +[STREAM] +index=1 +id=0x1 +[/STREAM] +[STREAM] +index=2 +id=0x2 +[/STREAM] +[STREAM] +index=3 +id=0x3 +[/STREAM] +[STREAM] +index=4 +id=0x4 +[/STREAM] +[STREAM] +index=5 +id=0x5 +[/STREAM] +[STREAM] +index=6 +id=0x6 +[/STREAM] +[/STREAM_GROUP] +[STREAM_GROUP] +index=1 +id=0x2 +nb_streams=7 +type=IAMF Mix Presentation +[STREAM] +index=0 +id=0x0 +[/STREAM] +[STREAM] +index=1 +id=0x1 +[/STREAM] +[STREAM] +index=2 +id=0x2 +[/STREAM] +[STREAM] +index=3 +id=0x3 +[/STREAM] +[STREAM] +index=4 +id=0x4 +[/STREAM] +[STREAM] +index=5 +id=0x5 +[/STREAM] +[STREAM] +index=6 +id=0x6 +[/STREAM] +[/STREAM_GROUP] diff --git a/tests/ref/fate/iamf-ambisonic_1 b/tests/ref/fate/iamf-ambisonic_1 index 928a9c6cf2..dfb3d723ca 100644 --- a/tests/ref/fate/iamf-ambisonic_1 +++ b/tests/ref/fate/iamf-ambisonic_1 @@ -64,3 +64,47 @@ 1, 41472, 41472, 4608, 923, 0xa7225edf 2, 41472, 41472, 4608, 923, 0xa7225edf 3, 41472, 41472, 4608, 923, 0xa7225edf +[STREAM_GROUP] +index=0 +id=0x1 +nb_streams=4 +type=IAMF Audio Element +[STREAM] +index=0 +id=0x0 +[/STREAM] +[STREAM] +index=1 +id=0x1 +[/STREAM] +[STREAM] +index=2 +id=0x2 +[/STREAM] +[STREAM] +index=3 +id=0x3 +[/STREAM] +[/STREAM_GROUP] +[STREAM_GROUP] +index=1 +id=0x2 +nb_streams=4 +type=IAMF Mix Presentation +[STREAM] +index=0 +id=0x0 +[/STREAM] +[STREAM] +index=1 +id=0x1 +[/STREAM] +[STREAM] +index=2 +id=0x2 +[/STREAM] +[STREAM] +index=3 +id=0x3 +[/STREAM] +[/STREAM_GROUP] diff --git a/tests/ref/fate/iamf-stereo b/tests/ref/fate/iamf-stereo index 65d6b506d4..32d1e4022f 100644 --- a/tests/ref/fate/iamf-stereo +++ b/tests/ref/fate/iamf-stereo @@ -16,3 +16,23 @@ ace731a4fbc302e24498d6b64daa16e7 *tests/data/fate/iamf-stereo.iamf 0, 32256, 32256, 4608, 1768, 0x2a044b99 0, 36864, 36864, 4608, 1534, 0xb0b35a3f 0, 41472, 41472, 4608, 926, 0xc26a5eae +[STREAM_GROUP] +index=0 +id=0x1 +nb_streams=1 +type=IAMF Audio Element +[STREAM] +index=0 +id=0x0 +[/STREAM] +[/STREAM_GROUP] +[STREAM_GROUP] +index=1 +id=0x2 +nb_streams=1 +type=IAMF Mix Presentation +[STREAM] +index=0 +id=0x0 +[/STREAM] +[/STREAM_GROUP] From patchwork Sun Mar 3 18:09:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 46727 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp2419307pzb; Sun, 3 Mar 2024 10:10:18 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVfoUHQaF7a4LXU25rIuBBa4GfB2Kq3qYrCZ6ZXenX6bCQho8KRXPzL3ltrKt49BfGWgYV/uW1kKQTDNrk+afWt5XWst2qEqYfFLQ== X-Google-Smtp-Source: AGHT+IHWMGCcpzpOF+N+T4MCOerq0knAVZm0izk1gaIuDQjb05VchPOjIffore3nmI0gKZNkqxkb X-Received: by 2002:a17:906:b04c:b0:a44:b91e:315b with SMTP id bj12-20020a170906b04c00b00a44b91e315bmr3997729ejb.68.1709489418305; Sun, 03 Mar 2024 10:10:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709489418; cv=none; d=google.com; s=arc-20160816; b=hUXYm2RNrZDiv8DCXk5g/yTN8QR/4tBjaETM5yZU6dVZzL+q1P61GiJ/xCVElw9dXZ jirrCaliI9UgutIXMcm1rDuC+FkbBbfKcFJkB21vlwDZ0TZNcScGaTnc+wU5/SXKNscD tQg6P80Y1MC3P8SxtKwOD+3TtqfulUWijmFFfuc6ioVygK87kuq9e521VqLZqFwzn5kP CcG1MmBhlzG0W1xSSNLC91M0px8uLulA/3g83f2Y/ANlfMRnTogA10mJWAo3U5n1P2ww RvDmVs1dIkWcFfM051sxzFh0f41n+zraFF4+l00M8RLVH2mC8/1Pz07B8Gbgna20FzDU K1mQ== 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=xru5iLirtqD80Cpc+5siM48zCm8yBSaOmgqX6yXPTWQ=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Ib+WpvEzf1eq5IVN3toS0WLJVxkMPUkoyRbKSkGJ7RGOAyoiuLgmlrSFr69gYcqEbg ATT4EXtFcxvyRPdD3Mnxu2xLzIYLQOArqHPpuimDmjisKjXmhQylS3bTLxzc/e1bU5L/ iTqb9YsDf3v4Fy8GUg/9hxLw9ydSp49RpZZhDZwDxiMP9a+WySIGTJLqgrLGhLV21oeO yGraTkw1wGve3GCNfaOp7hKgWvbaSzDY2IwfHalbdHPpeBGODrYTlH4DAGCcJibF3e3z l8IdSM1EHV45bjrLLVvhEhD0PPrxKx+sSDwJZ9xqQFz8SwkDTvb69uWIjJtKWUVEurzg DNow==; 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=TmecU4XB; 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 qf24-20020a1709077f1800b00a42f6f4615asi3319622ejc.1044.2024.03.03.10.10.17; Sun, 03 Mar 2024 10:10:18 -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=TmecU4XB; 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 5C93668D3B6; Sun, 3 Mar 2024 20:09:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7852F68D3B3 for ; Sun, 3 Mar 2024 20:09:41 +0200 (EET) Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1dd10a37d68so1998115ad.2 for ; Sun, 03 Mar 2024 10:09:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709489379; x=1710094179; 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=V+UhSZRxtclxqf6iL+VupZfuNCWDAT3qAo+DLmb7bdc=; b=TmecU4XBUznTytj6Q5Tfg7E9O9nGPEblUt2sqYrMngULARr/kcWh4bkKTCny13lDmX TKc0IMIIUTGVkta6/s8uHtvY4NDIyHc480juzz7/IsSem5vZAMRLd6QYloelYzFQ3R51 uSNkfd5Gdz/GUAYxljwba6VuNegsdvBQ3exR/vri7VLQHxEO/M/07AAizfjE0xJdZz+7 JlSInZYgweYMYC4dyMm447gB4go1/GcgoRNOUnN5DG30mdk5+//VLGzxekWeJCaIrskQ c8IhBpD6Tkv7Leo4UURFE80Y74IWDRgppDNvbIbb79v+H1HBWsEiK66E8iDFbHeowAAu IYjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709489379; x=1710094179; 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=V+UhSZRxtclxqf6iL+VupZfuNCWDAT3qAo+DLmb7bdc=; b=U8T7hhetPEWIkhnUbRApd30m7Bs8dpFi8lv8iWM9UGFdQsC44uUCqvVEM7OGAla4rG /8242jF9HL2PjaNUnpZxYg/0PVO527VPmvxlXIUM+VStqnnwvOjq9OQOynXveukNROLm rwWNTyq8MAX5oQ4BlDr2HvcumlpJaLBqjdjxQkrHe+tv/ITlecpLzvyZT/iQN9ZIUKPm 7P4wll7c0HZDRRrYKOovq7tuXBmOcQxiM4OFHe2bhGglKFj8pZJOJFmyGR7TcfHoiwXF nalGwsSgVVhj9yMBZigwzaqnjjFyxu4ev/r8KmfHUs/Wp6fAqOVo+sGsirjNdpXBryGE Wijw== X-Gm-Message-State: AOJu0YxSLvVcV3Iv9fKhW5D9krU0pD40JfKJtDiNAlWvAU+6ccOa5fcS TPbrOINK6Z1CJPoSpijwCUE11ISmslyqI6MxTN4n6IIfiYpZVeqARnEvtFkB X-Received: by 2002:a17:902:e543:b0:1dc:b4ef:b199 with SMTP id n3-20020a170902e54300b001dcb4efb199mr8217674plf.36.1709489378947; Sun, 03 Mar 2024 10:09:38 -0800 (PST) Received: from localhost.localdomain ([190.194.169.124]) by smtp.gmail.com with ESMTPSA id k9-20020a170902c40900b001db5ea825b2sm5511316plk.123.2024.03.03.10.09.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Mar 2024 10:09:38 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Mar 2024 15:09:22 -0300 Message-ID: <20240303180929.56930-4-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240303180929.56930-1-jamrial@gmail.com> References: <20240303180929.56930-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/8] avformat/mov: fix setting disposition for the first iamf stream 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: SmiiZYsy5Ikg st->disposition will be overwritten with disposition later in the function. Signed-off-by: James Almer --- libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index e07f2a1ada..7a09017020 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -946,7 +946,7 @@ static int mov_read_iacb(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (!i && !j) { if (audio_element->layers[0].substream_count != 1) - st->disposition &= ~AV_DISPOSITION_DEFAULT; + disposition &= ~AV_DISPOSITION_DEFAULT; stream = st; } else stream = avformat_new_stream(c->fc, NULL); From patchwork Sun Mar 3 18:09:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 46728 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp2419371pzb; Sun, 3 Mar 2024 10:10:27 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCX8TOfNzA6IMRz7voRt+TtDDTBWoztgnLQfjk/3PZgXMhRTz7+73ZNkBA/BQyNtw9++s8k34OEe61uSI9TRwaH8FrxxTFP1myyMjQ== X-Google-Smtp-Source: AGHT+IFxMrPaJVmAOiia9UMYqrA4ePw1weD2oihAJlMJkKBHrpqao6MBrtkLdn/9gTnaAbXFfbc9 X-Received: by 2002:ac2:4648:0:b0:513:2fcb:da02 with SMTP id s8-20020ac24648000000b005132fcbda02mr3657877lfo.2.1709489427516; Sun, 03 Mar 2024 10:10:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709489427; cv=none; d=google.com; s=arc-20160816; b=eIOrDKvgJAclckdjU2AsslgPme/uyuOJNduo0j/xobFsXczICOWaKvDLK3zCgNYUVz 24k6LQG4mb8pNGIYF7pXQVYoGIGHq9UZdxNSaYpQh1oa384V8X3tY0EatexECWQvkj/R vE22cNIT05ZFKFjeH5FDAsUDXJUDVlta7KAl8SbJCT2k3xqJPpybI5tl1QTYsQT7HOxX IW+mesgZrmIyaV/6o+BGNdF03mJ1yLE4yxjPfv1Frv2D7unuZq0F4CePCAmF5bSG1eYJ 8mgt5FsZkYi04fMhcoIaxsYhZ0UvvWNTIJfvOb5aziyUQVkWJOe1+tdOsmIQMbMo9/T4 QInQ== 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=CM57+LEcK6OQTeo0rJEdqoYy2hVJfmFotOZQ3wwHYbI=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=x7pSZRXpaBaQZkh9UtugjQgBw5bie9eoI4Qnsok68fKBSrf6Bc7klA6NauiASovH1u KAYZNBcV26T5NCQiJzc7pxrzGpJXaqXpNCdpFgBCadeDanDurQ099UzYd5NvtowP1b9Z 8DOYTOOF+pixusKpufJ2gqsStA5/W3NlE2ezEy90OX9LpZhv3y/8krLL401lJtTWBeQw UoIkkdfov+ppMEyPK1sY+tqbN4tC7RWUgcRdc/KisK5EncNVAF4BcaPgYbGZxwdmTHUb MeGLc/v6viuFxIBUyWE3tSj+KiWTiCm2lPng2lTLeeX0zN+jjNip2NGnom6yQaEWwG5q cBlA==; 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=Yq3Lv7Hu; 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 ss15-20020a170907038f00b00a449fe3d7c5si2043425ejb.847.2024.03.03.10.10.27; Sun, 03 Mar 2024 10:10:27 -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=Yq3Lv7Hu; 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 A02F368D3C4; Sun, 3 Mar 2024 20:09:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 79B4868D3B7 for ; Sun, 3 Mar 2024 20:09:43 +0200 (EET) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1dc3b4b9b62so32403695ad.1 for ; Sun, 03 Mar 2024 10:09:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709489381; x=1710094181; 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=YHXbUaTnfnx1zd6zIPzsjK+XvYjZHimmBUTTUMbPbHo=; b=Yq3Lv7HuESIth/iMaO+ZFT2v39m9F02UtzRCX5fOtzeRwtFwRxAIjDiEsU0Xmg2Jeb xK+x2WRNgm08UFyb94DXZA49Ljf3tnkyYAfurOpKo+42LLuv4h1UssXYDLJwCKhBxFRj J5VF5FF8MIfaZwHKayDfO/SUJ1w7HAizC2LVASnORmLDqWLDD10IOspjOz2x6ohMA1uM gyQTHetTgvYpG5xCxU3ouy6hOlDA4BgRTKxCL1DKimCCmHW+oq46rlW64Qm/G0Hy3ZwN mfjkqMupRsgRjxTGZQdEnS8jblbJ09PawGIZe3nUUPmCECJGuJoZ+UmArK8VFzZBmSXv iqiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709489381; x=1710094181; 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=YHXbUaTnfnx1zd6zIPzsjK+XvYjZHimmBUTTUMbPbHo=; b=QTnfXrVWf9M0rQD9Bfq48g9fFP3bt5615YAufOfZsc3IQeUU4vbk5WOh3OvmNd+J0W jl5Scmc8lI/L64XbBNCtQiSwrMO6gtaBWwglkjshO61l7CxeojkfIrmoVjvTYQljuNdI chE86v9Fi2chmRqSG70cZx7rE2IJDZsKd44s4p2J43bL4HqF7SGKE/xkIvAGvq7d94fK 2e40xYWb72E6wNoZiQmhm6OaasFzdlp2yzjZW3SPlYTCP7fshSL2yHOIzjExc3L5NF/D +sZHaaW6K91kD/9bPlz5/NX+GU5pthg+A/p9JE4/LSNGTwhWHVNNEO1hMkGKPxPWGW72 PTGg== X-Gm-Message-State: AOJu0YzxaQSH4AGmGZPOkXKT4UzsWcnrkRgEkzeDJsM2noA0q76CfLwq uztVCWe4BztFkjAM4KAPsimzLe7F5ylCIAlX3BMS/p0prIc3zRNTmQga5XjJ X-Received: by 2002:a17:902:e746:b0:1dc:a84b:e83c with SMTP id p6-20020a170902e74600b001dca84be83cmr11253264plf.25.1709489380369; Sun, 03 Mar 2024 10:09:40 -0800 (PST) Received: from localhost.localdomain ([190.194.169.124]) by smtp.gmail.com with ESMTPSA id k9-20020a170902c40900b001db5ea825b2sm5511316plk.123.2024.03.03.10.09.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Mar 2024 10:09:39 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Mar 2024 15:09:23 -0300 Message-ID: <20240303180929.56930-5-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240303180929.56930-1-jamrial@gmail.com> References: <20240303180929.56930-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/8] fate/mov: print stream group information for iamf tests 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: bAfWudYYU157 Signed-off-by: James Almer --- tests/fate/mov.mak | 12 +- tests/ref/fate/mov-mp4-iamf-5_1_4 | 318 +++++++++++++++++++++ tests/ref/fate/mov-mp4-iamf-7_1_4 | 362 ++++++++++++++++++++++++ tests/ref/fate/mov-mp4-iamf-ambisonic_1 | 230 +++++++++++++++ tests/ref/fate/mov-mp4-iamf-stereo | 98 +++++++ 5 files changed, 1016 insertions(+), 4 deletions(-) diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index 535647c474..de0e654532 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -211,7 +211,8 @@ fate-mov-mp4-iamf-stereo: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav 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" + -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" FATE_MOV_FFMPEG-$(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 @@ -220,7 +221,8 @@ fate-mov-mp4-iamf-5_1_4: CMD = transcode wav $(SRC) mp4 "-auto_conversion_filter -/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" + -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" FATE_MOV_FFMPEG-$(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 @@ -229,7 +231,8 @@ fate-mov-mp4-iamf-7_1_4: CMD = transcode wav $(SRC) mp4 "-auto_conversion_filter -/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" + -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" FATE_MOV_FFMPEG-$(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 @@ -238,7 +241,8 @@ fate-mov-mp4-iamf-ambisonic_1: CMD = transcode wav $(SRC) mp4 "-auto_conversion_ -/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" + -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" FATE_FFMPEG += $(FATE_MOV_FFMPEG-yes) diff --git a/tests/ref/fate/mov-mp4-iamf-5_1_4 b/tests/ref/fate/mov-mp4-iamf-5_1_4 index 2f29a83cf4..fde95296eb 100644 --- a/tests/ref/fate/mov-mp4-iamf-5_1_4 +++ b/tests/ref/fate/mov-mp4-iamf-5_1_4 @@ -96,3 +96,321 @@ 3, 41472, 41472, 2628, 923, 0xa7225edf 4, 41472, 41472, 2628, 926, 0xc26a5eae 5, 41472, 41472, 2628, 926, 0xc26a5eae +[STREAM_GROUP] +index=0 +id=0x1 +nb_streams=6 +type=IAMF Audio Element +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +TAG:language=und +TAG:handler_name=SoundHandler +TAG:vendor_id=[0][0][0][0] +[STREAM] +index=0 +id=0x0 +DISPOSITION:default=1 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=1 +id=0x1 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=2 +id=0x2 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=3 +id=0x3 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=4 +id=0x4 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=5 +id=0x5 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[/STREAM_GROUP] +[STREAM_GROUP] +index=1 +id=0x2 +nb_streams=6 +type=IAMF Mix Presentation +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +TAG:language=und +TAG:handler_name=SoundHandler +TAG:vendor_id=[0][0][0][0] +[STREAM] +index=0 +id=0x0 +DISPOSITION:default=1 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=1 +id=0x1 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=2 +id=0x2 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=3 +id=0x3 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=4 +id=0x4 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=5 +id=0x5 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[/STREAM_GROUP] diff --git a/tests/ref/fate/mov-mp4-iamf-7_1_4 b/tests/ref/fate/mov-mp4-iamf-7_1_4 index 891803470a..a660aaa143 100644 --- a/tests/ref/fate/mov-mp4-iamf-7_1_4 +++ b/tests/ref/fate/mov-mp4-iamf-7_1_4 @@ -112,3 +112,365 @@ 4, 41472, 41472, 2628, 926, 0xc26a5eae 5, 41472, 41472, 2628, 926, 0xc26a5eae 6, 41472, 41472, 2628, 926, 0xc26a5eae +[STREAM_GROUP] +index=0 +id=0x1 +nb_streams=7 +type=IAMF Audio Element +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +TAG:language=und +TAG:handler_name=SoundHandler +TAG:vendor_id=[0][0][0][0] +[STREAM] +index=0 +id=0x0 +DISPOSITION:default=1 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=1 +id=0x1 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=2 +id=0x2 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=3 +id=0x3 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=4 +id=0x4 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=5 +id=0x5 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=6 +id=0x6 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[/STREAM_GROUP] +[STREAM_GROUP] +index=1 +id=0x2 +nb_streams=7 +type=IAMF Mix Presentation +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +TAG:language=und +TAG:handler_name=SoundHandler +TAG:vendor_id=[0][0][0][0] +[STREAM] +index=0 +id=0x0 +DISPOSITION:default=1 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=1 +id=0x1 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=2 +id=0x2 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=3 +id=0x3 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=4 +id=0x4 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=5 +id=0x5 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=6 +id=0x6 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[/STREAM_GROUP] diff --git a/tests/ref/fate/mov-mp4-iamf-ambisonic_1 b/tests/ref/fate/mov-mp4-iamf-ambisonic_1 index c4af88ce10..20f7ef97a4 100644 --- a/tests/ref/fate/mov-mp4-iamf-ambisonic_1 +++ b/tests/ref/fate/mov-mp4-iamf-ambisonic_1 @@ -64,3 +64,233 @@ fa740a4e2b84453c4e84908190094e28 *tests/data/fate/mov-mp4-iamf-ambisonic_1.mp4 1, 41472, 41472, 2628, 923, 0xa7225edf 2, 41472, 41472, 2628, 923, 0xa7225edf 3, 41472, 41472, 2628, 923, 0xa7225edf +[STREAM_GROUP] +index=0 +id=0x1 +nb_streams=4 +type=IAMF Audio Element +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +TAG:language=und +TAG:handler_name=SoundHandler +TAG:vendor_id=[0][0][0][0] +[STREAM] +index=0 +id=0x0 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=1 +id=0x1 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=2 +id=0x2 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=3 +id=0x3 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[/STREAM_GROUP] +[STREAM_GROUP] +index=1 +id=0x2 +nb_streams=4 +type=IAMF Mix Presentation +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +TAG:language=und +TAG:handler_name=SoundHandler +TAG:vendor_id=[0][0][0][0] +[STREAM] +index=0 +id=0x0 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=1 +id=0x1 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=2 +id=0x2 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=3 +id=0x3 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[/STREAM_GROUP] diff --git a/tests/ref/fate/mov-mp4-iamf-stereo b/tests/ref/fate/mov-mp4-iamf-stereo index 5c66c3e188..06af474018 100644 --- a/tests/ref/fate/mov-mp4-iamf-stereo +++ b/tests/ref/fate/mov-mp4-iamf-stereo @@ -16,3 +16,101 @@ 0, 32256, 32256, 4608, 1768, 0x2a044b99 0, 36864, 36864, 4608, 1534, 0xb0b35a3f 0, 41472, 41472, 2628, 926, 0xc26a5eae +[STREAM_GROUP] +index=0 +id=0x1 +nb_streams=1 +type=IAMF Audio Element +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +TAG:language=und +TAG:handler_name=SoundHandler +TAG:vendor_id=[0][0][0][0] +[STREAM] +index=0 +id=0x0 +DISPOSITION:default=1 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +[/STREAM] +[/STREAM_GROUP] +[STREAM_GROUP] +index=1 +id=0x2 +nb_streams=1 +type=IAMF Mix Presentation +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +TAG:language=und +TAG:handler_name=SoundHandler +TAG:vendor_id=[0][0][0][0] +[STREAM] +index=0 +id=0x0 +DISPOSITION:default=1 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +[/STREAM] +[/STREAM_GROUP] From patchwork Sun Mar 3 18:09:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 46729 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp2419435pzb; Sun, 3 Mar 2024 10:10:37 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWgft9pkuHnEf3m+y36l6zGfAF04LLjjjsAMuBNlVeAXK9WWmZ58j877I1xGtKKBhBMgAHUTbEImlmalMPr7xV1TCvBf8ruRHMvyw== X-Google-Smtp-Source: AGHT+IE9fRdMUwHlYKI4vps2+cOvfpqpoJpKBG2wT5Tx9UdJRGiB6q0CHKYl6J9IzUAYSbg5iTTv X-Received: by 2002:ac2:4281:0:b0:513:1a38:2406 with SMTP id m1-20020ac24281000000b005131a382406mr5048888lfh.13.1709489437270; Sun, 03 Mar 2024 10:10:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709489437; cv=none; d=google.com; s=arc-20160816; b=E5p417EUQ78DZmK/mXtxQqpl81/kKImt4KSlGw8Z+ebGiyk8Q5dQFlpCxmrcxRzSWM Cptxb1I2VWuYLFu6uuWKx6aG+HqMnIz8UZVo//hoJHXYHQf1NEKu7X7FxdtZIIare/iu sWE4Uo8B4Tn/TQE58jx+fIqXcLHi3st6UEyAu6xVk+cB/Z+vuK6Unt+Tq/niZMj6ByAY D8Nqm8oTFeFav4+52VRGpQYpjTx2VGPTgd6uS490efuzAmq/1Dta+cbyYhjlVRW55BMW 2GaSeq/SVPEA4X+5KfNu0WXhl86iex3mjS6qDDJ344b9GLkPL2aNJ90A8s5xDNvI6Elc aM3w== 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=3IMsWZSk2WpZ5F37Jr1dgwC+J/KEgQSukhmvKljQMVo=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=nSSrq0+hWiCC5OclD/LbaesWqHtc5qwLS+LACHHyq/Jgzb6EW7CsAvuKjeaOk8aWWn xUCtAqEHG41sIvgTSPSx4kaBfA9eTvrdIadPCnZtIGBCiOrLmMg2QDpSo9i9oa18O5IB jntmPPFiBFdg8/D2VWOtzMPZx5RhhFptMomYj3S6uB/u3uVrZyVfce+T1qPXOqfg560O X8cxHc7RQz/tFMXvMWI+ENLY3JQCVfPWUIEsElhU4XnXzsZRu557mtHqchA88eQAM0PG ag2pfghuTdfUaVyyD67MrBi0zuk547Xc0JEU+N1Tu5CURPV0++3yALDx1WAUW/EsHPGd P+yQ==; 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=P5+aizwH; 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 s7-20020a170906bc4700b00a43f5122bfbsi3178657ejv.96.2024.03.03.10.10.36; Sun, 03 Mar 2024 10:10:37 -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=P5+aizwH; 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 A458C68D3BF; Sun, 3 Mar 2024 20:09:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F2B5F68D3C0 for ; Sun, 3 Mar 2024 20:09:44 +0200 (EET) Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-29a2545a1e7so2502948a91.2 for ; Sun, 03 Mar 2024 10:09:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709489382; x=1710094182; 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=coN1CdswZNYdrlVVGxkiEuXQYl5ixBNd50Eo6Qdd0UU=; b=P5+aizwHC7VlUkeNvimD2PGlR64SOmvZoB7HRhiJD6xk/5zRAyI1Pvt6Z5NgIzLIp3 R9hMrlXkoHdhuid8B96Gl3h6VFhzKbOmj2FMrMDvUCJHHz3xf7YvxMzysQ/g4qhpcpRf Sa8l7/BvBWtP0FRJKkRaxOYqPBLydqZ3jb6mGeSGaaBgBqzUudfqO2tgtnoPsG8n6QMl TXRpHtPiuBC2vtX+bAVGG+iJjOcEd1EkwtEZ5lr8FtRDy73YlYk78GFv1oxGcrdtZ2aR ieCR+Ej7P4nwgu9ohDImYNpfOElI2mcoi4eNRK/sJaPpmSa5jmOWFQrfLxcUgKfXvfOd jJDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709489382; x=1710094182; 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=coN1CdswZNYdrlVVGxkiEuXQYl5ixBNd50Eo6Qdd0UU=; b=j4TwndKEeWnbv7lFukClkq1NmQ9XNUbmG1RRUxNF1oXLa8hpnxCH8pU9UEwKTTdVWy 5cNBjRdndLY3UC6TS9OnBEr1fc+I03rwMoM/SL9hW9j6O5TqlYsTuX3zCFeloAzE6zTJ bA9wJz8+f/MI93KZWiRKNB5fMXSAO/0j6tzoIVsI55x0vWYnLqGRkUprsm6bLbE5j04c V0vnU1nbgaJ7WNwjY4RpcXbp1yMhaVOycQFAJZKkkhjnU3Y3lAgD7Hr/UNDV1CLqmVZE 83bErnO/C8dIso1owLzo3fVNPtnMfall4FIS3ABEI30+mC355y39hy4oWyPdUNvI8TB+ eGjw== X-Gm-Message-State: AOJu0YzxS28pfvOmvCbsOB8rBA7hALAHHfiYCAdfIu++T83ahfNUNKY5 zXRpHX8qSfJOmfcN7QgqGtq7zGHo3Jfq73ooEHCfheJy36LP/+q1ujPI8tBu X-Received: by 2002:a17:90b:790:b0:29b:1969:d573 with SMTP id l16-20020a17090b079000b0029b1969d573mr4650773pjz.22.1709489382423; Sun, 03 Mar 2024 10:09:42 -0800 (PST) Received: from localhost.localdomain ([190.194.169.124]) by smtp.gmail.com with ESMTPSA id k9-20020a170902c40900b001db5ea825b2sm5511316plk.123.2024.03.03.10.09.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Mar 2024 10:09:41 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Mar 2024 15:09:24 -0300 Message-ID: <20240303180929.56930-6-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240303180929.56930-1-jamrial@gmail.com> References: <20240303180929.56930-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/8] avformat/mov: don't mark an item referenced by a grid as dependent if it's the primary item 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: Tlz73HaUB1IA If it's the primary item, then it's expected to be ready for presentation even outside of the grid it belongs to. Signed-off-by: James Almer --- libavformat/mov.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 7a09017020..f0e98f38b5 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -9443,7 +9443,8 @@ static int mov_parse_tiles(AVFormatContext *s) if (err < 0 && err != AVERROR(EEXIST)) return err; - st->disposition |= AV_DISPOSITION_DEPENDENT; + if (item->item_id != mov->primary_item_id) + st->disposition |= AV_DISPOSITION_DEPENDENT; break; } From patchwork Sun Mar 3 18:09:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 46730 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp2419504pzb; Sun, 3 Mar 2024 10:10:46 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUsrR/rB3HeYj0csWJT56wMS4q8v0FbANkYe8YGB1vAVVblr2YEX488XtwB0c/KQRKKpMcsAUscGpJptquyo3hT9FgKx1S2sDUx/Q== X-Google-Smtp-Source: AGHT+IFyq09NcRhvq6l9cy3wEONG9sI4SE/GM5gCrNwyuO2/abyh+8+fNeqzwAaXjG4Wf1zW/wM4 X-Received: by 2002:a17:907:9717:b0:a44:d812:39e5 with SMTP id jg23-20020a170907971700b00a44d81239e5mr2248208ejc.2.1709489445800; Sun, 03 Mar 2024 10:10:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709489445; cv=none; d=google.com; s=arc-20160816; b=jSbSQxJrb/ZsoZYPiSiUexDVdKLsyOv0f0xDBwml8hZQSJlQT9CVswjfDgCxl7L+Gp c2WeyhpToTt5kHGqEkS8RaNG2+iTZMVdoZupLE9CmjYWavh9lMZ5abdME2frEr7AQoOj QRKcVJLmZSv+m/68yHmC4rnQF2zBN5T3r45yJrZulgK5nGWppSJBhOW7unSNluRKSYyq g5Pxk842e7sE70EeSIv6FEPVD20fiMqnKn/7uR1n1Cw3prRrPWomqsIqi3FvIhSYjXhx D9mV88gjZDaFlR1lwi/tp6TWukPufpdMi1jyIA7EwbfLAyHwI675ybaWAfR8peua7kRA vUTw== 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=sFGrtXkQL/FloxOpKmsuFWUsbQ0vgZrHjii6k0KYZTY=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=GU8XGR5B3+E76GjbHjeh/sGRFlk/fC/olX0888wNlSXGG50zp8eqEU47utb2TtM/uh Rx/rZVNzXCuHTSQxIh+CWLKGitEH8z5g16K+Fqlh1XNW5m7CrNLxcPUrRDGeRAoFYgVl DXPirHj6YwrmnBMYYuP39dtM359L08byufe2hWi4NSiyO7uMho6xgIUk4Tr84OTO4+XS hyhuJjmOSUPH+YleoWzOtVpxPM7Sc7uC6MiexgUA9ysqSh8QTZJomIGt+U52j1lrAXrG U52+TnGhqu1WmRbLtoQTwaqAw0Np5PWm0QABWfEG2q3Y25rb0CXOHnFBzb1iKAmQlObY 6Akg==; 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=ZAFj7jEi; 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 h13-20020a170906260d00b00a4469b1cec8si2656166ejc.714.2024.03.03.10.10.45; Sun, 03 Mar 2024 10:10:45 -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=ZAFj7jEi; 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 B0A3E68D3D2; Sun, 3 Mar 2024 20:09:52 +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 2927F68D3BD for ; Sun, 3 Mar 2024 20:09:46 +0200 (EET) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1dc29f1956cso29299315ad.0 for ; Sun, 03 Mar 2024 10:09:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709489384; x=1710094184; 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=TA66sIX25mPHbOIZdyZ6A8U6BYIz3mC0NSIi8StB6Sw=; b=ZAFj7jEiXQYypS7ZylkABrLPpmVQ7H3x7kh4O5Hmd0pcI1ixZ+chy1R+sDX9IVOmUd WYd31zDs+h4ioqNFlXMW/Ax1iOnAGZcxcUeeuu6E0hvoURDAoGmD3EisGKU52XwcIdNG S5Be8QQSA3luK0BReqW3VENfYd1HXI2beD2NWkaoqolQP7qzkr2vUd0UbhYML6QCwHzW 62+Eod2Fv0Bpxx53FpCLU/YMhx5zhd8P3/TAo9MRbAs6oMtD7IUYZkPmwXcmvK2ZZsfC 0iccFaZ5B7MWo8R87H5exFmmtgcBWBHcLGDw54v37S1RCnZZSSm47aJ7wBQKu0OlruYi 7yPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709489384; x=1710094184; 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=TA66sIX25mPHbOIZdyZ6A8U6BYIz3mC0NSIi8StB6Sw=; b=EGEUXTbt4gSWmSYckyAGozn12bNVrpKlg1pcqpH8d+bZZXWsaLtHjxZYV175CHRWAj 8Axm97ZdRrKdLDldouB/Hrp/q4+7cm5MXja3yA6092y7CDXoAgCYy22UCeiVUCEyiwOA I3l7QMoApE5n70U7TvlL57FUWJiyuZ7ohKMAlbjq41ih8GySwLRBwy/74OIp1JD8m2H8 iAQ7NY+hxwlOIQHemCU0p/PRUdfakSDOBKfk+J3Bk8C9KU7vwRQ9Gh43A8zCva+syyXa 7TtcKbirosDX0mohYD85IDu+9iOh2oo+/ayedKnBodg1KCYtTlLjwfeoafECbkOasIzp vcHg== X-Gm-Message-State: AOJu0YzL1ZYhxlWlVog34bNRBWKBOvSpM0WKall/IKqT7eK05q7yD64a bvIzwnRarWXickijicdIw8LKg5zpgKxdCqGrQ4O8P9h2JjZdZEZk5gdbTe+K X-Received: by 2002:a17:902:6544:b0:1db:e494:4b5d with SMTP id d4-20020a170902654400b001dbe4944b5dmr5294899pln.16.1709489383986; Sun, 03 Mar 2024 10:09:43 -0800 (PST) Received: from localhost.localdomain ([190.194.169.124]) by smtp.gmail.com with ESMTPSA id k9-20020a170902c40900b001db5ea825b2sm5511316plk.123.2024.03.03.10.09.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Mar 2024 10:09:43 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Mar 2024 15:09:25 -0300 Message-ID: <20240303180929.56930-7-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240303180929.56930-1-jamrial@gmail.com> References: <20240303180929.56930-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 7/8] fate/mov: print stream group information for avif/heic tests 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: 4K4XOOa0qf99 Signed-off-by: James Almer --- tests/fate-run.sh | 13 ++ tests/fate/mov.mak | 12 +- .../ref/fate/mov-heic-demux-still-image-grid | 133 ++++++++++++++++-- .../ref/fate/mov-heic-demux-still-image-iovl | 81 +++++++++-- 4 files changed, 215 insertions(+), 24 deletions(-) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 7a7344e645..2de560354f 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -272,6 +272,19 @@ transcode(){ run ffprobe${PROGSUF}${EXECSUF} -bitexact $ffprobe_opts $tencfile || return } +stream_demux(){ + src_fmt=$1 + srcfile=$2 + src_opts=$3 + enc_opts=$4 + ffprobe_opts=$5 + tsrcfile=$(target_path $srcfile) + ffmpeg $DEC_OPTS -f $src_fmt $src_opts -i $tsrcfile $ENC_OPTS $FLAGS $enc_opts \ + -f framecrc - || return + test -z "$ffprobe_opts" || \ + run ffprobe${PROGSUF}${EXECSUF} -bitexact $ffprobe_opts $tsrcfile || return +} + stream_remux(){ src_fmt=$1 srcfile=$2 diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index de0e654532..9d0bdd0078 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -161,13 +161,17 @@ FATE_MOV_FFMPEG_SAMPLES-$(call FRAMEMD5, MOV, HEVC, HEVC_PARSER) \ += fate-mov-heic-demux-still-image-multiple-items fate-mov-heic-demux-still-image-multiple-items: CMD = framemd5 -i $(TARGET_SAMPLES)/heif-conformance/C003.heic -c:v copy -map 0 -FATE_MOV_FFMPEG_SAMPLES-$(call FRAMEMD5, MOV, HEVC, HEVC_PARSER) \ +# heic demuxing - still image with multiple items in a grid. +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 = framemd5 -i $(TARGET_SAMPLES)/heif-conformance/C007.heic -c:v copy -map 0:g:0 +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" -FATE_MOV_FFMPEG_SAMPLES-$(call FRAMEMD5, MOV, HEVC, HEVC_PARSER) \ +# 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 = framemd5 -i $(TARGET_SAMPLES)/heif-conformance/C015.heic -c:v copy -map 0:g:0 +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" # 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 6fde8fff28..b15ce91e1a 100644 --- a/tests/ref/fate/mov-heic-demux-still-image-grid +++ b/tests/ref/fate/mov-heic-demux-still-image-grid @@ -1,10 +1,7 @@ -#format: frame checksums -#version: 2 -#hash: MD5 -#extradata 0, 100, 5444bf01e03182c73ae957179d560f4d -#extradata 1, 100, 5444bf01e03182c73ae957179d560f4d -#extradata 2, 100, 5444bf01e03182c73ae957179d560f4d -#extradata 3, 100, 5444bf01e03182c73ae957179d560f4d +#extradata 0: 100, 0xee3e15e9 +#extradata 1: 100, 0xee3e15e9 +#extradata 2: 100, 0xee3e15e9 +#extradata 3: 100, 0xee3e15e9 #tb 0: 1/1 #media_type 0: video #codec_id 0: hevc @@ -25,8 +22,120 @@ #codec_id 3: hevc #dimensions 3: 1280x720 #sar 3: 0/1 -#stream#, dts, pts, duration, size, hash -0, 0, 0, 1, 111554, 03ceabfab39afd2e2e796b9362111f32 -1, 0, 0, 1, 111481, e5db978adbe4de7ee50fe73abc39fcfa -2, 0, 0, 1, 111451, 08700213113cadbb6628ecb8253c1c2a -3, 0, 0, 1, 111353, 5de942e14c848e5e22fad5d88fb13776 +0, 0, 0, 1, 111554, 0xa0679859 +1, 0, 0, 1, 111481, 0xc5386eaf +2, 0, 0, 1, 111451, 0xdbde88de +3, 0, 0, 1, 111353, 0x26435c8c +[STREAM_GROUP] +index=0 +id=0x3f1 +nb_streams=4 +type=Tile Grid +DISPOSITION:default=1 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +TAG:title=Derived image +[STREAM] +index=0 +id=0x3ea +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=1 +id=0x3ec +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=2 +id=0x3ee +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=3 +id=0x3f0 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[/STREAM_GROUP] diff --git a/tests/ref/fate/mov-heic-demux-still-image-iovl b/tests/ref/fate/mov-heic-demux-still-image-iovl index 753cef267a..113b251c00 100644 --- a/tests/ref/fate/mov-heic-demux-still-image-iovl +++ b/tests/ref/fate/mov-heic-demux-still-image-iovl @@ -1,8 +1,5 @@ -#format: frame checksums -#version: 2 -#hash: MD5 -#extradata 0, 100, 5444bf01e03182c73ae957179d560f4d -#extradata 1, 100, 5444bf01e03182c73ae957179d560f4d +#extradata 0: 100, 0xee3e15e9 +#extradata 1: 100, 0xee3e15e9 #tb 0: 1/1 #media_type 0: video #codec_id 0: hevc @@ -13,6 +10,74 @@ #codec_id 1: hevc #dimensions 1: 1280x720 #sar 1: 0/1 -#stream#, dts, pts, duration, size, hash -0, 0, 0, 1, 111554, 03ceabfab39afd2e2e796b9362111f32 -1, 0, 0, 1, 112393, daa001d351c088a5bc328459e2501c95 +0, 0, 0, 1, 111554, 0xa0679859 +1, 0, 0, 1, 112393, 0xdf2b9da0 +[STREAM_GROUP] +index=0 +id=0x3ee +nb_streams=2 +type=Tile Grid +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +TAG:title=Derived image +[STREAM] +index=0 +id=0x3ea +DISPOSITION:default=1 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=0 +DISPOSITION:still_image=0 +[/STREAM] +[STREAM] +index=1 +id=0x3ed +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +DISPOSITION:non_diegetic=0 +DISPOSITION:captions=0 +DISPOSITION:descriptions=0 +DISPOSITION:metadata=0 +DISPOSITION:dependent=1 +DISPOSITION:still_image=0 +[/STREAM] +[/STREAM_GROUP] From patchwork Sun Mar 3 18:09:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 46731 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp2419570pzb; Sun, 3 Mar 2024 10:10:54 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUlVy5k6h7TRotu8mOv7aLZUhZQMzOB0yZC4bwxmDHTAVm7nTSCigBLdfFv1EMG8bMEh0LlYilp1fo7Ftf8s4tZSiDyb7qOkjDfpA== X-Google-Smtp-Source: AGHT+IEvf5rNB0cHtzcL/avGW6ZU98tzpN/Lkc9zIwu6VhBrar98cM+PzvgyfJaBfmCtFbeB89o1 X-Received: by 2002:a05:6402:5189:b0:567:230a:de80 with SMTP id q9-20020a056402518900b00567230ade80mr2416611edd.0.1709489454123; Sun, 03 Mar 2024 10:10:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709489454; cv=none; d=google.com; s=arc-20160816; b=Ndn5A3iZFG1x/+iia97nOqe8RRZG9NktCMoC2d7eBPTNc5YjPk7BqvhD20b4443H30 Axwa3OmLy2Kf6cbqXqZjS+bjA20V6rHu0fz3SXs9UuxCZNoXyK0I+MY9p929kayEa0m5 lH4gn7XxS1BQ76/T/YHM5lGqUYnUQw0a8zxa7MZj7dCo8tEK1GBbqZlADxyy9f1bpe45 xRwAf9UvyQfNBmF4xDsqVHrkgH4LoLweBWSyy6IHvu+5Isntp6mJuwwkeoHiKeZiSYlo VuPkUOBlpu9lKpSSx2qwGN4azdrF4/C7JcrTQeZ1K6RomZIh4UNLgP3cTWZAhyrChL0l a40w== 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=DObScyhZsCpDmSE5rClh+FEJNl42pQGhObvCDiAp73w=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=g4po8Yt8Cbzli5V1xo0AQ7Dr/6jLfCiY2O6ajHIDYJX6JCPbvsUtGMwPFQa6rp90jp xrR6VrWGIw53VrQGrYYOz+fpe+UonETKZ4pwVnMndhy8AohfDzu8zUTHekxOxp8bU21x RpL6HqojrGWcJxTr0YVTNe1ilWhIX6zrihdRqpxdx0KAuFUlPzKYOkanQOlzbbTR2GHs 6mPoFS/1ZnKhahi5lwkKQgAC7hDjj/oudgmmeCBIgj7NDcbu+24IEcevZgRUtGBO06FU 05a1gyOdnlb7ihACJdfdVDFUshIWmwjv17MbKVtRL6Uq003Q9RErF7VJrcshNr2lXCX3 EQ7g==; 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=MvhW1HUh; 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 k5-20020a056402048500b005641883f18dsi3455128edv.315.2024.03.03.10.10.53; Sun, 03 Mar 2024 10:10:54 -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=MvhW1HUh; 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 CCC2668D3D8; Sun, 3 Mar 2024 20:09:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E460A68D3CB for ; Sun, 3 Mar 2024 20:09:47 +0200 (EET) Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1dcce5e84bcso29945775ad.1 for ; Sun, 03 Mar 2024 10:09:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709489385; x=1710094185; 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=BTeFHHhWHADdrBUHHWnsbdjHdZqTujteUZQwk+lzB04=; b=MvhW1HUhc+86tZMCcUm8TTbsYzJeD/FWsz/HkcHJeoDHSmO2ALVBbpHq48JqrnEN2I F8tgv5xZa8s1xkbk+GLeA/uuVXpgo6ZxswEnFExWehoqUYXYTDl0HzPk215MZeiVAahb DXsLLgg19mIGhUcusWRQNvWaH3uatqPmL02xI5bQ5ow2qspZR7tmPSRaDYWa838otdiY LB/s5n5h4IOvF2MK8NHF4EWAhPSDQkt5bpOj9s6xQxn01ey17Fx/vtOAh1eewWhYsIfp Tc/d7Jnao5PkByZBz0Q3Si2MPWbnZ47XV7xcAnFl7ftcRO2DjdSOsxdKoXFT3MDDnL3t XhcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709489385; x=1710094185; 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=BTeFHHhWHADdrBUHHWnsbdjHdZqTujteUZQwk+lzB04=; b=Gjr/FWBTStoEQrvhtcq2Lz7h+5UyLTsPwX+fcva/NxfWOS3JX3PzT6Oh+FoG+xJEVm gSuXud+sdwd65e+2j0vHh8dEPnH1quZkJP7JPkAuxrIMW9LRdoGaRIxQjcA8e2yMoDYj 9haSAkxNmkhyfUGkqiLT9jeajnzl39xRiOrp0GX8MI4MqX/OosnLdpjKR4wBqH6jxurT E98uBrZRjzWxcJsKM+PQEhWcj1jSV2u2Tsu81Q0wcOXueIoEXuEYVc8gKe0cFeHXFK4i zEXHg6ZbDbtInHY0yXO4NO8F/I7xiML/jGY03uVfXIxNzcl/4+zxj6zDAyVWFarvGwXb 4XRA== X-Gm-Message-State: AOJu0YycfdkI9EuyK1tRtsDwJ5Ou7+I2uiX4oDA9TnCUR/fA1ZDndIEV pZMA1dlwv72lIQdvvONrdp6D0IOhMmn+QN95q6AVASIDUixu6tBQcX2chMSV X-Received: by 2002:a17:903:1205:b0:1db:c390:1fdc with SMTP id l5-20020a170903120500b001dbc3901fdcmr7429694plh.1.1709489385367; Sun, 03 Mar 2024 10:09:45 -0800 (PST) Received: from localhost.localdomain ([190.194.169.124]) by smtp.gmail.com with ESMTPSA id k9-20020a170902c40900b001db5ea825b2sm5511316plk.123.2024.03.03.10.09.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Mar 2024 10:09:44 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Mar 2024 15:09:26 -0300 Message-ID: <20240303180929.56930-8-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240303180929.56930-1-jamrial@gmail.com> References: <20240303180929.56930-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 8/8] fate/mov: use framecrc for the remaining avif/heic tests 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: 6KKEFz9aEgXo Put them in sync with the other tests. Signed-off-by: James Almer --- tests/fate/mov.mak | 21 ++++++++++--------- .../fate/mov-avif-demux-still-image-1-item | 8 ++----- .../mov-avif-demux-still-image-multiple-items | 8 ++----- .../fate/mov-heic-demux-still-image-1-item | 8 ++----- .../mov-heic-demux-still-image-multiple-items | 12 ++++------- 5 files changed, 21 insertions(+), 36 deletions(-) diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index 9d0bdd0078..e5e372d062 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -143,23 +143,24 @@ fate-mov-mp4-ttml-stpp: CMD = transcode srt $(TARGET_SAMPLES)/sub/SubRip_capabil fate-mov-mp4-ttml-dfxp: CMD = transcode srt $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt mp4 "-map 0:s -c:s ttml -time_base:s 1:1000 -tag:s dfxp -strict unofficial" "-map 0 -c copy" "-of json -show_entries packet:stream=index,codec_type,codec_tag_string,codec_tag,codec_name,time_base,start_time,duration_ts,duration,nb_frames,nb_read_packets:stream_tags" # avif demuxing - still image with 1 item. -FATE_MOV_FFMPEG_SAMPLES-$(call FRAMEMD5, MOV, AV1, AV1_PARSER) \ +FATE_MOV_FFMPEG_SAMPLES-$(call FRAMECRC, MOV, AV1, AV1_PARSER) \ += fate-mov-avif-demux-still-image-1-item -fate-mov-avif-demux-still-image-1-item: CMD = framemd5 -c:v av1 -i $(TARGET_SAMPLES)/avif/still_image.avif -c:v copy +fate-mov-avif-demux-still-image-1-item: CMD = framecrc -c:v av1 -i $(TARGET_SAMPLES)/avif/still_image.avif -c:v copy -# avif demuxing - still image with multiple items. only the primary item will be -# parsed. -FATE_MOV_FFMPEG_SAMPLES-$(call FRAMEMD5, MOV, AV1, AV1_PARSER) \ +# avif demuxing - still image with multiple items. +FATE_MOV_FFMPEG_SAMPLES-$(call FRAMECRC, MOV, AV1, AV1_PARSER) \ += fate-mov-avif-demux-still-image-multiple-items -fate-mov-avif-demux-still-image-multiple-items: CMD = framemd5 -c:v av1 -i $(TARGET_SAMPLES)/avif/still_image_exif.avif -c:v copy +fate-mov-avif-demux-still-image-multiple-items: CMD = framecrc -c:v av1 -i $(TARGET_SAMPLES)/avif/still_image_exif.avif -c:v copy -FATE_MOV_FFMPEG_SAMPLES-$(call FRAMEMD5, MOV, HEVC, HEVC_PARSER) \ +# heic demuxing - still image with 1 item. +FATE_MOV_FFMPEG_SAMPLES-$(call FRAMECRC, MOV, HEVC, HEVC_PARSER) \ += fate-mov-heic-demux-still-image-1-item -fate-mov-heic-demux-still-image-1-item: CMD = framemd5 -i $(TARGET_SAMPLES)/heif-conformance/C002.heic -c:v copy +fate-mov-heic-demux-still-image-1-item: CMD = framecrc -i $(TARGET_SAMPLES)/heif-conformance/C002.heic -c:v copy -FATE_MOV_FFMPEG_SAMPLES-$(call FRAMEMD5, MOV, HEVC, HEVC_PARSER) \ +# heic demuxing - still image with multiple items. +FATE_MOV_FFMPEG_SAMPLES-$(call FRAMECRC, MOV, HEVC, HEVC_PARSER) \ += fate-mov-heic-demux-still-image-multiple-items -fate-mov-heic-demux-still-image-multiple-items: CMD = framemd5 -i $(TARGET_SAMPLES)/heif-conformance/C003.heic -c:v copy -map 0 +fate-mov-heic-demux-still-image-multiple-items: CMD = framecrc -i $(TARGET_SAMPLES)/heif-conformance/C003.heic -c:v copy -map 0 # heic demuxing - still image with multiple items in a grid. FATE_MOV_FFMPEG_FFPROBE_SAMPLES-$(call DEMMUX, MOV, FRAMECRC, HEVC_DECODER HEVC_PARSER) \ diff --git a/tests/ref/fate/mov-avif-demux-still-image-1-item b/tests/ref/fate/mov-avif-demux-still-image-1-item index 1ead593caa..0108877d10 100644 --- a/tests/ref/fate/mov-avif-demux-still-image-1-item +++ b/tests/ref/fate/mov-avif-demux-still-image-1-item @@ -1,11 +1,7 @@ -#format: frame checksums -#version: 2 -#hash: MD5 -#extradata 0, 4, b24b71499a8480fa4469bcbcba2140aa +#extradata 0: 4, 0x021c008d #tb 0: 1/1 #media_type 0: video #codec_id 0: av1 #dimensions 0: 352x288 #sar 0: 0/1 -#stream#, dts, pts, duration, size, hash -0, 0, 0, 1, 36265, 235b0c6e389c4084845981e08d60db04 +0, 0, 0, 1, 36265, 0x6c8c9941 diff --git a/tests/ref/fate/mov-avif-demux-still-image-multiple-items b/tests/ref/fate/mov-avif-demux-still-image-multiple-items index 1ead593caa..0108877d10 100644 --- a/tests/ref/fate/mov-avif-demux-still-image-multiple-items +++ b/tests/ref/fate/mov-avif-demux-still-image-multiple-items @@ -1,11 +1,7 @@ -#format: frame checksums -#version: 2 -#hash: MD5 -#extradata 0, 4, b24b71499a8480fa4469bcbcba2140aa +#extradata 0: 4, 0x021c008d #tb 0: 1/1 #media_type 0: video #codec_id 0: av1 #dimensions 0: 352x288 #sar 0: 0/1 -#stream#, dts, pts, duration, size, hash -0, 0, 0, 1, 36265, 235b0c6e389c4084845981e08d60db04 +0, 0, 0, 1, 36265, 0x6c8c9941 diff --git a/tests/ref/fate/mov-heic-demux-still-image-1-item b/tests/ref/fate/mov-heic-demux-still-image-1-item index c850c1ff9c..63ee5e492e 100644 --- a/tests/ref/fate/mov-heic-demux-still-image-1-item +++ b/tests/ref/fate/mov-heic-demux-still-image-1-item @@ -1,11 +1,7 @@ -#format: frame checksums -#version: 2 -#hash: MD5 -#extradata 0, 100, 5444bf01e03182c73ae957179d560f4d +#extradata 0: 100, 0xee3e15e9 #tb 0: 1/1 #media_type 0: video #codec_id 0: hevc #dimensions 0: 1280x720 #sar 0: 0/1 -#stream#, dts, pts, duration, size, hash -0, 0, 0, 1, 111554, 03ceabfab39afd2e2e796b9362111f32 +0, 0, 0, 1, 111554, 0xa0679859 diff --git a/tests/ref/fate/mov-heic-demux-still-image-multiple-items b/tests/ref/fate/mov-heic-demux-still-image-multiple-items index 753cef267a..3469e7ad75 100644 --- a/tests/ref/fate/mov-heic-demux-still-image-multiple-items +++ b/tests/ref/fate/mov-heic-demux-still-image-multiple-items @@ -1,8 +1,5 @@ -#format: frame checksums -#version: 2 -#hash: MD5 -#extradata 0, 100, 5444bf01e03182c73ae957179d560f4d -#extradata 1, 100, 5444bf01e03182c73ae957179d560f4d +#extradata 0: 100, 0xee3e15e9 +#extradata 1: 100, 0xee3e15e9 #tb 0: 1/1 #media_type 0: video #codec_id 0: hevc @@ -13,6 +10,5 @@ #codec_id 1: hevc #dimensions 1: 1280x720 #sar 1: 0/1 -#stream#, dts, pts, duration, size, hash -0, 0, 0, 1, 111554, 03ceabfab39afd2e2e796b9362111f32 -1, 0, 0, 1, 112393, daa001d351c088a5bc328459e2501c95 +0, 0, 0, 1, 111554, 0xa0679859 +1, 0, 0, 1, 112393, 0xdf2b9da0