From patchwork Thu Feb 22 00:33:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46425 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:26a3:b0:19e:cdac:8cce with SMTP id h35csp48145pze; Wed, 21 Feb 2024 16:52:47 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXY1i8KlplTe+bCyiU12j8PQtmiBdpnfTho5cAJ/8886og7ae8Z3YFDJoYweTEJDEzPZSbWladpMntNJI+h6epmJ6a9Ig6awZb1/w== X-Google-Smtp-Source: AGHT+IECJZqnYYIPzHggX7+V3j9sV2467hi3U+p0HDBvfdCF5de2oh6IQ5s000SOOIuUAfiNXDPM X-Received: by 2002:a17:906:5a98:b0:a3f:4ef6:2842 with SMTP id l24-20020a1709065a9800b00a3f4ef62842mr1896475ejq.17.1708563166859; Wed, 21 Feb 2024 16:52:46 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b6-20020a17090636c600b00a3dd255ac9fsi5005331ejc.952.2024.02.21.16.52.46; Wed, 21 Feb 2024 16:52:46 -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=@outlook.com header.s=selector1 header.b=Imr2VijP; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 20A7568D1A8; Thu, 22 Feb 2024 02:52:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2094.outbound.protection.outlook.com [40.92.75.94]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2728C68D0CF for ; Thu, 22 Feb 2024 02:52:36 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CAETcqkP++zS75GL+RXdbWeOBxAPGU1nlJlu97jj/YdmgcE6g0XQwEsP26pnMhBH0aGn020KzmRoYSL50hakcRrvMjAMCnv4jNme+HMMq3si/lpzBrHAfEqnFaT5nuGFT7Wb7HVznayxzhBFdYV/2g2gEszQpblwdVG7EHqEg+Ufe16IdkJVtGEEJacEtYy/zl+f04+YheS5Mvp/oXTkj8B9/Z+i96T06vH1RbbW+JFKJlj4WDlXDAJ/vL1F+0zJ/xkXZ0lyYZ360+M5Svryo52Rp+1voMbSheLFJGwvCufjR7Fd6zt6RadLZyOfVRP7uRsKYCnQWa7CbCB9utWt4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8oY/VquIMoJnvUC0DwL9+NYCXipphMaqG+IBdubXrCI=; b=CKB8ax1zOsuCoJM00AszAuRKuoPtj4kxrJpfNdcLzdhs2zLk0KDBDHY89kQ0gyZ12/eA9tkDhpOgQcvpNtBENaYkdCxbC4P2Mh+eH/PNTuIM2FSjm4SYOu5iyspkJJTc/EMHfK3HBBfkC/FafYjPk6pN6zsj6KW2PxxDASykXQdiSGCjKmMYUy4ceNyEdliYY7By0wdreMkdS+wjV/RBTC1uXLqj33Izh/fWjWAaYVV7RT1fy4G0hTVP0ZbvvPp4YbUDd+GbPZPc6+I2zgYikrB5rnm+h2fp1fkIoVPXLwvwb2RB4Rf7a5q3Ksy6wEZPzjfev/Sm+81bHzxsDBcw1g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8oY/VquIMoJnvUC0DwL9+NYCXipphMaqG+IBdubXrCI=; b=Imr2VijP4Nku/r687oM0zoW3Q6bTqfwK8v0BlxxKWZPsvDSiBxj0cqokQ0vmlwC6ksrnhBAP3djJWmJ5cHa6NMpbsLG8nfPTn3WwG7+8ullQLhkb1A2Umodosw2P70NvOuROuL1mj1r/FKXMNBCMLL0KqCwb+CUFxtF2mvowbtszdABAlzk7+DOE2yCfUyT9si5UHCNE+XTBE4qrreL51DoFf5Jk8NnhrLPXCoFxLfWpnXOiCVV7qkyIyj68K5TSdgWmCVluJ5cFQdqnQaTf/fTLrYJlCCyUu2PaBqjPlLR/I62lQcYwe7peZ6TmzA1ZUDfdMDyq5g/9BLrmGfUoIA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0210.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:179::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.23; Thu, 22 Feb 2024 00:37:48 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7292.033; Thu, 22 Feb 2024 00:37:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 22 Feb 2024 01:33:57 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [AxuCfHKNmtmuxJbszmYp7/+vWWlrLOUZmPf7Pj/AAg4=] X-ClientProxiedBy: ZR0P278CA0124.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240222003358.2051977-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0210:EE_ X-MS-Office365-Filtering-Correlation-Id: 074db865-22e3-4ff7-82b3-08dc333e7e5f X-MS-Exchange-SLBlob-MailProps: 9IecXKUgicB8p+LE2WtExJI0VwW4xhCzCI8xhQIyGyeVKWKU+O8JvIs380DWM1BU2I7lI1lYYU0nk86elbjo7aglyXJwuyLf+XkV9233uALu0/gOas6xwhpkfo5Z24VK081GPuB2W50XfygLgqW5DJkUj2U4FlkIDHhZCXEvryaW7rgguCI4EOp/+nw7mn0MabeiRHycbeCvKS5Xe3DBCfOMqdNoqG7YNSUxDdn1ZXRnnp6Vo/bR3PyDW7GtgGDjk4Itq985arrJWHI2p81RnT5BGj40OEd9D3MnSYognrycLNLBb2WfLEGyojZFLfjjzJkatPVRWVkHfH12EgQPtwZLgP73jUMlxtiB5yxOnZxrlkpQV4tY+EJtFRQwUzZMajUHr6AD+/jN5a6EUoqmZDBnlMZCUfQyon+EITtKuQOb+aNxckaBoESSOfAPhdcvIMnj+mPrYa00K6RQfnmSI3LoEViEttWMr/iKfUb9zYOQRWUDgVszpkK5CKxBAUs+b4H44igDdFk/hFnF3HEA/CNE8vgA5lR9GdKI/iR/JD0bXQLNSHGOU0Xce2xcJk36gWMhJol4RpKS5jv2DMkaLM/H5uh+VxSJ2gfhKRBzOtACvI27WJ/Y6gkuL9bHqq68S2kkVYQHOyOvV/vM5S2pT5g4nl8w4wVbwUOeKHHDaEu1sCDXC2QaC6Ezeg9s8RsDl/34ySlGfjhSQwaK4jdLra0PSW+ZLXbpbchr8Wrgpdds5TpdxEm9Xg== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hU1JU+64LO/AkjsHyCP2oBHapKR5OvP9RAOhWPskyOaWNsI5IKwAGnyQXvUSvkvQKEtcK9a0oCFVtbFCLkYY/e8PIRQl6k5BrRRNb6JkWKnPpOBfbOuoShOwc9Sg6fW+dojuhRDpp+4zRE9Yc4sffUkORy9rcQ7jK28kae6XtPfk4VcQMZuNw6yWblyZZY7zwwjWMY3HHtdRF/C8HhYNmv2zJECg9aqII3zIT4+FtU5W9dJa91GFseLJH4dqbOhV7S0mbtrhiuXpVLoUuMjbUkB2LeXF3nuC1BrQSP3q5wnjjyC05dPdWPJMQWEp6n+/V0YKV6A88JonagPk42RztFZiSS4m2rCSVLeIBqNhOzqrhbqlbcy2VORTHI3rqQpFg2so4zYT2mUyBtCykwKop6HI98lHWvg25C+s/eu9FFNwvhkoKf/KzF0xiJBtMLmR0UankATeb1kVNqR5RjH5MyfZCzSHFj1SuTLSnkzkJr08iITWV3sDIVAoHBrHnZlVTThvEuZfWg2PkByfsBfAOupleVpR+o/iA95gd7qxm0NnTDWurAIDcuolUIluM50VcCmm/rqCdgPwVnJnDSYbWqrTHrIbuOhpoSOT7duEtQ4= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AhCbQGOd/klr1D/AcbMF2IzilBmSpQyxHePWxkJ8bjBCYT1qoXPrCWFa/7PTPbedxjLeBeATusdzwghciiuC7DGIb0HcZPJGlVBL5G0k4RBWrrDzZv0R5DPjY4fqnssthbnCRcu+pEw0fSY/347NplZgExrYeyndfLtmqyAdgu7xYfdeH1ZKZjCNsSI/m6abtEmkHroR6y9kErRyrab1dGgHtyF9txw+Ho0H2OgH45m3RoiUOM5Rxrz5b7Oc4g3EnvULUmwShmi+wLeA3Yv9v+iZxmQPOtEvnJXEH/6wb0vz4TWDxFmJz+DMOcFBI7YwZpg6wyUll03eqZX14cXEqk1qiSmXRc24DhjZCk8tEL/UIQXqyPZLNXGpXvP6G2OLVzNdGbczNMjDYhufZsynkcKwVX8CGBDo+tBgbygxrTHdtaF3dkyAiC1USKF+rcHFwYPWIvBVSZwsiYtD1Z8y4IVoDgP7cqqf05Yuippb9cX64v2SbWq1CskGv1844/xdbiKzOkQq6fdnK2LF+MbWBdrV6UdZ1dllYsr+yR0smlmwuyE24D18EZh1Cb2u0zBxCVz06Z3hVLHXDguOeYXxhcjlz6Fh7H+6Z7sV34oq+zIsCe8j7HprvZbRxgQnbf1kjzZORIhjq3FXKqDrH2Vya3Xgt1qRopxmi9fl/LLu7HEj+SQsY4vwUQZMU7rNYex+EdnaCiaUYjNrVzDMXeAjJHh1iYN3ik8AjOUZ9MEH+EVxCfCUUfFv01DL+RWq1+Hyg57+cO93KA5KSkMYRGScbz/3ppZURBYt0lqutcTXzVDLcL1V3JYfkrMyqKhBhG0qnffH6wyhW3j2qS4s9RqQsLOX21ssp7yvnYkxGbqedBXKoLKhw5koUn2pDsx2cGyCoUdq2kU90vcPRHlehvdf8oHAPRWAc0fSoRFS0HrWGubpdT7psC2LBAvF6lLlSNZppLYQf2gcT5bJ2p/V+HU7atRvt/UehQ1MSzDFoVtyX1g9H1HRH9R7zzzGWPIOBeBFLtXa3kNuwqwNRU4n3yZ6q9oRVnwwyDHOyFTRHsTbuVcW9dzNnx/VDHOUSr0FehheabM1VtCbeHbkIvu/4EKeD/+Zm3gFqpDtY2FDmCs2UcE5xfMuKOv3hF1TVpb7M5NVbxwOfKXF6pS1QAGik9PiLlL1y6AYLdLv2aWSzdlSYgfNEdqYpHkHsh0jZdIktztsI4wjov3byM8ww3scG1cDHQFvUgGwsJrHdV02lZpeCw56sCtr1r4iT/+V0iQxlZJ1ZaNywmX6dPidHKZ1W5CbWQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 074db865-22e3-4ff7-82b3-08dc333e7e5f X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2024 00:37:48.2393 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3P250MB0210 Subject: [FFmpeg-devel] [PATCH 3/4] fftools/ffprobe: Simplify printing xml values 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Txk4pzNMbbZp Signed-off-by: Andreas Rheinhardt --- fftools/ffprobe.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index e63935baba..31081d19e2 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -1860,7 +1860,8 @@ static void xml_print_section_footer(WriterContext *wctx) } } -static void xml_print_value(WriterContext *wctx, const char *key, const void *value, const int is_int) +static void xml_print_value(WriterContext *wctx, const char *key, + const char *str, long long int num, const int is_int) { AVBPrint buf; XMLContext *xml = wctx->priv; @@ -1878,9 +1879,9 @@ static void xml_print_value(WriterContext *wctx, const char *key, const void *va av_bprint_clear(&buf); if (is_int) { - writer_printf(wctx, " value=\"%lld\"/>\n", *(long long int *)value); + writer_printf(wctx, " value=\"%lld\"/>\n", num); } else { - av_bprint_escape(&buf, (const char *)value, NULL, + av_bprint_escape(&buf, str, NULL, AV_ESCAPE_MODE_XML, AV_ESCAPE_FLAG_XML_DOUBLE_QUOTES); writer_printf(wctx, " value=\"%s\"/>\n", buf.str); } @@ -1890,9 +1891,9 @@ static void xml_print_value(WriterContext *wctx, const char *key, const void *va writer_w8(wctx, ' '); if (is_int) { - writer_printf(wctx, "%s=\"%lld\"", key, *(long long int *)value); + writer_printf(wctx, "%s=\"%lld\"", key, num); } else { - av_bprint_escape(&buf, (const char *)value, NULL, + av_bprint_escape(&buf, str, NULL, AV_ESCAPE_MODE_XML, AV_ESCAPE_FLAG_XML_DOUBLE_QUOTES); writer_printf(wctx, "%s=\"%s\"", key, buf.str); } @@ -1902,11 +1903,11 @@ static void xml_print_value(WriterContext *wctx, const char *key, const void *va } static inline void xml_print_str(WriterContext *wctx, const char *key, const char *value) { - xml_print_value(wctx, key, (const void *)value, 0); + xml_print_value(wctx, key, value, 0, 0); } static inline void xml_print_int(WriterContext *wctx, const char *key, long long int value) { - xml_print_value(wctx, key, (const void *)&value, 1); + xml_print_value(wctx, key, NULL, value, 1); } static Writer xml_writer = {