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 8D4C74914D for ; Tue, 5 Mar 2024 14:38:20 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A6E7268CFCE; Tue, 5 Mar 2024 16:38:16 +0200 (EET) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1DC4868C93A for ; Tue, 5 Mar 2024 16:38:11 +0200 (EET) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1dbae7b8ff2so27368245ad.3 for ; Tue, 05 Mar 2024 06:38:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709649488; x=1710254288; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=Fz5WRucB4KTe7m0Zlg+oyqg9IlpYt8TXR53rqll9iX0=; b=ZPUm/d9G2Qq1wG6RSfBQBw3CnL9puzPRA6G+jK+jY/aDfXZHIql4HXggsSngGL69fk 1TauCF7IkI7FCp2MwpGsoI69NATzsPYyu8rB3/oXVAb3O46Ob0q8fCLcwDFM0RRkKUDo zUz2Web1ZbYVQWB6SKldIlMZ5LAMau4g73LHbc/VBAapm4QQkUkdtEMzWaWpcdFtzJrw KDVaMJQGwgrbdRpcbtxjpratFlo59vujvm10t3h0sma4W5rW+FbrmfbopErHM7/xP/K5 i9r3TsCh3v7g0Dv57v+mFeU0NZ5giE/oiv9bdfCPwm0QHE6QL21IkGjhn7644Z9XfZqg eN/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709649488; x=1710254288; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Fz5WRucB4KTe7m0Zlg+oyqg9IlpYt8TXR53rqll9iX0=; b=eu9plwjPK7g5jcFnB9VNqLhBGHF66Usm+aflIa26eoIMKe8paIVjpL5b+ygyg70OFS +ZDJZ0gSvEn39svoHVmxmNbQYComFnWyERjjaZCwm6H1+SkxAAoVqdVT5kdRNbeHXcp0 YKRh02cxXwsOB+NtqrNQySIZ7x/2IE2Ph1KHuLuK7sEfmZ5vrdXYgUPg25VqMtXDqVaz A9DRWvuuNNREjEWcaE3NzsRKniLH2GKa/aAENTS+w9fXw8MK5AwkM4izxXlO/hfflMPp /xXB9RuoqLUpKDjxFHWYq8jyWYHjSjK+Yb7rrFSP50eb2HhYOzpRlk30oAOIm+S27rwU 8Mng== X-Gm-Message-State: AOJu0Yw7ljPa+IYLyIuBBXvrknRLbe9BKIqYfCFJ1oxySQAqhNWTw4U+ 3zkYW3rAiygQCRR/Z9ddVvwIP+5vts0FA06Wg5Bc2ISDjIIoiqEgi/sW70RW X-Google-Smtp-Source: AGHT+IH6ACsAiUvACsO3CP7uZL9tuRmBkqCa0yvqErBhbDpOrJiefkIp9hoEVo+u70tpAtiYsxdAyQ== X-Received: by 2002:a17:90a:f189:b0:299:fea4:1ebf with SMTP id bv9-20020a17090af18900b00299fea41ebfmr9113135pjb.37.1709649488262; Tue, 05 Mar 2024 06:38:08 -0800 (PST) Received: from [192.168.0.14] ([190.194.169.124]) by smtp.gmail.com with ESMTPSA id gx15-20020a17090b124f00b00298ca46547fsm9607253pjb.36.2024.03.05.06.38.07 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 05 Mar 2024 06:38:07 -0800 (PST) Message-ID: <96729593-7417-46f8-8b3c-f7ea646bb5b2@gmail.com> Date: Tue, 5 Mar 2024 11:38:20 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20240304185646.9755-1-jamrial@gmail.com> From: James Almer In-Reply-To: Subject: Re: [FFmpeg-devel] [PATCH] fftools/ffprobe: fix printing side data components and pieces 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 3/5/2024 11:34 AM, Stefano Sabatini wrote: > On date Monday 2024-03-04 15:56:46 -0300, James Almer wrote: >> Components and pieces are side data specific fields and there's a variable >> amount of them. >> They also need to be identified in some form, so print a type too. >> >> Signed-off-by: James Almer >> --- >> You can see the difference with >> >> ffprobe -show_frames -of compact $fate_samples/mov/dovi-p7.mp4 >> ffprobe -show_frames -of xml $fate_samples/mov/dovi-p7.mp4 >> >> fftools/ffprobe.c | 33 +++++++++++++++++++++++++++------ >> 1 file changed, 27 insertions(+), 6 deletions(-) >> >> diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c >> index ac6b92f5d6..d3f27987a0 100644 >> --- a/fftools/ffprobe.c >> +++ b/fftools/ffprobe.c >> @@ -244,6 +244,11 @@ static const char *get_frame_side_data_type(const void *data) >> return av_x_if_null(av_frame_side_data_name(sd->type), "unknown"); >> } >> >> +static const char *get_raw_string_type(const void *data) >> +{ >> + return data; >> +} >> + >> static struct section sections[] = { >> [SECTION_ID_CHAPTERS] = { SECTION_ID_CHAPTERS, "chapters", SECTION_FLAG_IS_ARRAY, { SECTION_ID_CHAPTER, -1 } }, >> [SECTION_ID_CHAPTER] = { SECTION_ID_CHAPTER, "chapter", 0, { SECTION_ID_CHAPTER_TAGS, -1 } }, >> @@ -258,10 +263,10 @@ static struct section sections[] = { >> [SECTION_ID_FRAME_SIDE_DATA] = { SECTION_ID_FRAME_SIDE_DATA, "side_data", SECTION_FLAG_HAS_VARIABLE_FIELDS|SECTION_FLAG_HAS_TYPE, { SECTION_ID_FRAME_SIDE_DATA_TIMECODE_LIST, SECTION_ID_FRAME_SIDE_DATA_COMPONENT_LIST, -1 }, .unique_name = "frame_side_data", .element_name = "side_datum", .get_type = get_frame_side_data_type }, >> [SECTION_ID_FRAME_SIDE_DATA_TIMECODE_LIST] = { SECTION_ID_FRAME_SIDE_DATA_TIMECODE_LIST, "timecodes", SECTION_FLAG_IS_ARRAY, { SECTION_ID_FRAME_SIDE_DATA_TIMECODE, -1 } }, >> [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 } }, >> - [SECTION_ID_FRAME_SIDE_DATA_COMPONENT] = { SECTION_ID_FRAME_SIDE_DATA_COMPONENT, "component", 0, { SECTION_ID_FRAME_SIDE_DATA_PIECE_LIST, -1 } }, >> - [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 } }, >> - [SECTION_ID_FRAME_SIDE_DATA_PIECE] = { SECTION_ID_FRAME_SIDE_DATA_PIECE, "piece", 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 }, .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 }, .unique_name = "frame_side_data_component_pieces" }, >> + [SECTION_ID_FRAME_SIDE_DATA_PIECE] = { SECTION_ID_FRAME_SIDE_DATA_PIECE, "piece", SECTION_FLAG_HAS_VARIABLE_FIELDS|SECTION_FLAG_HAS_TYPE, { -1 }, .unique_name = "frame_side_data_component_piece", .element_name = "piece_entry", .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 } }, >> @@ -2063,14 +2068,30 @@ static void print_dovi_metadata(WriterContext *w, const AVDOVIMetadata *dovi) >> >> for (int c = 0; c < 3; c++) { >> const AVDOVIReshapingCurve *curve = &mapping->curves[c]; >> - writer_print_section_header(w, NULL, SECTION_ID_FRAME_SIDE_DATA_COMPONENT); >> + writer_print_section_header(w, "Reshaping curve", SECTION_ID_FRAME_SIDE_DATA_COMPONENT); >> >> print_list_fmt("pivots", "%"PRIu16, curve->num_pivots, 1, curve->pivots[idx]); >> >> writer_print_section_header(w, NULL, SECTION_ID_FRAME_SIDE_DATA_PIECE_LIST); >> for (int i = 0; i < curve->num_pivots - 1; i++) { >> + AVBPrint piece_buf; >> + >> + av_bprint_init(&piece_buf, 1, AV_BPRINT_SIZE_UNLIMITED); >> + switch (curve->mapping_idc[i]) { >> + case AV_DOVI_MAPPING_POLYNOMIAL: >> + av_bprintf(&piece_buf, "Polynomial"); >> + break; >> + case AV_DOVI_MAPPING_MMR: >> + av_bprintf(&piece_buf, "MMR"); >> + break; >> + default: >> + av_bprintf(&piece_buf, "Unknown"); >> + break; >> + } >> + av_bprintf(&piece_buf, " mapping"); >> >> - writer_print_section_header(w, NULL, SECTION_ID_FRAME_SIDE_DATA_PIECE); >> + writer_print_section_header(w, piece_buf.str, SECTION_ID_FRAME_SIDE_DATA_PIECE); >> + av_bprint_finalize(&piece_buf, NULL); > > LGTM. Not clear if this is fixing a regression or if the format (at > least for XML/compact) was always wrong. I'm on the fence on this. Try removing the SECTION_FLAG_HAS_TYPE from SECTION_ID_FRAME_SIDE_DATA_COMPONENT and SECTION_ID_FRAME_SIDE_DATA_PIECE and the output is broken again for the compact output. So at least compact_print_section_header() may be faulty. I did not investigate much because I'm not familiar with the code. In any case, this change is needed because of the SECTION_FLAG_HAS_VARIABLE_FIELDS addition for side data where the printed fields are not a fixed amount. _______________________________________________ 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".