From patchwork Mon Mar 4 18:56:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 46792 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d808:b0:19e:cdac:8cce with SMTP id iv8csp183520pzb; Mon, 4 Mar 2024 10:57:02 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUC67pdPouvsFm80eH55VTVK9KydJaTTBVlust1DG1ajfQn63ToQ4VJzU4QMCNTmQvplf2zULHmrYTju/XWY+d3gd27PIYWjh3BNQ== X-Google-Smtp-Source: AGHT+IFBrYIE7Kf5/ETZD1aNR+S+VmQ02aZexZpI/5DDdEKDH/sDLqaO4uFIb17DXU6wy8o6hdJ8 X-Received: by 2002:aa7:c742:0:b0:567:19df:28f with SMTP id c2-20020aa7c742000000b0056719df028fmr3950306eds.18.1709578622471; Mon, 04 Mar 2024 10:57:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709578622; cv=none; d=google.com; s=arc-20160816; b=lbjaaugvw0Xd71Mx/K4aBNrrhev2FDdPJIb2ENmoPxUJ/MARO1fOnP5pEjZYhgYly5 SDqD9k04rAxsPYfLGXBULlQzk+8o3NpcCojedoyvNRCNRn/fu0yHxwZBAkKg+NHqjQof NG9QomjeXaHsoVbJnFebZri9rWQwj0MbfHN+M4WugxrWAzJ4cBp/EdYpgxN4wshvEt3e 9ncHJPOMvUXKz+9AusUc5XZ69S/2mCkN3+wYfoj8NulddgazZsY4XhoQRiaeguJKXwYU hv80sEDVLgUcOMpw2Er94zw8/AIVmqdd+vzotI4C3hX4v7a0uzJBAGaOsGUHk1X2HFLV gwFw== 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=BUtOApyt6n/H1Au2eHdH5OmYBzjzhwMVDMvwqcikEQk=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=wIcoN/zimYJcJIYf0Vk8pmWwh5TQ25w23pWpVCk64ptykUAw3w9ayyyjFo4DCEO5U2 xOMYfzGJLMbjZ9TfF/kZSZKanjuj/IThHLoKn0YkT1ASHodEhfyE0lZYNiAYg/qQuAl6 WSt9vK9iKCap9g1pTV8c16aHM2fEwS7VfTRZ07SpXJV6eAoJVkEgG/i0Tk0F3os8ES0+ T06GAYIsp0xZOmYSaBKpPZ3b1tj/zZus54bLOv7+iVF71JzEUWFLT9CMCLU2X0TCWqSq iyauqvqsbZ0hMchZmZgNit8+8fjQJLZJ0h+r4IrVpzCvQZinrKQk+bCdeCgNE0tgQ+OY WI/g==; 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=gliJhjKE; 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 dy21-20020a05640231f500b005660aa17d6asi4153168edb.492.2024.03.04.10.57.01; Mon, 04 Mar 2024 10:57:02 -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=gliJhjKE; 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 79C0068D489; Mon, 4 Mar 2024 20:56:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C0F4F68D47C for ; Mon, 4 Mar 2024 20:56:51 +0200 (EET) Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-29a2d0f69a6so3446394a91.3 for ; Mon, 04 Mar 2024 10:56:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709578609; x=1710183409; 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=jBi0lA4VkBHXLEBbRfiQJZrGx4jOXCgrgsxee5v4OVY=; b=gliJhjKEbjPZjBxZm/CEhDpUKrYNO/xF9X/kW/fuP+jPQsPA/Z4eBUeGUejhWrrBr/ 1G+cDAdFZpBUK/Z8UQxfickI8Fp8jWy+bQUoKa1cU4oRe7BT1ook9EJ38aFuDSbR7PQn kKqxa8STL6dJSATkTXdAbYgH2kL9kjWIN6hy5oIzp3hQ5n3hAG92FrYCuIEPm35ehaq3 XQ87VR7RU22UWeFEWQPoV0FSomIVa9F9dRB0cM1ihO5C7kFU4L1ey97Ww/z2tON12WEH YjQsC8I/hb/HEJCYRWJA6M6mzV1wxnfZVorXahPRjntsJu4X1laDyzA7b8VcL6MYx6if xAxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709578609; x=1710183409; 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=jBi0lA4VkBHXLEBbRfiQJZrGx4jOXCgrgsxee5v4OVY=; b=M3VLZJa7q00cPjBBsaYeZagWmZjo6iBVpXANPdxuJYrDoof3cdFzvhSB4DicShi6P0 3ZBobhv1SKE8awsDORrnUv/n2fPN5+A9eFxCSjhzOb4qiXSQogs2Oj8GRBMtj67tnV8X BHgMpKy18TIHRCwGVsdnoe1uIZTJitaz5A8R1lou5EuuDN1Sl4X1eZ1eirB5svDWKQsx EpY2fOiRphiixmDffJWOAtzQeW8VcXPSk5oPPH8Y6+b+TP8iPtfNawMgyYF64yrh4/o3 rd8EM8fWnYWpsSKeg4vw4G/nNfUaZ3R+VzDz01I5pvVNTOyUB4e8QG0/j+08KkXnQDaC I5iw== X-Gm-Message-State: AOJu0YzOq5t5OibHz0WoAmHWlAJknZkvhs+J/gjPGJHXaXS0m99K3EVT vpWcxo0bDqYnMpUomtDELvdY7cC4R6u0A5cN6S+EHkNEOAkdp/FMEcs0ovq7 X-Received: by 2002:a17:90a:fa96:b0:299:6018:482f with SMTP id cu22-20020a17090afa9600b002996018482fmr8005750pjb.48.1709578609211; Mon, 04 Mar 2024 10:56:49 -0800 (PST) Received: from localhost.localdomain ([190.194.169.124]) by smtp.gmail.com with ESMTPSA id sh14-20020a17090b524e00b0029a7951c4a3sm10528503pjb.41.2024.03.04.10.56.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 10:56:48 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Mar 2024 15:56:46 -0300 Message-ID: <20240304185646.9755-1-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Subject: [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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: TPltPBHU1axR 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); print_int("mapping_idc", curve->mapping_idc[i]); switch (curve->mapping_idc[i]) { case AV_DOVI_MAPPING_POLYNOMIAL: