From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 2EB7049C55 for ; Tue, 5 Mar 2024 15:21:41 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1F01868D06F; Tue, 5 Mar 2024 17:21:39 +0200 (EET) Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9278F68CBD2 for ; Tue, 5 Mar 2024 17:21:32 +0200 (EET) Received: by mail-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-55a179f5fa1so8529494a12.0 for ; Tue, 05 Mar 2024 07:21:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709652091; x=1710256891; darn=ffmpeg.org; h=user-agent:in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:to:from:date:from:to:cc:subject :date:message-id:reply-to; bh=Bc5UJBOWJDR1AAqI8O1UrAxTbEQqn4D3UsWDvpGfFM0=; b=jaxmOCTgDwu6zDC9WrG6X0dHK7VGCmxSCy0Ew+KD65vs089rvFP7POTmo0U43ue2KZ 2+09DnpkfPt/vbFxQwjbqxYF966vqYhBRyKFougpEdfwqKSAwzxmfLvcW6pT1FQz/Hav mA3RwFGinAfzJBHN9jqdrDfJFDS7OVQ8tx7PQqisWtdBOSIVk514nKDBVTtrIE3kizfP UsOTKxeqzzSPjTfWNvdG3Ph6R0t1b2FP91Xy55gSYEmXENHLKsJhEe6s3hnWf+b2BwJZ xqaa+2TVoe9PZY8vfoxpO5+C9K1f5Zk6p4vIkfl3kSh2NWGgekVnG4D9hwW2NvX3jMC5 CzYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709652091; x=1710256891; h=user-agent:in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:to:from:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Bc5UJBOWJDR1AAqI8O1UrAxTbEQqn4D3UsWDvpGfFM0=; b=h5Oop+0z+BQiRtWJLgkBzJi0RvxNqjpGwAPeA9TuDO3n1bIxiuquKw7jkqNjEBwogX opicJfVJl5urfmmEyrNOyxy6i9VD7XplYSO8mGEJDqcvsCsH5ZUYrol6I7cosOxweIxn V0yjIIP07VpENzdUmKaqa/LI6E/7ywfykpxbxhLnSWRr/C9rhRNvrSIRtME0RlBTycrs ZGfvs9EVFE8LiM1L5ComacnhR3DYxYW8KZxunTfs2iilLcFCmQqYPca4lBJqKd47ZFc9 F7AtKzqaxVAKhMt1d/etP2EC70oasmtYNEJvUOLXx3TXCVVZP1EoAf8DTDXqIw2hMxsJ DLSA== X-Gm-Message-State: AOJu0YzdnWm5K5BmVyDitecvQ+a0nCDpaXOfMkmCd21cRlnDjPSuAQf6 2GJZoEbwGn+eiv1KisCTswHyIfcPsuXJcv6MqvRILMhNEyiNkYC09tig+3DM X-Google-Smtp-Source: AGHT+IEOCbQPL4eGy3g34kpUMDBgHsy8BY1sE48Gma4UHqUVR4cb5Tdh7Wtt4nCmc5LLqm5fERwdIQ== X-Received: by 2002:a17:907:20b9:b0:a3d:4ed8:f5bf with SMTP id pw25-20020a17090720b900b00a3d4ed8f5bfmr7299969ejb.2.1709652090796; Tue, 05 Mar 2024 07:21:30 -0800 (PST) Received: from mariano ([188.210.239.69]) by smtp.gmail.com with ESMTPSA id sa24-20020a1709076d1800b00a440019ac45sm6114027ejc.69.2024.03.05.07.21.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Mar 2024 07:21:30 -0800 (PST) Received: by mariano (Postfix, from userid 1000) id 5FEA2BFCDC; Tue, 5 Mar 2024 16:21:29 +0100 (CET) Date: Tue, 5 Mar 2024 16:21:29 +0100 From: Stefano Sabatini To: FFmpeg development discussions and patches Message-ID: Mail-Followup-To: FFmpeg development discussions and patches References: <20240305000033.10379-1-jamrial@gmail.com> <20240305000033.10379-6-jamrial@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20240305000033.10379-6-jamrial@gmail.com> User-Agent: Mutt/2.1.4 (2021-12-11) Subject: Re: [FFmpeg-devel] [PATCH 6/9] fftools/ffprobe: export Tile Grid Stream Group parameters X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On date Monday 2024-03-04 21:00:26 -0300, James Almer wrote: > Signed-off-by: James Almer > --- > fftools/ffprobe.c | 41 ++++++++++++++++++++++++++++++++++++----- > 1 file changed, 36 insertions(+), 5 deletions(-) > > diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c > index ff05c4c1db..e736023bcd 100644 > --- a/fftools/ffprobe.c > +++ b/fftools/ffprobe.c > @@ -209,6 +209,10 @@ typedef enum { > SECTION_ID_STREAM_GROUP_STREAM_DISPOSITION, > SECTION_ID_STREAM_GROUP_STREAM_TAGS, > SECTION_ID_STREAM_GROUP, > + SECTION_ID_STREAM_GROUP_COMPONENTS, > + SECTION_ID_STREAM_GROUP_COMPONENT, > + SECTION_ID_STREAM_GROUP_PIECES, > + SECTION_ID_STREAM_GROUP_PIECE, > SECTION_ID_STREAM_GROUP_STREAMS, > SECTION_ID_STREAM_GROUP_STREAM, > SECTION_ID_STREAM_GROUP_DISPOSITION, > @@ -282,8 +286,8 @@ static struct section sections[] = { > [SECTION_ID_FRAME_SIDE_DATA_TIMECODE] = { SECTION_ID_FRAME_SIDE_DATA_TIMECODE, "timecode", 0, { -1 } }, > [SECTION_ID_FRAME_SIDE_DATA_COMPONENT_LIST] = { SECTION_ID_FRAME_SIDE_DATA_COMPONENT_LIST, "components", SECTION_FLAG_IS_ARRAY, { SECTION_ID_FRAME_SIDE_DATA_COMPONENT, -1 }, .element_name = "component", .unique_name = "frame_side_data_components" }, > [SECTION_ID_FRAME_SIDE_DATA_COMPONENT] = { SECTION_ID_FRAME_SIDE_DATA_COMPONENT, "component", SECTION_FLAG_HAS_VARIABLE_FIELDS|SECTION_FLAG_HAS_TYPE, { SECTION_ID_FRAME_SIDE_DATA_PIECE_LIST, -1 }, .unique_name = "frame_side_data_component", .element_name = "component_entry", .get_type = get_raw_string_type }, > - [SECTION_ID_FRAME_SIDE_DATA_PIECE_LIST] = { SECTION_ID_FRAME_SIDE_DATA_PIECE_LIST, "pieces", SECTION_FLAG_IS_ARRAY, { SECTION_ID_FRAME_SIDE_DATA_PIECE, -1 }, .element_name = "piece" }, > - [SECTION_ID_FRAME_SIDE_DATA_PIECE] = { SECTION_ID_FRAME_SIDE_DATA_PIECE, "piece", SECTION_FLAG_HAS_VARIABLE_FIELDS|SECTION_FLAG_HAS_TYPE, { -1 }, .element_name = "piece_entry", .get_type = get_raw_string_type }, > + [SECTION_ID_FRAME_SIDE_DATA_PIECE_LIST] = { SECTION_ID_FRAME_SIDE_DATA_PIECE_LIST, "pieces", SECTION_FLAG_IS_ARRAY, { SECTION_ID_FRAME_SIDE_DATA_PIECE, -1 }, .element_name = "piece", .unique_name = "frame_side_data_pieces" }, > + [SECTION_ID_FRAME_SIDE_DATA_PIECE] = { SECTION_ID_FRAME_SIDE_DATA_PIECE, "piece", SECTION_FLAG_HAS_VARIABLE_FIELDS|SECTION_FLAG_HAS_TYPE, { -1 }, .element_name = "piece_entry", .unique_name = "frame_side_data_piece", .get_type = get_raw_string_type }, > [SECTION_ID_FRAME_LOGS] = { SECTION_ID_FRAME_LOGS, "logs", SECTION_FLAG_IS_ARRAY, { SECTION_ID_FRAME_LOG, -1 } }, > [SECTION_ID_FRAME_LOG] = { SECTION_ID_FRAME_LOG, "log", 0, { -1 }, }, > [SECTION_ID_LIBRARY_VERSIONS] = { SECTION_ID_LIBRARY_VERSIONS, "library_versions", SECTION_FLAG_IS_ARRAY, { SECTION_ID_LIBRARY_VERSION, -1 } }, > @@ -309,7 +313,11 @@ static struct section sections[] = { > [SECTION_ID_PROGRAMS] = { SECTION_ID_PROGRAMS, "programs", SECTION_FLAG_IS_ARRAY, { SECTION_ID_PROGRAM, -1 } }, > [SECTION_ID_STREAM_GROUP_STREAM_DISPOSITION] = { SECTION_ID_STREAM_GROUP_STREAM_DISPOSITION, "disposition", 0, { -1 }, .unique_name = "stream_group_stream_disposition" }, > [SECTION_ID_STREAM_GROUP_STREAM_TAGS] = { SECTION_ID_STREAM_GROUP_STREAM_TAGS, "tags", SECTION_FLAG_HAS_VARIABLE_FIELDS, { -1 }, .element_name = "tag", .unique_name = "stream_group_stream_tags" }, > - [SECTION_ID_STREAM_GROUP] = { SECTION_ID_STREAM_GROUP, "stream_group", SECTION_FLAG_HAS_TYPE, { SECTION_ID_STREAM_GROUP_TAGS, SECTION_ID_STREAM_GROUP_DISPOSITION, SECTION_ID_STREAM_GROUP_STREAMS, -1 }, .get_type = get_stream_group_type }, > + [SECTION_ID_STREAM_GROUP] = { SECTION_ID_STREAM_GROUP, "stream_group", SECTION_FLAG_HAS_TYPE, { SECTION_ID_STREAM_GROUP_TAGS, SECTION_ID_STREAM_GROUP_DISPOSITION, SECTION_ID_STREAM_GROUP_COMPONENTS, SECTION_ID_STREAM_GROUP_STREAMS, -1 }, .get_type = get_stream_group_type }, > + [SECTION_ID_STREAM_GROUP_COMPONENTS] = { SECTION_ID_STREAM_GROUP_COMPONENTS, "components", SECTION_FLAG_IS_ARRAY, { SECTION_ID_STREAM_GROUP_COMPONENT, -1 }, .element_name = "component", .unique_name = "stream_group_components" }, > + [SECTION_ID_STREAM_GROUP_COMPONENT] = { SECTION_ID_STREAM_GROUP_COMPONENT, "component", SECTION_FLAG_HAS_VARIABLE_FIELDS|SECTION_FLAG_HAS_TYPE, { SECTION_ID_STREAM_GROUP_PIECES, -1 }, .unique_name = "stream_group_component", .element_name = "component_entry", .get_type = get_raw_string_type }, > + [SECTION_ID_STREAM_GROUP_PIECES] = { SECTION_ID_STREAM_GROUP_PIECES, "pieces", SECTION_FLAG_IS_ARRAY, { SECTION_ID_STREAM_GROUP_PIECE, -1 }, .element_name = "piece", .unique_name = "stream_group_pieces" }, > + [SECTION_ID_STREAM_GROUP_PIECE] = { SECTION_ID_STREAM_GROUP_PIECE, "piece", SECTION_FLAG_HAS_VARIABLE_FIELDS|SECTION_FLAG_HAS_TYPE, { -1 }, .element_name = "piece_entry", .unique_name = "stream_group_piece", .get_type = get_raw_string_type }, > [SECTION_ID_STREAM_GROUP_STREAMS] = { SECTION_ID_STREAM_GROUP_STREAMS, "streams", SECTION_FLAG_IS_ARRAY, { SECTION_ID_STREAM_GROUP_STREAM, -1 }, .unique_name = "stream_group_streams" }, > [SECTION_ID_STREAM_GROUP_STREAM] = { SECTION_ID_STREAM_GROUP_STREAM, "stream", 0, { SECTION_ID_STREAM_GROUP_STREAM_DISPOSITION, SECTION_ID_STREAM_GROUP_STREAM_TAGS, -1 }, .unique_name = "stream_group_stream" }, > [SECTION_ID_STREAM_GROUP_DISPOSITION] = { SECTION_ID_STREAM_GROUP_DISPOSITION, "disposition", 0, { -1 }, .unique_name = "stream_group_disposition" }, > @@ -3388,9 +3396,32 @@ static int show_programs(WriterContext *w, InputFile *ifile) > static void print_stream_group_params(WriterContext *w, AVStreamGroup *stg) > { > const char *unknown = "unknown"; > - if (stg->type != AV_STREAM_GROUP_PARAMS_NONE) > + if (stg->type != AV_STREAM_GROUP_PARAMS_NONE) { > print_str("type", av_x_if_null(avformat_stream_group_name(stg->type), unknown)); nit: you can avoid the indent if you check the NONE case and return immediately in that case > - else > + if (stg->type == AV_STREAM_GROUP_PARAMS_TILE_GRID) { > + AVStreamGroupTileGrid *tile_grid = stg->params.tile_grid; > + writer_print_section_header(w, NULL, SECTION_ID_STREAM_GROUP_COMPONENTS); > + writer_print_section_header(w, "parameters", SECTION_ID_STREAM_GROUP_COMPONENT); > + print_int("nb_tiles", tile_grid->nb_tiles); > + print_int("coded_width", tile_grid->coded_width); > + print_int("coded_height", tile_grid->coded_height); > + print_int("horizontal_offset", tile_grid->horizontal_offset); > + print_int("vertical_offset", tile_grid->vertical_offset); > + print_int("width", tile_grid->width); > + print_int("height", tile_grid->height); > + writer_print_section_header(w, NULL, SECTION_ID_STREAM_GROUP_PIECES); > + for (int i = 0; i < tile_grid->nb_tiles; i++) { > + writer_print_section_header(w, "tile_offset", SECTION_ID_STREAM_GROUP_PIECE); > + print_int("stream_index", tile_grid->offsets[i].idx); > + print_int("tile_horizontal_offset", tile_grid->offsets[i].horizontal); > + print_int("tile_vertical_offset", tile_grid->offsets[i].vertical); > + writer_print_section_footer(w); > + } > + writer_print_section_footer(w); > + writer_print_section_footer(w); > + writer_print_section_footer(w); > + } > + } else > print_str_opt("type", unknown); > } LGTM, thanks. _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".