From patchwork Tue Mar 5 00:00: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: 46795 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3944:b0:19e:cdac:8cce with SMTP id ac4csp82766pzc; Mon, 4 Mar 2024 16:01:31 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVu0Zx3ghb9z8SYunGC0Kw52aipQAPhKXMIL3oZnRHQGP6Mxi4NXxbcq5ABtxzDO3TJMJUOgToVC6iSnbfe2VLS7LOsZp2VHal0DA== X-Google-Smtp-Source: AGHT+IHKzaaCUn5ssV93oLvAoERgYFd/HSOL2U65QQDnwLnkohgfvnk55WQjwQ+kV997IQVEIkik X-Received: by 2002:a05:6402:2027:b0:565:e4b7:e784 with SMTP id ay7-20020a056402202700b00565e4b7e784mr6007893edb.40.1709596891451; Mon, 04 Mar 2024 16:01:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709596891; cv=none; d=google.com; s=arc-20160816; b=biiGVrYjvdwZd9m9IEnKT87DnH5hMhwU1ZAIyUp0S1ooFpk0qpLXW9eki/MEghodxv NQ1OHgqQZUKmtjU2/R9Wk2ATPWDWxCE56Y8FLtnU+P+8+Hny4P9UODEz/tVK+TS++4rN 7SSYwCyo7YJDS6Vm659tFpha6N42jaoKVX9keovcmk2ggx3cWnpzQiZpms7U/HdM6u/C 1IVOz6dXDytkSz+SO/7ERLEEM6ERS/NHkFMjUeWKwGaTc7+QbHbmhuBPMsKeolBVvR70 Qjai+Ao5RS9SBODdColp6vY7dw4iL/2J8/1/ZHTVI/uYEbqOzGMJVNaTX70YjpO5fguN Nv7w== 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=YyUVqTqT2fOC8X81HLFfgmIGBHygHmMeqJAY/14+Uqg=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=l5fe4Vs+5wNY+ucf94XCvt2NmagHKkMSCZpKkNFZdOlfeeBqkKKJR1ypKS1tR72Dfi VjFSxWV9My+cu2JmIuZSARgoP2nYAgC30TwO98j6mq9LT0mNxzsByi4O9VbLQSjms7zf hsrBG3D8QCxsQYU32DYNxQey3gdv9/1QPz68ONmy27RZQRbAGijPKx/VWjBy5FGoWPXI SW6qxofPDAe2pWxxkHLw3WHnkOuB05cIePkdZJ9MM/3tJWiuGKJnf55CTCWJwmCZFvK0 0CFWpWpZY9TjBTlUtEex0WmlUb0+R3wMGoqMHHMFYW7Nh0Qbq3mW+Xz9+XrdF/wp5OZN RQvA==; 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=fdMCOcNu; 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 b4-20020a509f04000000b00565fad3832asi4373213edf.574.2024.03.04.16.01.08; Mon, 04 Mar 2024 16:01:31 -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=fdMCOcNu; 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 CBADC68D4C8; Tue, 5 Mar 2024 02:00:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 71FE968D476 for ; Tue, 5 Mar 2024 02:00:45 +0200 (EET) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1dc49b00bdbso45804955ad.3 for ; Mon, 04 Mar 2024 16:00:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709596842; x=1710201642; 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=Nn9ajW+DbwTCSPNpe32gdyhs3Z/vcyEeHgx+0tgRH1s=; b=fdMCOcNuZwmghAQ2/21NWcoQsI1aIBZrETT+AfLVAOXE1/OyH9irq1wrdvsSvLGSqa Ksj8/+rXa7svGDr4Kn36Q+FmQLksznpm09LEI+N+vhZIqPSWppp6xHIbgWJ04kAFFUD/ SRroLgw6myKzad+n39+ebowymZc112O+rWHEX2vEru3s9IZbCjOweybXUMH/jJVLOCXS 3+mU9yZqNbaT+ZLvGLJTa0DoLwrwpph/w3Auk4stDKL3lvzPu5bfVil3H0TW+4Gewxvy ZSDABL6cMJ/XXjV9IYa7IZf34HJS6Uqx0c5EQxwONsD0GwBxJCW9RisVJwzTbFmy+AcB vRlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709596842; x=1710201642; 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=Nn9ajW+DbwTCSPNpe32gdyhs3Z/vcyEeHgx+0tgRH1s=; b=s8eyq5XyEi6gEOV0QWg7tRZfX1I28op3hkLKrJqOX64KPKE/2PpbqnqVPpe2s9KPFf tmMoF20NtKQScxZak/KAqvz0SaJyZuJAaTdE70eXr6k9lcJsXdIlZMQt99w5pvK1+Fgw ZpkIV0eoUDzYaNn1omuLVndhBik3rdhezrSM/U/M5WGvhxYmaABMfhIJ6yYtl+eBn3uv 5GctVg23IVG1iIBkSSmmZPP/GsibnyVlfLOHxVfG+Fi2RrRkCyJMRAKo4pZ80u61DJJb uXcipakleGcLQstrfLGwHjhkBj2jhJCJdzbXZw1PUhk84J16Y6oHc0bSJzf7/oTfffCz cKng== X-Gm-Message-State: AOJu0YzjB4+J5ltqlgTYUkxwW0wuQ4VA/rX2YjPL4QBYcBPFd6ni8yDb zD3HC3ACkc93PbkJ35gkoKYU7eMPOMqfk4x4Rhyzou3hyv1LW8m974nY8XAk X-Received: by 2002:a17:90b:3595:b0:29a:67fa:7bbf with SMTP id mm21-20020a17090b359500b0029a67fa7bbfmr7443462pjb.43.1709596841339; Mon, 04 Mar 2024 16:00:41 -0800 (PST) Received: from localhost.localdomain ([190.194.169.124]) by smtp.gmail.com with ESMTPSA id gb2-20020a17090b060200b0029acce2420asm8288663pjb.10.2024.03.04.16.00.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 16:00:40 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Mar 2024 21:00:21 -0300 Message-ID: <20240305000033.10379-1-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/9 v2] 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: kcufXE6T+FWn 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 --- fftools/ffprobe.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index ac6b92f5d6..8390377159 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 }, .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_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,29 @@ 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, 0, AV_BPRINT_SIZE_AUTOMATIC); + 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); print_int("mapping_idc", curve->mapping_idc[i]); switch (curve->mapping_idc[i]) { case AV_DOVI_MAPPING_POLYNOMIAL: