From patchwork Sun Nov 13 12:04:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 39252 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp1890048pzb; Sun, 13 Nov 2022 04:04:58 -0800 (PST) X-Google-Smtp-Source: AA0mqf6ndPu4HigzVs2vPuiZMCAYEBvXBzDCrhwk5ZRhqkRcHoxnvWSgXTc60o86ENw7LbVgj53Y X-Received: by 2002:a17:906:408b:b0:78d:b88f:1548 with SMTP id u11-20020a170906408b00b0078db88f1548mr7751441ejj.221.1668341098101; Sun, 13 Nov 2022 04:04:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668341098; cv=none; d=google.com; s=arc-20160816; b=o1Cno58Ml1ubyB068gbkFBpOJE5+o7ltZWv8skU8GIidZRPnRhx7AjOZ0L9oPhlfGG lUWohxvmX4cNDgmNal7fujCCMJAfPaUtOMEkpzEvq60JXILVKUVG5IallHB0uhgQ6tDx W4DDQCORGfpL1VareVzhVP/zXxACDEEPuFUw5fiSp6UVJ7RFTL0/Ai1v6K1iql9IRtj2 gFIm1PzWRMRv1TcEo6pUnABwBYgW3yCDul5/xgdFIl+hp9ro37CTHncj8nuaN1kJfxtj iG32wJ7jxvmbs7tmPqPZUchkO5YVgo8JPYUYaaMpnG2FJ+RjUUD2Uuo03ehDUajn3uLl AQPQ== 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=xGAPSzZKkIsbhmxanmPATu+So1Z09fWKq5nTzw9gtAs=; b=mJBwzFe0daxqzc7S1VM/cSXAuhiINjvRArBgnMzhv/rpm7DrMCu8omMCAyPfEh6OKc oMqPo007iRYPsRPnzeki8Y9gxDMDuhYx0jbgh0Hdn0ayVRIT6aYUx9sCItMF/bjbPdag v32tY5+tJtIrZiFwrIsscZtSIMumSXnnSlbQWts51u2Q5f0VvKmzp4iqaFeZXgLzaOAF yc9Zr4REKWuIe4tZPecopdbBT0DbvLXNwGhD1o639ZpPlALhpcdVUudK+YQiztthUiAX StgB9YlJsEZNFmzWUYEXKbMQP76P0T1CR3uMP5NTKg9zEC6vBlqw8TejbOW/D4ypzQl8 68YA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="G/Lc1QVM"; 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 i4-20020a50c3c4000000b00458e87a1d83si6443999edf.54.2022.11.13.04.04.57; Sun, 13 Nov 2022 04:04:58 -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=20210112 header.b="G/Lc1QVM"; 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 7047768A927; Sun, 13 Nov 2022 14:04:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f181.google.com (mail-oi1-f181.google.com [209.85.167.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7DA4568A927 for ; Sun, 13 Nov 2022 14:04:47 +0200 (EET) Received: by mail-oi1-f181.google.com with SMTP id h132so9016934oif.2 for ; Sun, 13 Nov 2022 04:04:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=SpJw+qVR9jy1ecFzv1QTsqkqFPi33IW8iW46ovYJXrQ=; b=G/Lc1QVMo0HrvIm4S98HzQTqCiZFbVJZthLJQpJxsNYarCsjw2C9i0RJFfYY3XYZUv C3mdmpRjrK+osxIuiyItJHedO/EjZaFa/qx/vyabz4zIlvrdNSM9vxwk4CQzFI4wJHji LHNYHmU86bHJx7y6LVMIFNkdo/N+jDaU8pzoBFNXUxtz5Yem9ErZVlcGi2ddb2FEM5Tb /1IE2j8fSANHM6XAHW7hIUk3KHShA3H5uyIjxhKUPXrRIJ9lRweq0aU7/16/w8XV3IA8 eAY8vVbjcz2Hd8Vjso7L3vI2arT0q0hs2rr8gUBj8UV6RRj0uHbmoBmVAKCcfKeuU80t c+wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=SpJw+qVR9jy1ecFzv1QTsqkqFPi33IW8iW46ovYJXrQ=; b=jjDr0YbeiNfSszTeahrpBODsGAVfBBxm40AW73UJVjKMbFj+BsU1NUkkIkgRwHZlwg AtTn7NNUQ0HBI3jo9cs+rBmKO5j0IFdJeJKsul20+UNz5pkk82t8UdumHoIbUT7L8nvg e/uKiC9J51uaHFNo2xey2AlGfBg09L4g2TEGG4cuQ9vwLfTskGyGMP3lzuVjrP8vteWW VWZVUfhi1cu7uv7ut5aVdyJukPzWTKsxi6tXZGlxjqgpAHkGGsGSfRwAgAofstOZAIvF ijAeZ6zPQKeir/9qvg1SwkobRinrH0cxFCnYtdLq7ezPBhdzmby7Au6o7cgDTBhYjQKC cSxQ== X-Gm-Message-State: ANoB5pmzUXIR5nWuyDNJz7gEn1e+Ow0/VMM9foj2HNGDaDdlZCMoPuoP IkInRM8IQc2QjnhWXrZpnOWLa8WnYkc= X-Received: by 2002:a05:6808:241:b0:359:c6de:916a with SMTP id m1-20020a056808024100b00359c6de916amr3921341oie.42.1668341085526; Sun, 13 Nov 2022 04:04:45 -0800 (PST) Received: from localhost.localdomain ([181.85.72.69]) by smtp.gmail.com with ESMTPSA id u14-20020a4a85ce000000b0049f098f4fb4sm2605247ooh.24.2022.11.13.04.04.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Nov 2022 04:04:45 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 13 Nov 2022 09:04:22 -0300 Message-Id: <20221113120422.1775-1-jamrial@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fftools/ffprobe: support 2D arrays in print_list_fmt() 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: GmVND7K49muk Should fix undefined behavior. Signed-off-by: James Almer --- fftools/ffprobe.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 99adf615ae..f46925618c 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -1897,12 +1897,14 @@ static void writer_register_all(void) writer_print_string(w, k, pbuf.str, 0); \ } while (0) -#define print_list_fmt(k, f, n, ...) do { \ +#define print_list_fmt(k, f, n, m, ...) do { \ av_bprint_clear(&pbuf); \ for (int idx = 0; idx < n; idx++) { \ - if (idx > 0) \ - av_bprint_chars(&pbuf, ' ', 1); \ - av_bprintf(&pbuf, f, __VA_ARGS__); \ + for (int idx2 = 0; idx2 < m; idx2++) { \ + if (idx > 0 || idx2 > 0) \ + av_bprint_chars(&pbuf, ' ', 1); \ + av_bprintf(&pbuf, f, __VA_ARGS__); \ + } \ } \ writer_print_string(w, k, pbuf.str, 0); \ } while (0) @@ -2013,7 +2015,7 @@ static void print_dovi_metadata(WriterContext *w, const AVDOVIMetadata *dovi) const AVDOVIReshapingCurve *curve = &mapping->curves[c]; writer_print_section_header(w, SECTION_ID_FRAME_SIDE_DATA_COMPONENT); - print_list_fmt("pivots", "%"PRIu16, curve->num_pivots, curve->pivots[idx]); + print_list_fmt("pivots", "%"PRIu16, curve->num_pivots, 1, curve->pivots[idx]); writer_print_section_header(w, SECTION_ID_FRAME_SIDE_DATA_PIECE_LIST); for (int i = 0; i < curve->num_pivots - 1; i++) { @@ -2025,7 +2027,7 @@ static void print_dovi_metadata(WriterContext *w, const AVDOVIMetadata *dovi) print_str("mapping_idc_name", "polynomial"); print_int("poly_order", curve->poly_order[i]); print_list_fmt("poly_coef", "%"PRIi64, - curve->poly_order[i] + 1, + curve->poly_order[i] + 1, 1, curve->poly_coef[i][idx]); break; case AV_DOVI_MAPPING_MMR: @@ -2033,8 +2035,8 @@ static void print_dovi_metadata(WriterContext *w, const AVDOVIMetadata *dovi) print_int("mmr_order", curve->mmr_order[i]); print_int("mmr_constant", curve->mmr_constant[i]); print_list_fmt("mmr_coef", "%"PRIi64, - curve->mmr_order[i] * 7, - curve->mmr_coef[i][0][idx]); + curve->mmr_order[i], 7, + curve->mmr_coef[i][idx][idx2]); break; default: print_str("mapping_idc_name", "unknown"); @@ -2072,15 +2074,15 @@ static void print_dovi_metadata(WriterContext *w, const AVDOVIMetadata *dovi) print_int("dm_metadata_id", color->dm_metadata_id); print_int("scene_refresh_flag", color->scene_refresh_flag); print_list_fmt("ycc_to_rgb_matrix", "%d/%d", - FF_ARRAY_ELEMS(color->ycc_to_rgb_matrix), + FF_ARRAY_ELEMS(color->ycc_to_rgb_matrix), 1, color->ycc_to_rgb_matrix[idx].num, color->ycc_to_rgb_matrix[idx].den); print_list_fmt("ycc_to_rgb_offset", "%d/%d", - FF_ARRAY_ELEMS(color->ycc_to_rgb_offset), + FF_ARRAY_ELEMS(color->ycc_to_rgb_offset), 1, color->ycc_to_rgb_offset[idx].num, color->ycc_to_rgb_offset[idx].den); print_list_fmt("rgb_to_lms_matrix", "%d/%d", - FF_ARRAY_ELEMS(color->rgb_to_lms_matrix), + FF_ARRAY_ELEMS(color->rgb_to_lms_matrix), 1, color->rgb_to_lms_matrix[idx].num, color->rgb_to_lms_matrix[idx].den); print_int("signal_eotf", color->signal_eotf);