From patchwork Mon Dec 6 01:12:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32043 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3913808iog; Sun, 5 Dec 2021 17:14:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJzx/74jSj/UF+GeYj2RQqyNcuDeE2CpAQJZtymLsHA4ELuDa4kX9TIwO7AXoo37yqXNIVIY X-Received: by 2002:a50:fb09:: with SMTP id d9mr47969939edq.283.1638753266779; Sun, 05 Dec 2021 17:14:26 -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 pw14si16637289ejb.570.2021.12.05.17.14.26; Sun, 05 Dec 2021 17:14:26 -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=YXHCidSZ; 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 B09DD68ADF6; Mon, 6 Dec 2021 03:13:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068034.outbound.protection.outlook.com [40.92.68.34]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B111068AD88 for ; Mon, 6 Dec 2021 03:13:23 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cm5jq4xWc9RV+LXSfeQaft6MiuVNYZO9gH7DauLA86BncUyYKLOXp1Bo0BpXiGieCjUIKv7HJZF6D9rldOeuFnnpgNfaoScyrIA1DTM+6UZ8SKxG8B5rgbIzrmadl7xdvw7SCiY0rM5Ofq+29mCS2fM8oHa+pD4T8Wre9vMVls2FnXsTutJyES7e+IW0xTbEjazkK0fmfIlRln5Ab6AxVs2LzaDXO4wvjxtc0xqGqm/eAHDb8ozF++CXKjYlBSjltUwlyWWLrsY6M2vyYFp+ZgKqHpOS7HCj0BidVwzcm7GvBwEreZpTGiqPsIC4ZgN43hZsv5QQmNvtQzkV/v9N4w== 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=8nx7QnDi5RzBZeKiC/ne2mS/sLIeNu3m35zUQcrf/Mw=; b=E0c52INBpShcmF+jYiQb6moBBoQs2i3W1tPcZM41pwwsHhikgeQL6VCdyXwx1tRlzJOPqji7MKt8A6DnFu6YCt8a5dzEvTse1dAruvxMve+T53N7RXRJjWP1r1HE7k+TZsxYFJdEEZENWY4f7qRE00mpb2vwPiOnwIUlxsVtmmZWiT/JIlkNX0BZ2yx6uexNWm9wBH5wtBZ7ZcDBjMMRbDcYvr0GTmabWLKO4gqrs9iat0zo4kqilztWlqs7U/wEoIw1BHDRiyR+nRhdrPmUabgc1WJMbgSDPDAf+wVQIZPuQfr2MAL5UNpeE62ZkqUT+hgKnX/sNCNQi35TuCQrRw== 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=8nx7QnDi5RzBZeKiC/ne2mS/sLIeNu3m35zUQcrf/Mw=; b=YXHCidSZklHhemhbOdotiEG75bv5Gs0AEcZpCduNkKj5exP3kHUYeYj7QrjmFkzQNKlbhOIdH8oQf5zDEJr9fy39WQTz/TlNitsdth4A3cuZ0hd7PEchu7a+83m9Kd8MBIK/2oVSfHK2A3ZPMEPAXs8l4o9wIx/3PeU9Z/XiGhIhvR+PL6jlPehejovrf8Z6gIKefcB3pTCRZMAM8IUT34cNhmGp2KwwjJ8QZ+YyDXPG06yML8bYRErc9EVwVKDaZU03Zf98V0gBv7EhJilgl3ff2M8+UfQzkPRrYCzdQamWOJ+ZDs42vpY6asbc7lQWwxggXn6cDiEieD5Eo051Yg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5701.eurprd03.prod.outlook.com (2603:10a6:20b:f6::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.20; Mon, 6 Dec 2021 01:13:16 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%4]) with mapi id 15.20.4755.021; Mon, 6 Dec 2021 01:13:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Dec 2021 02:12:46 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [ToOvSEnIIPw/Fa2O12If5QPsa8+N2XuT] X-ClientProxiedBy: FR3P281CA0055.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211206011246.239514-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by FR3P281CA0055.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=) via Frontend Transport; Mon, 6 Dec 2021 01:13:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bf2a6d93-c272-4d2b-4b7a-08d9b855953d X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT2s5ZWgpZq8Fu1c4CoKhX6VZZKAuq31mwBoWSHl/pf4uhOHoszQ333xRBTv4CDERSohFf0z05VuqQMTsQl0QU+gVqscnM3wDUKzt8if86f/f0H8VwkVGdD2Yil7CFmtsUqBTUyEmFkpfS60rwtxaF+H50RUrzTVEtyOD0FopmTKJos8V8NO1SADaj1F/x11qlgBNqidJ4zHGmrsjn4f8m01i53Q00wl4Wn6AFHV4dUtuAXm9MPoWhlMp0SV/zJ9MOhu1S8IwwaNNP6q14qYY5zZc65SgACgma/E6UUASfqbQAa7vCvM1P2ie0TVkRVm4VWPhCuzNZsznbX1Q4e3y2geV1uXqfgQ9D1Trwcjo8fvbqbQlTR/I+g4/WTIW8Az7iYuOzWL1LjORM9Gh0aBC04JHK6m8D6AayKGN/Dlt6+TS9+a9EoA4OdVkpupQNMP8sMJEoqrrEeTGvxHikNL1qBE6HF4LTsaB2jzCqgo5LgE1usFSVzFgf+aT3iO0Pnq/TlvtmfMJsdO9TXsnuy2Ijvx0mOc2hwMvPPxrnk0qF5LkajLrF0Q9jRlMAitecIcL3ppwvWDa/TFodtfEDMDLn786VnbBPB+UVzj5nCSmBf/As5DGsDijJZ19xzlBspkltZcvNFHjGMRFCBPOfNwGo8AIgEen65seev0HiINvNQ/d3658Hqkk5nGMddNGY5Uofuvo7b4ehurFFasjGkylHW/nO0D3xeaSRrOfprPG+ZsetivBbwmx2is1hBNl5egpw= X-MS-TrafficTypeDiagnostic: AM6PR03MB5701: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: L+k+XlHr2uapCTbfspSUBu5stvEJKpP54gKSIAraVmOou/i+uatgAe/aPbMKte3EEdzkVYevo8vbhNT+khiIJvuoimMCIc8nu2hulCsqCIs0ny79Q6fmXJ1QbegLpw9lXqTLAPKo+q4mLFQnxAgpJhA1xRpovG8AHCT231pYq9qkdDlSCCvZwFQdpOZQxDBngrwWjYc9M88cVYo3L3YJk7/TxEkWT1n1jrG16L33lWpps4WJJiz96vyCG9ObcgpbayKR6dyBoC7ZowKOZNnYQFkuUJkO3UDLatjcqMzrkLnx/a7ixPVeGsBFJoPIQVUC9gpiwSyXTA8KZz+ozhXhuSOhpYtvZnqeJwyprsmZ8PFsjQwZfHzTeJbMLjT7SwzG3AY1vgr1zg4Sc6o9rxEVK6e2o56qGEp0ztkhse5+OqoZoFLXkiHwO9JOEPbFZUy8SBHC/OSx6WQ9zYTE85UJjxRylc4WhhSiiwjXbGefxnbaXA5y03UNpO+w9A+qXaue5HhxMvVCuckPC+F/0Jfg1NX0+KpgOw+NyDD44w6IW3adTMM90p+80vH7Pk1GmQl1Y9d4m7JMbPW1LwpPj9GMBQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YO5zOgDu8QLiVtaC/4P4twzQLoSIo+22jCo1KyzvyPHhkjqaNZaeW+AwthCMFCwGuWA45pnsN0EyUWrc6UlaPd0BczVjVlnZEEFA8Xa9WxHf87kv//Biu3YM78vzrph3/H7bzcVidxryJ5uIVr5s2AaGdz6rjOvEoo3JASFvgyJmx6YnI7zu9bSH5F+5tvvQUHdGz/yAW4F6iQcpZ9A9UbQXpJcp1q+r912jL4w5EnRNNY21eMye9rd891yLbu4aNHHF0p+gbO9DyBduhd1rflvnxcaW6g36o7uVcNFktyY24NVT5x+2FdP9GLtD1XVrYNtyZhXtE0lZFJue+igOn23M0dwX79hSO++9I/c8wZnafQDKn4jk2spQhLSueitjrPCGo6z+66JJLPm1wbnM1KSbgzutihN6ovesrq8G8lncPKzG3uvdab4kpkIqBY+PCeoD8FjVGAA94aoa4nlJtOvHxRQj93LbHrnZHpOBzqXGfUrKeXvBnZtrbkgue7iAiPZ+y+Cw6Jy4eaFYuTWkOGgNDYI5tm2o4WLNP91obDqnSYn/XikVwvEoWzHvJrxB/BYQkjVYwVz1C4ILEpGUJvlx9ILV4zcbXwRnvNp5G9UhKZQOWlIfevyC7Fq33TOnF0DQTHDVErXAfW5u06EShg8bzygh5FWShpdzBD4MdFY8etZewBYdQdspG4Q4CyvQBOTOZ9tHoi6XuZcgzFP1sUgTruz/5eNIDvZ/y51vp4JXroE3QsVjJawcdEt+rCgLcgTm67Ou+Bz2SNOjOg0Xholie2zy8z68VEep1NqGzH6MNZ+ya3C0A1JlLnQKo1C3PwoAYSRxPLhiV21vYhrdsBELHX/Yrl3yCUC75Dhvgcpey4B4Q/xVxtADBt6H4ICTJrpCEoO+LCMcEe3VAdq0KxcH2+W3v0fl1Agl2/A/iNGQxLyH4mH5dJjX80BsKra8C690btLjHa2dhZ5Y3/Gm7A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bf2a6d93-c272-4d2b-4b7a-08d9b855953d X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2021 01:13:16.7219 (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: AM6PR03MB5701 Subject: [FFmpeg-devel] [PATCH 10/10] avformat/mov: Simplify data->hex conversion 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: G/t2AjLwFsKn Signed-off-by: Andreas Rheinhardt --- libavformat/mov.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 5c74d099da..dbf85195be 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -979,6 +979,7 @@ static int mov_read_adrm(MOVContext *c, AVIOContext *pb, MOVAtom atom) uint8_t output[64]; uint8_t file_checksum[20]; uint8_t calculated_checksum[20]; + char checksum_string[2 * sizeof(file_checksum) + 1]; struct AVSHA *sha; int i; int ret = 0; @@ -1003,10 +1004,9 @@ static int mov_read_adrm(MOVContext *c, AVIOContext *pb, MOVAtom atom) avio_read(pb, output, 4); // go to offset 4, absolute position 0x28d avio_read(pb, file_checksum, 20); - av_log(c->fc, AV_LOG_INFO, "[aax] file checksum == "); // required by external tools - for (i = 0; i < 20; i++) - av_log(c->fc, AV_LOG_INFO, "%02x", file_checksum[i]); - av_log(c->fc, AV_LOG_INFO, "\n"); + // required by external tools + ff_data_to_hex(checksum_string, file_checksum, sizeof(file_checksum), 1); + av_log(c->fc, AV_LOG_INFO, "[aax] file checksum == %s\n", checksum_string); /* verify activation data */ if (!activation_bytes) {