From patchwork Sat Jul 2 22:21:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36597 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp1883838pzh; Sat, 2 Jul 2022 15:22:50 -0700 (PDT) X-Google-Smtp-Source: AGRyM1v1zysqK7WqNDm9cXgcaBOnCWIVAu2F1Bvd0HeNNJEb4MkBQp8vjQUaWiK4Og/MQfz+du5H X-Received: by 2002:a17:907:7e85:b0:726:9fc5:cc2d with SMTP id qb5-20020a1709077e8500b007269fc5cc2dmr20475889ejc.376.1656800570182; Sat, 02 Jul 2022 15:22:50 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u23-20020a1709060b1700b00702d7a823casi13741278ejg.317.2022.07.02.15.22.49; Sat, 02 Jul 2022 15:22:50 -0700 (PDT) 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=W8Cusx8E; 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 CB45D68B964; Sun, 3 Jul 2022 01:22:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2106.outbound.protection.outlook.com [40.92.89.106]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7D9B568B95D for ; Sun, 3 Jul 2022 01:22:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=djYx4PG+g4TYa1mESZtCSW6j9NZhtK4Sxekm8j2H6laKA3LWnahRVyWxswUU9wm5johx5Oin9gf5qBYPq8EvcDEoaCB7b64uP+6T4qgXebws3+dMKo8fNJmcroUSVnGleMwsJmu5oMvB3Gy25IMVJ+cb1wFw2MiE1uO+BzRg4+1vim6gjPDQsef6aMW8t4FJE6+ro/NZUu2YdIy86/s3+XNJzLKJqHSd18zBaBzt0MWqs1t44L/8yUfqAj+Ls7l6JfaIu/z/cel8q/jAXbm8pp5lBOG87Enxz9zKvHZkkNh16f7+NGmoO4D/FgLFpWzt5ugMSGzxHp5mGM98G6GT9Q== 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=FyTw6wnsGm7MFRnkZWrDkqQk6ICaNXm+eAuSw2Lyz9s=; b=YEYAEbp+CXiHuuum2KJCiHkDxKGefbniqh9HH6DRzOtfS6HQuANY383fRNrPCH7G3uWraA3eFNalRYpDbm9d+FZTrEBmP3N6fU7SeSAFgRBxnD4fpnBqc0FqLZ0pzzh5n11Z59gf2qR6440Wk1rhQamWItksmrlB8ITGsrLSIOH49hoL62m83DTiGX4VT6gqbyvLI5/GZOZ8z7M4FbxnZzhdFdNN+BwkXbK2juQVERqC7knybICXlYBz2zQ3SBibUzds1BtkUxCIqQ6zSIM98B2twFDI5WyxKu3nWJhcDeWT5YnVcDs3Ipnfyy2JmMgOTvbeEjJvOxbBEzytPm0LQg== 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=FyTw6wnsGm7MFRnkZWrDkqQk6ICaNXm+eAuSw2Lyz9s=; b=W8Cusx8EFsE8KqX2k4hxYSRcUhA57bjOzDDtu2jtPf7+j+dUSvR1LWy+WXj/DuQmyfB6YK+ckjEPlwIAx6ZbO65bz5mWekTAeXe8ru3kboMWwLZi6tEZ+wGS1DLFdEW/WTC04YU8g5Hm2YSIHWN+Cfi1a9amrtj5Kq4RDy3FSD+8kLaX7UQ0R/cCNGJJonoWBhXz+KKt+7Mdmqw8wK9pYfn4vCzdI9FxbOc0uXG2iqk7VBMACwwFE/KsTZyulsOiMtxXS3b9iZ49cqRWc1SA5TwnRN7DIbzl19vrYqucq29Sqxzh9eUk1p+JU0FZUaNpp1uySNFvZO3EhCcm98Ky6g== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by VI1PR01MB4240.eurprd01.prod.exchangelabs.com (2603:10a6:803:6e::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.14; Sat, 2 Jul 2022 22:22:22 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5395.018; Sat, 2 Jul 2022 22:22:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Jul 2022 00:21:45 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [xbuJEulfZQQPcimWX0lf7Y/tXycodjLT] X-ClientProxiedBy: FR3P281CA0089.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1f::18) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220702222200.169681-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dd396ba1-f397-40c0-39c0-08da5c795586 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXwBRntoGkOsgo00FNZK4OlGG2f4eDQsUQaoICyHlvvxeRNXH5DPLPGm2jmm8ucHYylQmLhStpne9+AUjfNKOipf6u3TKydfgNl0k+CEdVUfO/QIT1etkXScbJGL4vYyXS3bg9vShrRV4wg0QKbcZM1AcADccGTN/VnOeE83etDjL4kI5Kw+fEYNlHwShGY5Hov8MfruI7X2Ht6vQ27H5W+3cfTIxMe4JFG2nfT/zoZFvBM3gHLhpAX20ceTjv5GWmFO0JtIEX+GMC73s1GxjQpYrVmj/VXdZuGm04Ymz/fwbuEEDeV9rVSsmh8ukv74KGgt18Y9jRUgmuXaGdIBTK2xAqg9zJ8A8xApAMupaAGjpGrShD5fTfr8lfFOJslwcqwX9ZeEqWXDo+IWcgJBXuGinprr6fBkIC5oXK3r1Pcm5Ybng1Szpc+s9knopgTddMvpXJnrkQZd+LIc1CeEmb91Cxj4+D7LEgmGeJZBhKaX6F/n3QFdTjjTNyhFrNLvn+DN0MkuPJmy6S5Hh+fgEG5InfdJagAfS+/0nHoWSoyZA0bRxHfDpotxRzffkdrqiok9XEM9CudPCbSB4y07HBVKw6QEGz1+WXpRIEdutpGIex978w73neEhmrrSKgdHTkj0XjcLhJqxxTmeqW+s8DUwCB8iwpGDdKDscXAb9aAVhKrHPOBENfbDBcV20Z//WL8HMAZgrcCQoaln3cLGLPeiDvEYQrUwus= X-MS-TrafficTypeDiagnostic: VI1PR01MB4240:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 45UlRecDs5/iw6JwKGXlxq7aaWjpTqGU71gd6Y8JPh/XMKip9SzbaCEXf2QxuZSpVcYCsCgu1xNR74omC0MqB51rYRoax5CDNWxayCFxZK5JkylAyxW+S3SpH6Dr3YAcIllvHWYzE65jsmk4yKxR/nFjaIhF23KMkYd43Fjg+AFMVgqJ++7ABQsqPueFfVIvO3aJxhSVHKXqbLhblBZDJeKVZJ30JDMX3Fq43jWf/84W1RQi/9HUMk3rcejqk/bQ7YNCCC9h2Wg/6x3G9FGbjQ4zCsQYE1uhCj96ASl1HiVA8BSrLHNnVXGfNaIdcYROKgnsJAxLQr8HtOMasMvyhS6K35Q7DXd6P7tDRGU11g3Ty1dtoqtBaNYugH8rzzFDooedQXeJXhpuqAnVhd6rOhlQ37NngLadDm/+bgKUOmL78t2l1PBzPxzEqkuD/KSexXXSALPaoUsXwTYDrLgu7+cs5gZGDKXHEYZ1m/fhqlT1G3j59nYmwhLqhcVCbIzlfSWubbgCjqkCwjGZXmdmys3yHM7CQN+JkxyB1nsLY5GH5UlSZ+/OabcdGMy8kzk4lng+7LncmYGTjAzqdwEocRFNpOJPT0MR/CQxhCPOcTOwA946eM5vTuZwnhUnXfqrWLD6yaBciJOle9M+qJTjsg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AkrydKc/HBuU+QGobqpl9paZtGv7xw2Yhd+gI+acE9jNvJZGq2veJpUTk2Vp5NyeK8jgl2nheBLEeJLVEUfPnYETBoKcOYKuVv2zWDrrPDrk5LP2HKGTjAfyZSRs8ehzn3qwBvC2x6cbm2ggo1sSJJ7Bba0N0jcDl7Q5ew4UXgYzJSB5U3tLhDkXyhSGJV9hpSSqdKCxTLgpfsNFtd5MFxge6Q8Za1pvEUORAfIIYZ9bxNLMKD6FGn1ELm+TMJi9at0SYJjcOEfyuiBX+XAaqGLZgJQathLI521iQDP8XwzkAhb5o2sotp4eSkEtL2z7eYkoo4m+3w5JNQylB730zgPs4QLOPIFw/IiSYQHFsf0RHLQ4XrzhvMR1eMeYxbjQIhMUuiQ9R2yUe5UsBPmpC3/bitmIVxbf/OSOkbH9RUuEHEySB00fAOr43b1LIH3+pZemPBIcAKJkPLpV4doQaQZkT0qsMTWeDO0uPeBP8P0M52KUXEAwGoB5ZtsoAoXC9IYNr4PqDNaSDumCDUfLpUcjEATzwSxzHHI14DCVh/x4iAZMoU62vRjjlSrmleJIdRkU09q2OX0iFSx7O1b59hohzF0LnNeNwJTcRrA4pUAOEUssZ/PoV5cxSKAem1kZ8xMm0+d5wrEwQ3QTVshiSRbfACoJsbBl75cLIvrkWKZM1UurcePcMsJ9O3dSeKAObJjnASdhS+dCUqIqmTczpnHXZVJmKCGuzQF789SY5rI6zKstoPc74jCLF7ANT2RwUqLY60ItLpPXbxgqYxiz5VGA9IdZCAJm6bVl19QRYUT6820Oaed2Jd7i+C3M7wX1mZoJd9Ylr1DjiRrVMXsBzRUOrF8iC2wzQ3dN68JW+2nqNXQVna64xujSzp/+MKGAhM/3qaE1KcjtBDqPuxCriGPYZ3LdKIIreLbox8P/LIs3UnNp7GDmIIFXCB8Bm/FjcRy0ncZsjH0zzemJ+lh66X5llkZRj7JzWzi/K93b1R3Gp/CDjMEC4B5RkKrpWJrA0lyqewMJlkp+E6FGXIcs3G3BLvJtF/cxvwAjiFSFJ+R2PEUFtftouNHD0UNwDGcQ2i2lyNsAzGSR456L+PIOgFD3LdRbjs5yP+nwlTLv3xvC5EsL2nu+ylNf3trBjfg2LV4YRPN7cztNINiPZfxV9+Iro8TlVj+DpvX782KorwZgC+HWsFf4u1hBuR6B7eIhkExT74vozDhJh0V1jJ9Rb+qUYVlmggf+rrof3bsJHgDnl5Cu7aLejSn1ZWqLyDEZScFwNj9OawQQWvwYcNcSq9f+QCH9gmyg150EymgvE+0= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dd396ba1-f397-40c0-39c0-08da5c795586 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jul 2022 22:22:22.4538 (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: VI1PR01MB4240 Subject: [FFmpeg-devel] [PATCH 05/20] fftools/ffprobe: Improve description of AFD side data 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: Y2bSARCHqF96 Signed-off-by: Andreas Rheinhardt --- fftools/ffprobe.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 5020ba484c..4430f72239 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2361,6 +2361,8 @@ static void print_pkt_side_data(WriterContext *w, if (do_show_data) writer_print_data(w, "data", sd->data, sd->size); writer_print_data_hash(w, "data_hash", sd->data, sd->size); + } else if (sd->type == AV_PKT_DATA_AFD && sd->size > 0) { + print_int("active_format", *sd->data); } writer_print_section_footer(w); } @@ -2633,6 +2635,8 @@ static void show_frame(WriterContext *w, AVFrame *frame, AVStream *stream, if (sd->type == AV_FRAME_DATA_DISPLAYMATRIX && sd->size >= 9*4) { writer_print_integers(w, "displaymatrix", sd->data, 9, " %11d", 3, 4, 1); print_int("rotation", av_display_rotation_get((int32_t *)sd->data)); + } else if (sd->type == AV_FRAME_DATA_AFD && sd->size > 0) { + print_int("active_format", *sd->data); } else if (sd->type == AV_FRAME_DATA_GOP_TIMECODE && sd->size >= 8) { char tcbuf[AV_TIMECODE_STR_SIZE]; av_timecode_make_mpeg_tc_string(tcbuf, *(int64_t *)(sd->data));