From patchwork Mon Dec 6 01:12:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32071 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a0c:cdc3:0:0:0:0:0 with SMTP id a3csp5353762qvn; Sun, 5 Dec 2021 17:13:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJxmHZODgIbHboNX8t1BT+ePpJkkndU9+W3s2P+3HtPk++EjqAVpJ1Fzilfmlc+WglVfp5jc X-Received: by 2002:a50:eacb:: with SMTP id u11mr49526954edp.290.1638753223442; Sun, 05 Dec 2021 17:13:43 -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 gb40si17116393ejc.650.2021.12.05.17.13.43; Sun, 05 Dec 2021 17:13:43 -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=cOBwc5Se; 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 81AC368A72C; Mon, 6 Dec 2021 03:13:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074036.outbound.protection.outlook.com [40.92.74.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ECB4068A78A for ; Mon, 6 Dec 2021 03:13:17 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UuTb+ZAcmQ4gLjiXq9CN5SI6l3gms7gKjN8z1Mo5d3EFpcYLplWDJmAKioTD8sBF4CsPpgFnKnmlO13VwN9CjyapWoN0eRf5MKViD1X6vHR3aC6vG7tErJaXIZBiGyhQemMICtBTN5QBdiaK5325Ujy1/XowcRG5Nplo2yrk0i9n4pBRriKHtbf7d3vKjKvnyKVo1AxwP4pEyX2D3PQGvVxixnfMXbk2FhL/B+urBy9RaK2hlwvm6hj/8LJQZvJyILo0ZWZBrcNI9aZGL1PqOOWp05v5lg8u17XsYgiU7Pey158PnH2K8aE3qi5Eux2JkSm8M5+Q/5ngJ7Li4WofaA== 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=psxMA67J/qLQd2TM3dE2r8UGIfL556cTQadL6ypTXWg=; b=JtuN0agGiPiZ6KBdE7ywQSpB2K4NaNq/FtgejFhFoKZWUNphuVDTWRT2gANolB6TScnAU3nlTP/taQchXDAuTu+9+xD/ckSLN4ZM8lfigMlG15bbI7egOza2A6oZhZEXeMzlf4uernbexFhN2v4xosEZ1LJMSGBq1Pfjv/fm0sidcRl7DR8nQcFpfcf9uhd1JJdpFoi2DWQmDrlATcjumiALjf6c+V6xFsnoZePpfzTC63TP+cAoCYnCz71brGq+DLdjjpjVQaZN9nblGind6a74Zh1MBdfXQbo5V48JG2bftaJFFC6Tz2Vbrt1jJ4V38t1FngIJWefzno+CIHFCtQ== 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=psxMA67J/qLQd2TM3dE2r8UGIfL556cTQadL6ypTXWg=; b=cOBwc5SemlHSN0p0EYIwgPgqmLiytIVBLYkmFXamYk/tEYREw7wtXwHIgOYA0EsFagYr3kpbZBfKIuK0fzAh5PyDcrq2Gc3ayowM/cU1yQD8Zo9qsaV2ZkP7cZK+TBN1KjXktrDqhqUfzUumEHs99zJ4BwLSpEoMr53AR195Tn+7gWqi+dLTWQhQosaqCXPTGVpWeji3cIuB4cJ7nktnUzn1U473UDkeF3bEvkYOYLYArP3Oki0/by64ApKx94WGxCv0Gcystx4LRWIj6V2IRN5QUp7bUQWQTt4zqhW/kGiqnfV8+kkfXmCDTTUa3Eg1w6HXCegbDCNNVrUDPE0R+g== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3686.eurprd03.prod.outlook.com (2603:10a6:209:2d::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Mon, 6 Dec 2021 01:13:08 +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:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Dec 2021 02:12:42 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [BKn2ed/gohZ3XKeAmoV6bS0GZkeNpKLe] 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-5-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:07 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c3810af1-3581-4748-9300-08d9b855903c X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWqLpJmXNddFmQxwc0tuI0lwYKj7dCOeAtvgqjtWP6+nuue2/9VbP1MgNnX+7eCKXOV5YVIRgxMVIXg88+JpLUYjx0X+hLqlm74FrJuBxr5UEqs5ryjZoXoutz6e1UkCt5Jx4YV1qbQoovoIxLOcg05leVXhcAeiKMEsJbt6J5xzwvJeVMPXmP0yN9o0gh/+5s04LiFwVSZtqeOoQlSIPd4xDVKHK4NlNCkGxrJ0GazcmVnhcsEJ+YW73LFPYjRA94c0pqTO+fAJTY6JZuAfUunYrV4J1vF1xOgMMIFLpBRRPVPVG7BrUjiFfur61IjOHAIKwL9SYCZQDLrYvXX7KS7pFmnVhGGzaM395i7aAJEX1nNZJAovi8HcPJ5W6aRnbEFbJA4LBPqMr6NGLcl8W1ToGzJZe3ItGPAn0nsGklDDSPV5yvxRYDo8pdfm3P0EPVMOb1ELSNdH2HkQkoLV1h4BLxVwks37VWdKVp5AIHDFssVTBki/x+Y3bVfhVsbkZq3f2KHV5hJbg9+al9uMteDRgScrxnXaSMt8z++iqVct88+6LRT/5k8VuI+VuHmlkhQQy9Hd0N2c27DEa4vamD6jTHiEZbQfkvXE8LhhQcNIr4ACt+SV73E2EDWZEdz4wsytNGhKQXwZ7j6zd7ayT1fk6ao3kLq5WbS3ifHuRrUhiLNqxP3tO6E5+pRjgJdpEnLttUgqTAZNSkeJL+1Ngj+sS8OLTxDcf0= X-MS-TrafficTypeDiagnostic: AM6PR03MB3686: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LCSyHTIBzL6CyVIM87Hy0JJeTEgjjPYsWc6J5FZvL6QE9u2Rhpvgg0xRVJpxgaaAvWIb3FsvVesAHNA7dt/p0RzS0SzJZEwn8VOcFJP4eJcffZNdK/hxBxQulT974ALI9E3gCLZJlGwZjhwy0lx9DS5EMLdII2kHv+CPcdqVxH+BBu2w79jE/lIYybW4qwZIYeTplB1jz/jrWdi2SsLejX1wLUyxRb6u8e1Ss8uls7Y71XZFY7rjQyjQ5bEDdthoiMOWuPDs0Z9Tx/o4fFWWaYgzjBhNVmssPe7YvBoRZyhcRaiX2HhuHKySUaI7QIyhk02HhFjvoad6WNnTPajk6WFTv2Med1cSXGJyW48IbZe5xRQsPgid8z1xlWQ1hE4ivMQfWj7gYseVNNS6XG04dZdo2yZ2CNW+wlBMc1S2DTZTobNcuLt+uIBJ4zHAuwyGxKEF2jDwGwPxzV9begdMad/8uOqZoM9mH2CXBSF9OOV5g1faXEE1zoWfecJfED+pwqdCqVAdfm+RTkUEnE+O7Z8niXlyrUtBNxNXz6fHo1dpIVSnqGGcvAyWWtuLfKonSPBoO6UiZpoTnymgvknTuw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ngGEBE0pNL/EdRtrVhXU9FMmebnMslntniwSin1QO+HMBuj7av3K/M8gRNVoso70YFWasm10JjBWQbhitGDLKTxkSy/wGZng46We+YWI8cbBd5d7iaomtCZ4GCAKB8skQADspsUrjQym9zDAwBZn73tKTWXmZzaLJZMyHBYK2qXzz6tsXcr1OSK1ATHl9ka8IQxktb/MhMHvlCaLuqKrU5qXcniI02JHZEm+jV+s5fTxxLzLFReVc3ZvpdwwGdYr8ruTrJDlL6+W19hRGOyUVYilQaeLc23GdWky4DvOXFJ6qbR9L3cYAfBueBAtcPnEuXUGwy9nqB36NrFuSQUo5BbJxv6NbtGCRW5Hyr7BkMUN+8oOZyQDWIfo9ekfXuK3iL5YV3X18LyGiwkoV60PVVuON8/yFBt74k/GGSQkEUGMibGtJI3GKvhXUBcSr8AfXbyvKXkg2NiJCx6wjhBLmzwjT+rfzqDx8r2Nw1KimSUByWmXulaANK3bOjfM+Rd8M7+xvlucgQe5bAT1WG/tXIB0CcOdX9u3QrdXRFajMeb1+93sxkts60Bjz/WHUsFy+aqlalxDvqgWSigSS7NSkIxKABGn4m2u22nncyPTtBd16NzgZ10QScfqSja/KNgwqxJyvB3B5wggn+mLd0K/7hmoPZrZ9NozT8RJYAoU3ysm3vHqOgZycMH/qU8sJJqPHJGw3z9Re6wKZK6cnv+RBIJYdA6D+It1fq35lEoqPyus+ukwQCdNjmeZ/nq/ziPvAZSkeNTM/BKnfh+Koq/8pO2z+lqfCOMHJR/Buo8gqEH4Obf3o1UYqRsDgVP3GioJTbAbbzVdee1MI03za3md4jfyyPJLbBHbIyCvs+Gv+gST/YP4OQavnbGahQGolLbM0FLefx7ubLjYlCWS3q1PiHmpn+RrnhGMB+P8B09mCMsc6xjzG5sFUPPQAVem1B3A3aFturhql2s3fScyZvelYw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c3810af1-3581-4748-9300-08d9b855903c 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:08.3442 (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: AM6PR03MB3686 Subject: [FFmpeg-devel] [PATCH 06/10] avformat/aadec: 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: 1Dwc/HZTUltY Content-Length: 2163 Signed-off-by: Andreas Rheinhardt --- libavformat/aadec.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/libavformat/aadec.c b/libavformat/aadec.c index 5f49a543e4..840a9968c6 100644 --- a/libavformat/aadec.c +++ b/libavformat/aadec.c @@ -83,6 +83,7 @@ static int aa_read_header(AVFormatContext *s) uint32_t header_key_part[4]; uint8_t header_key[16] = {0}; AADemuxContext *c = s->priv_data; + char file_key[2 * sizeof(c->file_key) + 1]; AVIOContext *pb = s->pb; AVStream *st; FFStream *sti; @@ -130,10 +131,8 @@ static int aa_read_header(AVFormatContext *s) for (idx = 0; idx < 4; idx++) { AV_WB32(&header_key[idx * 4], header_key_part[idx]); // convert each part to BE! } - av_log(s, AV_LOG_DEBUG, "Processed HeaderKey is "); - for (int j = 0; j < 16; j++) - av_log(s, AV_LOG_DEBUG, "%02x", header_key[j]); - av_log(s, AV_LOG_DEBUG, "\n"); + ff_data_to_hex(key, header_key, sizeof(header_key), 1); + av_log(s, AV_LOG_DEBUG, "Processed HeaderKey is %s\n", key); } else { av_dict_set(&s->metadata, key, val, 0); } @@ -161,10 +160,8 @@ static int aa_read_header(AVFormatContext *s) av_tea_crypt(c->tea_ctx, buf, buf, 3, NULL, 0); AV_WN64(c->file_key, AV_RN64(buf + 2) ^ AV_RN64(header_key)); AV_WN64(c->file_key + 8, AV_RN64(buf + 10) ^ AV_RN64(header_key + 8)); - av_log(s, AV_LOG_DEBUG, "File key is "); - for (i = 0; i < 16; i++) - av_log(s, AV_LOG_DEBUG, "%02x", c->file_key[i]); - av_log(s, AV_LOG_DEBUG, "\n"); + ff_data_to_hex(file_key, c->file_key, sizeof(c->file_key), 1); + av_log(s, AV_LOG_DEBUG, "File key is %s\n", file_key); av_tea_init(c->tea_ctx, c->file_key, 16); /* decoder setup */