From patchwork Mon Dec 6 01:08:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32042 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3908783iog; Sun, 5 Dec 2021 17:09:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJws5KoL5CH4iUJr5DRZaQltC2KG/8ruodOWEM7J0If7kGd8I9XGjtGghlomwAO+RKohTUJC X-Received: by 2002:a05:6402:544:: with SMTP id i4mr49621816edx.9.1638752940863; Sun, 05 Dec 2021 17:09:00 -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 q16si19573851edd.615.2021.12.05.17.08.55; Sun, 05 Dec 2021 17:09:00 -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=Tlxi+LLw; 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 7569468A6B0; Mon, 6 Dec 2021 03:08:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2020.outbound.protection.outlook.com [40.92.90.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 965B768921B for ; Mon, 6 Dec 2021 03:08:44 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Rf1cJsiQGn23KaftKCQoW1JZb0s2UUy0jXTERjtHtzRg5GtV813NYB0Bbpud+JAukx4bDgTlLSBn2MOh/jpw3O9lW1hhF9EuATZdNXFyoSDJzV+7VbecNPd8cEP1SmCIBxr+itdRYK+WBrkHqeXUkhT38iwuBWS2SpECG7eptnsbOACU1bOXDGfRREi91OSFuevn1SXw0tzMg/sGnXxO0loB1n3rMQt3u6hU6qMLle2/KJI+91z1GTFdqlOCE8y5Pj8oJHz0O11EEFmAWLrXXczFmqWfhTuCThNJcLZuFDZ8/M4GZ3Tk9pvQy753/8DBvhv80rijK/pEcRRbMXh3EA== 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=c7p8br0JF5S2/OYyaRCFZN/QFfaVTD3TzH8Y9JMdc1Y=; b=brozVfqlZyt+Ae2nd4sFLlAR/usbfqjQB+fg3h+0bkaV6lMPpup699K66YFlbaFsloD7kpwm3VEFj8hLOio50c/XHjlG04+K4L6SGlwotTIRHXqvntBqAEsHYQPP7Cvr7URDO8pI3t+EOw3kzbbrxtQC6Ta4QkuZgnfdYSxAQAnC1A3lL/3PsUyskakHbgejMcMInjp+XgSA0g+GSiEyBvi52bq+uF+uewjuspJvekf6TaScY2XGOupcsit3rin0VlLc5098PV7c17SLI8Scm20DEKTm4AAdUrUuUEKl1+Sv2XB7gsdpG5JFaGvNKmLXRptg3ToD0CvLPT8p03B5CQ== 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=c7p8br0JF5S2/OYyaRCFZN/QFfaVTD3TzH8Y9JMdc1Y=; b=Tlxi+LLwhF7CCDfIDivN6tVx1lkW+Gc+FphVfoGKisDbfjkZAbG3O2+V8YiIp+nBDw2H+2iLkOUbDIgXfQYXMY8Z6hNQDA18RHvFatUF0cq/cSJ4oV/T9OobWQtUZuwAHLOZrFwYSsGRs713IJehbUdkpwHGdH8uaoqj/ZOjznVjkgmoSyI/X6uWFhSKMNG72qvyMi56w+sVRPuxmagxRpcVpaqOmVjtsiRQHyDr01GD6XGK/1mRm/jHvf7kP1IVXuAGkxKrcY/S8rouGnRbUFsAnjeFl+D8VtR7xBoJghOUc6mnGVrsmbpp/xa2pIiHnHLldcLVZApkK4J3r8voDA== 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:08:42 +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:08:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Dec 2021 02:08:25 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [6Bfm4ozn8Hg1Dg6eZdca+MrW1z3W9OLZ] X-ClientProxiedBy: AM0PR02CA0122.eurprd02.prod.outlook.com (2603:10a6:20b:28c::19) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211206010834.239382-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM0PR02CA0122.eurprd02.prod.outlook.com (2603:10a6:20b:28c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.17 via Frontend Transport; Mon, 6 Dec 2021 01:08:42 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b6e68f3f-6066-482f-3512-08d9b854f1c2 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT2s5ZWgpZq8Fu1c4CoKhX6ihkg9cyXRUDIVdo4lGA08xlDG2xJMd6mHxPkDBeg/HtrJMT8EvZq22K8aT5LM5eCC2A44WJe2ARhb0IIKRiLCq/7/OofC4+ommBRGNira81c/Fj3rUasvQG8IMoCcFnNofQkzDP34VGujxE9ujDFviuNICGd5Updcx3suf9UE8hJCxlPhIsuo44uvMb9TA2pg0MTs8qiPd0rbXe6Xcjnf6LcKg4X2pYRTo1EmvoCXG7TbL0+8oJP/W78khiQQWISmvcilUxbSMnQrgDbJyTJxEhGlK0YJL5oNpKov1Nj0tU7V81UZrX/8XXPG8wl/wRIGGjsShqePWMysxT2lhdTYArjvENvPxzQ1BcGcwCUFqTB5N8jRemua91qBUHMeawTDCUdVtv3TzqMOS6i/H/ZTmMruxZKiXPNQHaerEfxzjUHU6MzMhS1ji7sXIl2++t9RF99RzDf2SEn8PbmsRnBbaeVboG6QAjlH76hG9oqNOjLXaFJnqTboVG5bRfXfijEEE3FhZK2hOZN4KDqgv5SaQJ29UK2VTawOyYDX/niIKwmilLvBTaBrZ+p2AagvJr/0meZTTMG9uvZdZ3ZWv4wy7d0D11XUJ65/KcclTX4kpnGqGRGQFXsHhY80PWzrQpgK2ypykbwENjUzE4UqTlbywLn4MK5t2MRLaIySOnV2tBKGIWYPPssNcI1zx2AQMIEJI2uXQ8CIN9IyXu+A0OFNoJ0Z1iheQZ/+NGlWHsxSOk= X-MS-TrafficTypeDiagnostic: AM6PR03MB3686: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BVnRY0YHaMP6lOcpXgqTYvxfvKNhusOXot2d/qkVh5cEqQjeOauBIB14hGFaAyYpAXzlNZGgCRQ9FHxNJzLFUVkRiUd1pHIwINZHkR3YR1uIcQwNEeSAaA1+8OHUAf6OKarqgYJfz3NzHgSuML+B2l4ZqFRhF/j22zutDPjfMrmVWLYc9JPrhg0DmETxuJ3t5FeNWxMpOIy7bwlk3oSGDw8q08Adb9K5K8laAPCZl/tqti6oP9T9eJ1x8a2/37DE1BmUJT+P8pQOBbIY3SvPbu/FqZltqXFM30LFgu9Tamp5I7AIaGjv1CPUNGdR6DdZ9EcvDCGvWODDD0jLUj3zCuVT9NK86eL5ItsLkmc2edyf9b7IjNFL3xug0gOHfpL8hC9gTX2S/NHENAURWgiaurLVZrgcjHOeGrWvr2LlBWlpxgDkLZ+RwraJ5YCDIBWPMg0ngHFvVgaJP/44Mw7iU9KYBXoiNxtc49CvtWT/dimw8x4tJAEz8sBip0gMd616l+jQcR4mUY0S7hqbFMspyPKVcXY6aGl6TFNvptzJnGTrT6XM4SjFHe3avU3voC5gk7ATbqOcdI5PPectn/kbWQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Imz+Gw5tvYqGk7OYf5D3W//mGkLK4vav/r11O7cafj4GzFtwyp6Axxs32GSmv6a62tFnBPWzRLeOJY+EViAcJ9B/HyX+orP04Uo0VkRUcntzr/+alAZcesuvmqo64EXPFZUFozZ1L6mbDh3Wp8CazCKMufK9i/3Ygf5VwScfWLjnwapHo5Mou6uUgtKYY9aFLIhdqBwrMhUdtG5J6wz++WQ3TgHdUf8N2Rd460TTnLLr9yiI65O2x94MpaqjfX0YM/9mZKrZbmB4ieFYjpRMmBZss4ezrIxmDVeqinii9WYMpKEnmp42KVCMWvYW+DS55nyDHPvMenrEa+fyDgV+Vsu8ykAcAYEbqYV7+3lGZNT5e6xyBlPX8zNhVllIz+21CmejrP+rZUZbH3MDuxo6QsxzrHPz0oaRUgijDYnNS3MarDue9aEBhVbD2+pgiif6JWFAsQ/jUsYKqRDySkWs6UbeO9H/JGL726WVKcT8DRlExdDQJ8O9xJberAfRm1NqSCvoMS+5OxzJO8BLPK5RlZNIfuDfnCIUYiqQqKvL7B8q8fFGdC9CrBEISwjwD+Rz6avKd1XeBROiQAu6w7ms/dTicwmvlKMDWsIg1ji2KrQan9d5RfitZnvr5PO+WnYfLJVjltkjZUPvaXk3oUQ6Vz1WEcN9RE2AD8OvYUxYbr0ZVEx+qMryP4g/6WA5UIHSs7F9DdygtavqjjUeXcfZck0oXjDFtIsrFoD/ZIg+GYMfKJIJPrjBjpz9laxVBu+KcDuLiW62VMb6MP04TNRBCbpFWi9XA3eNAaWoekOcBvJpmS/0wJOJDwP1vlXqvW08GpGsYSAQkweR9OMcy9kgLWLPNUc68BmTqkBeY5oQlXYD7AC/Qs52nue3eBtbxFnZ3vHOTbUBQcdhMaTlmJQIPfcFS7/jI6ztCn31RFalcnwmV/cpOj07yCAk7aDlJ8ZgEtsQSOeQjRdKERv5xN1RSA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b6e68f3f-6066-482f-3512-08d9b854f1c2 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:08:42.5872 (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 01/10] avformat/utils: Make ff_data_to_hex() zero-terminate the string 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: ugOYHXERAu7J Most callers want it that way anyway. Signed-off-by: Andreas Rheinhardt --- libavformat/hls.c | 2 -- libavformat/hlsenc.c | 1 - libavformat/httpauth.c | 5 ----- libavformat/internal.h | 11 +++++++++++ libavformat/movenc.c | 1 - libavformat/omadec.c | 1 - libavformat/rtmpproto.c | 2 -- libavformat/sdp.c | 3 --- libavformat/takdec.c | 1 - libavformat/utils.c | 1 + 10 files changed, 12 insertions(+), 16 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index 52a031ed54..557faf8e8d 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1284,7 +1284,6 @@ static int open_input(HLSContext *c, struct playlist *pls, struct segment *seg, char iv[33], key[33], url[MAX_URL_SIZE]; ff_data_to_hex(iv, seg->iv, sizeof(seg->iv), 0); ff_data_to_hex(key, pls->key, sizeof(pls->key), 0); - iv[32] = key[32] = '\0'; if (strstr(seg->url, "://")) snprintf(url, sizeof(url), "crypto+%s", seg->url); else @@ -2074,7 +2073,6 @@ static int hls_read_header(AVFormatContext *s) if (strstr(in_fmt->name, "mov")) { char key[33]; ff_data_to_hex(key, pls->key, sizeof(pls->key), 0); - key[32] = '\0'; av_dict_set(&options, "decryption_key", key, AV_OPT_FLAG_DECODING_PARAM); } else if (!c->crypto_ctx.aes_ctx) { c->crypto_ctx.aes_ctx = av_aes_alloc(); diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index cfd0c036d1..1c2a556375 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -745,7 +745,6 @@ static int do_encrypt(AVFormatContext *s, VariantStream *vs) memcpy(iv, hls->iv, sizeof(iv)); } ff_data_to_hex(buf, iv, sizeof(iv), 0); - buf[32] = '\0'; memcpy(hls->iv_string, buf, sizeof(hls->iv_string)); } diff --git a/libavformat/httpauth.c b/libavformat/httpauth.c index 4f79c78edc..0a98ff80a5 100644 --- a/libavformat/httpauth.c +++ b/libavformat/httpauth.c @@ -156,7 +156,6 @@ static char *make_digest_auth(HTTPAuthState *state, const char *username, for (i = 0; i < 2; i++) cnonce_buf[i] = av_get_random_seed(); ff_data_to_hex(cnonce, (const uint8_t*) cnonce_buf, sizeof(cnonce_buf), 1); - cnonce[2*sizeof(cnonce_buf)] = 0; md5ctx = av_md5_alloc(); if (!md5ctx) @@ -166,7 +165,6 @@ static char *make_digest_auth(HTTPAuthState *state, const char *username, update_md5_strings(md5ctx, username, ":", state->realm, ":", password, NULL); av_md5_final(md5ctx, hash); ff_data_to_hex(A1hash, hash, 16, 1); - A1hash[32] = 0; if (!strcmp(digest->algorithm, "") || !strcmp(digest->algorithm, "MD5")) { } else if (!strcmp(digest->algorithm, "MD5-sess")) { @@ -174,7 +172,6 @@ static char *make_digest_auth(HTTPAuthState *state, const char *username, update_md5_strings(md5ctx, A1hash, ":", digest->nonce, ":", cnonce, NULL); av_md5_final(md5ctx, hash); ff_data_to_hex(A1hash, hash, 16, 1); - A1hash[32] = 0; } else { /* Unsupported algorithm */ av_free(md5ctx); @@ -185,7 +182,6 @@ static char *make_digest_auth(HTTPAuthState *state, const char *username, update_md5_strings(md5ctx, method, ":", uri, NULL); av_md5_final(md5ctx, hash); ff_data_to_hex(A2hash, hash, 16, 1); - A2hash[32] = 0; av_md5_init(md5ctx); update_md5_strings(md5ctx, A1hash, ":", digest->nonce, NULL); @@ -195,7 +191,6 @@ static char *make_digest_auth(HTTPAuthState *state, const char *username, update_md5_strings(md5ctx, ":", A2hash, NULL); av_md5_final(md5ctx, hash); ff_data_to_hex(response, hash, 16, 1); - response[32] = 0; av_free(md5ctx); diff --git a/libavformat/internal.h b/libavformat/internal.h index 20e93d9267..f43e408548 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -484,6 +484,17 @@ void ff_flush_packet_queue(AVFormatContext *s); */ int ff_mkdir_p(const char *path); +/** + * Write hexadecimal string corresponding to given binary data. The string + * is zero-terminated. + * + * @param buf the output string is written here; + * needs to be at least 2 * size + 1 bytes long. + * @param src the input data to be transformed. + * @param size the size (in byte) of src. + * @param lowercase determines whether to use the range [0-9a-f] or [0-9A-F]. + * @return buf. + */ char *ff_data_to_hex(char *buf, const uint8_t *src, int size, int lowercase); /** diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 38ff90833a..0f912dd012 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -4290,7 +4290,6 @@ static void param_write_hex(AVIOContext *pb, const char *name, const uint8_t *va char buf[150]; len = FFMIN(sizeof(buf) / 2 - 1, len); ff_data_to_hex(buf, value, len, 0); - buf[2 * len] = '\0'; avio_printf(pb, "\n", name, buf); } diff --git a/libavformat/omadec.c b/libavformat/omadec.c index a727cc4d66..4c418a5ff2 100644 --- a/libavformat/omadec.c +++ b/libavformat/omadec.c @@ -108,7 +108,6 @@ static void hex_log(AVFormatContext *s, int level, if (av_log_get_level() < level) return; ff_data_to_hex(buf, value, len, 1); - buf[len << 1] = '\0'; av_log(s, level, "%s: %s\n", name, buf); } diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index b14d23b919..34020bc383 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -1663,7 +1663,6 @@ static int do_llnw_auth(RTMPContext *rt, const char *user, const char *nonce) av_md5_update(md5, rt->password, strlen(rt->password)); av_md5_final(md5, hash); ff_data_to_hex(hashstr1, hash, 16, 1); - hashstr1[32] = '\0'; av_md5_init(md5); av_md5_update(md5, method, strlen(method)); @@ -1673,7 +1672,6 @@ static int do_llnw_auth(RTMPContext *rt, const char *user, const char *nonce) av_md5_update(md5, "/_definst_", strlen("/_definst_")); av_md5_final(md5, hash); ff_data_to_hex(hashstr2, hash, 16, 1); - hashstr2[32] = '\0'; av_md5_init(md5); av_md5_update(md5, hashstr1, strlen(hashstr1)); diff --git a/libavformat/sdp.c b/libavformat/sdp.c index a41c2cf655..e83616cfbe 100644 --- a/libavformat/sdp.c +++ b/libavformat/sdp.c @@ -216,7 +216,6 @@ static char *extradata2psets(AVFormatContext *s, AVCodecParameters *par) memcpy(p, profile_string, strlen(profile_string)); p += strlen(p); ff_data_to_hex(p, sps + 1, 3, 0); - p[6] = '\0'; } av_free(tmpbuf); @@ -340,7 +339,6 @@ static char *extradata2config(AVFormatContext *s, AVCodecParameters *par) } memcpy(config, "; config=", 9); ff_data_to_hex(config + 9, par->extradata, par->extradata_size, 0); - config[9 + par->extradata_size * 2] = 0; return config; } @@ -475,7 +473,6 @@ static char *latm_context2config(AVFormatContext *s, AVCodecParameters *par) return NULL; } ff_data_to_hex(config, config_byte, 6, 1); - config[12] = 0; return config; } diff --git a/libavformat/takdec.c b/libavformat/takdec.c index 6bb26683b4..bb256e1190 100644 --- a/libavformat/takdec.c +++ b/libavformat/takdec.c @@ -122,7 +122,6 @@ static int tak_read_header(AVFormatContext *s) } ff_data_to_hex(md5_hex, md5, sizeof(md5), 1); - md5_hex[2 * sizeof(md5)] = '\0'; av_log(s, AV_LOG_VERBOSE, "MD5=%s\n", md5_hex); break; } diff --git a/libavformat/utils.c b/libavformat/utils.c index 7840e8717c..c84f6a2348 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1151,6 +1151,7 @@ char *ff_data_to_hex(char *buff, const uint8_t *src, int s, int lowercase) buff[i * 2] = hex_table[src[i] >> 4]; buff[i * 2 + 1] = hex_table[src[i] & 0xF]; } + buff[2 * s] = '\0'; return buff; } From patchwork Mon Dec 6 01:12:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32044 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3912701iog; Sun, 5 Dec 2021 17:13:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJx3LDnxGkzYYqglApT69wkWVUUvIYlQoowgP0wIhjvZO0pZaorUk6tRUmd8Ym+/qlY5ghhn X-Received: by 2002:a17:907:6d99:: with SMTP id sb25mr43947200ejc.261.1638753187756; Sun, 05 Dec 2021 17:13:07 -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 ho36si17664599ejc.607.2021.12.05.17.13.07; Sun, 05 Dec 2021 17:13:07 -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=gV5jwn6k; 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 BCFFD689738; Mon, 6 Dec 2021 03:13:04 +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 50AF4680CB2 for ; Mon, 6 Dec 2021 03:12:57 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=de8X8uB/IujiLd3zjtynezZARt6J2jBUSCyhqLmTu2rRBRBY5zpATOQXe7talNuwCFKvhAPBBYPuCbBxPybH+dtCWNtRiBA+VCDwgVO4R8cVzVpF5eIciVorIWiCcOlFLxsL/6rf4uJn/bUqcbZI19FXmw37Gh20/Sm75cYLhEh/6jNxcqaZN0ptOdViyhDKbB1ty1FU2IScltXPyDJBzwOrYuIuM5y/Gj8/I6AXYuUcA/+FUbJ/gqwy24U5lU3EaWivHBFL9UUb+KMeRWffS4OgzrRxwPfaxQ+RWZoMsBLC83J1MdvwiXE6GTHuD4OjBpgL8PBieyCpczjq8vF2FA== 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=A/hD6G4Vp0wLPbBWu/q48rIXfhXqgMPCx+P568BuEGA=; b=lp/qTjdeeCUuLkZ0g9keRYRwP4cY9WBJ7RC2e5/1r8Da8aTvH98k4apDxrU9Rb3G0R5uO2vhFXWfExJO2cAVaUGIx8MaNWeFJ7DLs1B3n9xKlptAhqsEvh6Kpj6WCLRsFxcyypsMirZMTEFM89CPsTYYxUsIZMQIpj32Sw3qgzUQh8Xir5xaq3wjvfhC/YAvJQkx+W1Nl8wWq4hlYKc6alOW7BL+A07Bv67Np4CcehJg87P/YnqfRp6IDANEgHh57SGviDwKyCKcZoDFqD2DbUettLbbnbKBg2Uq3osXsS1prB/t7XvEbV3ptahwRi8sSx7b0qqSbubkbFT6d4jU2A== 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=A/hD6G4Vp0wLPbBWu/q48rIXfhXqgMPCx+P568BuEGA=; b=gV5jwn6k1PHMnmJheS5Zxk4X9HHr5ulI5Ild4iiE/VenKs4QlE0zK94yfw5wzijIXbU9EiAXuX80pomUXDQKQ3zqWXtlzx4osVEd61HRJVrmcj4q3jeWWwgcr+nVeBiRz0qMH3F0CtKwDfdQECeFGmLtAQz/NMkceKhv248HmP204UI8s9HAbdEnzLkrQjguw1E0ug9IfJr1ggALcEowQESLpnx3BaN4KEqN5EAGCMcbtGNFte28z34uGfVWvx8Nuy4X9K/uy8dszNPBo4MzaRh4SapRj3mP6Utkd0hXRUW9JOJuJSh0chibDPDmmZ7koPlukd6rbYxJT2QuDXUPKQ== 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:12:55 +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:12:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Dec 2021 02:12:38 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [VDYDiutWln9m1FlTh/hMud7pRTqLEe/Z] 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-1-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:12:55 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 18e71eb3-7199-4044-707d-08d9b85588a1 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWqLpJmXNddFmQxwc0tuI0laMFlS8gmJmRXP7WcTZVf1QDWUiabCYT2lzTZ90K87dBpqRJWW1JLowJ+4lqyWeEXWp3dCVF4zEr91DNAWjitJMIiWxojrKUr2vMal7/0mwO9zKVg7jX6OomvmHtKSAFuF6XGOEZPa41MQMVe0DTXt3JDRpvpvzLROFfh2lkd7yWhtVoK/fvY5PriP2sTe492wXnwOgacFOiOjZJACWxGCyStziBtYq/s3Z3SZKk5QDFeOabEujXnVgZash9Cexw4pYomlXQTyDlaqh8BG0IJXiTjj7eBjNwjKyByZM7UUb4EFaA8OzrcQKMpozFfEJLNIuBoKMAUwlV1P2T0uZGS3HrcMWO/UnIQrmfOsU6xKJKjheZC29cPKqFVlzmbweLm8xI4XAUXbjmmVLAoS6lyGc2FTORiUdAfLlPwheC9hFD9FUp6GRZD4uqnPAQ45phSYriXyIhUBQwN/WB/VBcf6ZmrFNENKVihDZ8+xrcMvIZNj1S1r9DdHfUioyezL3qsB3ZNi7GKvW2ZYfJqoeiCEPKFP4db68qUwAPzzPTE7R7ChmqohbYCG1ELCrDvwpAK+O+yagDgeZMRue+Q1JXCywDuX3/LAIulRAkmodzfdB1Exe5L3byggvglpKslOU7/BoGgjIaGTw/LZ1aMfkAjPkXhESUzHs1xoisFL2KEGlpqz5RHoxjiyW/8fhiSp9aS2qBxhjw8QeE= X-MS-TrafficTypeDiagnostic: AM6PR03MB3686: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: evAlqmjDqzi7cHvSuOf8kiW52jNuv326Ws5H4dEqbNt+da0OPZ1q9/YEljNwxJRcrMVkLBWcxan7nGDetyMgS73EYHj6yi1KBSzSdMUGsUZIomnUWySyQ4KsIbCWrMYGoEuNskW1/1imiSfDexFRbODCx1l5G8Em1yPMOxItUIvhorwsGZrOIX31C4dLJO0XFIjWlsuSLUJtD7GMXwbQKeo6RLmHsYWmHg6C3881CzzoLcvU5Rbpay2FIJTgNyTFA+uGWVBO/nucXZY1uQaG1Eae8q4SceS+iSoPQMmTBw+hC1rw68FGjJAUPC+0+EhnTOMVGpm0t2hBQ7kpC33ira/sy9wrBfQdg7ULWsM19ZlcY8JHfp8+u3TRBJIvlW8qvLwDNsXk3A8glOPgbRaJ6MOrCvsh9wFgmJ3tEzvKD2sfMtr7Ur7r/5b1oEQI+wxZIhcybS1vFWlhPUVEwTzqvs2Ujl4DO4FIQYPDFKAzESzBIrplPyGlh1tjg+KXRyOgp0uL7r8OW1GULvd1LuA3Ppt9CgtpZKMcMYoAUH2Woxykb7QpiL/CjXLV6AV9Au48p7eC9NvwCCwM9QlmddOaZQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hC3oqKuf7Br97VIJ+xxapoLW0PebnWNUgZhXM5C1Ca1jVaWHTbh6Wc0hNZbecpxt55b42Hzz58GdKP1L/DWVLJ7tZ2c3y1V8qZodpgJYkjd59GVKy0ZD0RCcNu8vFUx782oRom6PmTVyoQvQ3vOsU4W5ekB/QnCDuWr7rV7hB8MxnfceWrVMK9+ttsKOOR1U7RM3uAyNE//FtqxLLbHp5vfBSAWANtKF7zPPpRHuP15Yeg3dYdDgt1HZALypyE/rFst7E4zN9l+BuT5wxfy9eRW+JxVpjGvSrinc8sj8yUXYm2QmU2P+qJpsX7+yVO/TkBKhetOocn6LNCQdPM2qPkSD0QnBYHJMNwX2L0iV/4UYiMoXoL1TfydWAGMnm/Gg2Q0O3kUBnDwafdfHwFsS3TOTNkeMVSMc+FV9513/+61wVn4i0HSh9Z/W06tVN3FhoI3UTjFNxuXpU6c0PVIBXr1y+VJmtTcx6VfaawDmWzWa9sMTMCPlsSwp5EjAGcWSOf5IYyZ/OWMgL22cQbDn0/Bei3VG4MVsiDLmogw6ME6L0IM1YmsG6BmgmQmHS11+hl0iPu4krjgi3fQACFO1sh4py7I098qC1+MgYs9voGSF4o4aWyNAix3lV6k4GfMrnkyp9rCtKJVwaFGwvTsYrU3hkSkD/rxqxiY+yOEdqLR2kGJdZz3cuesxgrt0iEgwWXqTLxSJN3g3z4l16pHRvlQr3EQrrwGAw7oz1a0PwZ2rws1IhxJBvLZth9jOALwkgSzTDu1gloAXF0deUFoMQ+FoAJV3J0kQhH648Y4afNyIZIedaIqdkv7DyRzFMdeGRKqD1+yaQziJDQ6MEMVS+PcbsdzuLJIpRNWrQlcHGoD7Igc89n2JsnM+r0BrbLt1Jf8YTSDoMANR8/MPdghh8xg99YSm9rLI8StW5F8BJ8BeFgXUfqx4LYxc1XX4gnXkv+znqXHdOldrH1PbLllvqQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 18e71eb3-7199-4044-707d-08d9b85588a1 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:12:55.7252 (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 02/10] avformat/aadec: Don't use the same loop counter in inner and outer loop 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: L8wq9R8seyQq Due to this bush.aa (from the FATE suite) exported garbage metadata with key "_040930". Signed-off-by: Andreas Rheinhardt --- libavformat/aadec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/aadec.c b/libavformat/aadec.c index 72f4b6f7cc..a3a7664469 100644 --- a/libavformat/aadec.c +++ b/libavformat/aadec.c @@ -132,8 +132,8 @@ static int aa_read_header(AVFormatContext *s) 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 (i = 0; i < 16; i++) - av_log(s, AV_LOG_DEBUG, "%02x", header_key[i]); + for (int j = 0; j < 16; j++) + av_log(s, AV_LOG_DEBUG, "%02x", header_key[j]); av_log(s, AV_LOG_DEBUG, "\n"); } else { av_dict_set(&s->metadata, key, val, 0); From patchwork Mon Dec 6 01:12:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32063 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a0c:cdc3:0:0:0:0:0 with SMTP id a3csp5353361qvn; Sun, 5 Dec 2021 17:13:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJzZ8r4MiM+btgI/kmgIxMq8NruYOm3F1sIllMIENqcxhZ8cqEEJ9oUm/pSbrjd5pQziiLhD X-Received: by 2002:a05:6402:2792:: with SMTP id b18mr49437552ede.329.1638753196628; Sun, 05 Dec 2021 17:13:16 -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 dz9si20858427edb.349.2021.12.05.17.13.16; Sun, 05 Dec 2021 17:13:16 -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=lRPik2BW; 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 1CC1F68A48B; Mon, 6 Dec 2021 03:13:10 +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 7700D689F08 for ; Mon, 6 Dec 2021 03:13:02 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M57erf/bHjYxXCtA9xoqjg2M6Ju4wl+eB+WtqjAy37lMkI2XCdWzI/1RVbEjXVccSn/0WBqFZWxMhcFiYtppj03s+7gYBFoZAyFm9QJmht29OkOqfU1tY2ukpdO5IPsKgEoAe4ne1sk6Oygg1SLyXNxjlUXMXAZ3+RtwvN/7BHy6lDq5bg8Iy/c0hguT1whcxzB7Uf8m/rjsQgJs46zNdrdheLtFbkV56MSb2Xh1oYwWN6zExRFIZEkn0HDpXEfiwFFWdjIWUuvO/KGuszT8K6kMgmFnMfsJQr7sV2I93U0+k4p/pOAQJk8K28AD52/HD15PtChHP1U00mwx03S+ng== 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=X0vCr+AQxD5cml1ONP6HC5rOZlP0VhYvK6apJT4UMn4=; b=ffq6cUAy927o5bih5QJiR3sAklXKiCMoKqb0zxYutGqu2uRP7U9NC7PMy98T0NN2cdmANqkNzIrbEY+vpS451YgeSyL5eLXqQEwxNe2lZxOZmEkZGMO6w4NUcOYUAOFqzcH3gxh3S3Hfpgd2ELA4Hjtsb0syJ0cCc0G/A/zcUfqWFwT25Npg4eO2EeiIcoHBC/ce9XHDjnZeXCRJAFzRvif0EraSHp2ymspfS15Ku7vvgG0aAe7Q/G4KFM9GVRBbQQJktoPZbR6AHBQef+n0AOFynqr8LITK6xWdfXytVZK9+Wd2s1whQxyCxmZKXNSoIIWwZu6IG3yFu/DBfg3HqQ== 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=X0vCr+AQxD5cml1ONP6HC5rOZlP0VhYvK6apJT4UMn4=; b=lRPik2BWy/TwFx8G2ox56qGDpdGhDaQkPP4hqalo/9Cobz6ugFi/HP+2ZMG3/WATZVkWkVs6WSUst/1P96eSiu+COyniaIG9/Lgz55XjNDSPZ5z7k1ZaPzq7q1R+iWhMrmOwAsiiK3M7l79OTOjlZn7xgBjo6Rz7D+2P20LJDhn6eIAlnS/SdpBY3b+b09EEEMGzBWQwDj3EbEaYDn/vCWhsgZExMsMUacAKGB5zc56EwNskGvfLVH6nIq2le+pKlayZ3C6AMF73ufU3ZoSjM+p6ZVlrRwU7zjb+9sWuoMJhYL7XsBFeysvTy81CAN7EqGcON6aRCnR+Iap6G0hUQQ== 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:12:59 +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:12:59 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Dec 2021 02:12:39 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [K2T0zfUFhx/2ke5pdzL+CfU4gJBbWRkf] 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-2-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:12:58 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9f3f8303-5b15-4d6c-0fc1-08d9b8558ab5 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWqLpJmXNddFmQxwc0tuI0lOYkopiDOCdrl92V2IWrMbVnlHnc2TYToRjNRWUBoL7mxhjSp9aKPRIthKKC/Jvq505DvEPh4+qLFDuBHTDmE5er91A4DJZLFO3hcoIetu8mMDjZq0KR9CGJtfG34B46Gv6LlFYgKV9vYZ+w0DiZyvtDXt4vSVI7ER3H2IadIishhIpgIWCKNJQtKdEIq2v09KfYmqHow17yeiWhELk6MChSphdmv5NKHkYGBSXvCkfpW8gekyqftTbY3LZB3dF6zQm99FB3L3T5Xp6LiFylTuW57UNIeVtCayZrzd+A5i5BXBH/0Kbu8noETLGB5NcchYnh8gRQ0BigbrzjCbenDki8dDuS/lCbQTpN0SFweY8nGYnwvwsq2zB7Co6Gmu/NSeKA9PH+my2GxmOlbH72jw6GWgtBRjYdUKE41NLzrZEYeGsPdlv76kQtwHrJvnX6pSGuSbIuvf7xRfGDCs8MP8wak+tDpCGB7y86NFLBySCsCbDHy1Zf7lQ6iY7c3xchp4WotnCZJq5pUliKmVo7I3/2n6ROYtNIMPZx9PA7ZL4NduCj/klOHLdyjzYmVarFV46nWfLuHji7uA2V23gAGjP1s8pwlh7ZHV14QyM/G7mAXp80CpkYIbZN0G/4B6EYljIuAbRXakDCelm8LnnWzULXGY0atJZdOY26fJXAynUVYkhanUEDNlmXhoMzuqpWawMk0Tj4wxMg= X-MS-TrafficTypeDiagnostic: AM6PR03MB3686: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w1AHG+SVmZCjvMLNBKFHDeodNKZ42oNzZ0L6voifG2kFACz/ONV5GMt8KloYrg75snepn/TOifR83kVR4m7DVcuFpEh0lA7vEIWJshMFmXqPm+bpFnbVs79LhYKVfnsAMvjuyX7GxUNiiYKqWeTSgYU4N+qitNGjzQDtSEQZuxaWl+dGeXHAhB8BNLtMHYERDPwNBdr9mU48lzqQGUxE9v/7JJxBlZu2+ac5DR7O0QKJtrF7wU9kc6WHGXzr3eHVvA35O4Stbz1a+oIKGKlgzKICtT35ZKZhijs1wllcAtBFIsw/blQhSDXRer+5GqbSz1yWqMTfyOLo8InAuVR67/V+l7+lthg82H3vQg64OvnXsKYZemznaJ8ghsmYIXWegv8ASTuEhQ8LeycIXCf3tU81LHJuwk3XdqwrDCBigf3/OJuu4N44HqZhwdiNutRq+xw58p6XiOYRasv3XbB6nPWuABvxB7M0zhBesqJzw+pYyVeRtn8GAlZbFqJdIiK6YjQpCYwfroXb9/mSFAVv8popSkof8egEFq/YZ38uUWhC+LkvaMmckvZjT4Javc+E90CZPTb7xDo6iTSMr9Ft9g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: q8RLdUSMa0JzRbf2FSyV9l2k2P3TbP0qkRnGdVXJNruhuFVg5gE6ola7/a3MU/Fm+Jf6bsexFQvTKPc2wVgbEGJSbUpNSMmgd/ORPE4PGdrv++8dVUzqSxFn00OTSuJeo6rpw3pCjNAB/fx6WEJIrnR74URXMZAf+Q5rO7voWyzvybFPyhZrcoKrZAAJslwd/GGknxXTWZBI2xebvSqUVFohxZyrebKp6TLFpJeiFXAXnfUADEdeNHsPKsCOjr14WNP10dSPZIxbbHpC3UYjY22+Lixo5bm6rq3ZFQ6th/ItC+wLpLCpqzjn2FGygP7S/E+woSDukovRxLL8G+CHP8av+P4iBZYU2J8ceu4ptS0uDlHW8rxXlG6DTk/TqyB8NQRTrD7sUKhLMmAwPf/EYNBxHGWtKaOYWmudT5VOlIJcfyEu0eB7cOwlHZINFL5idbrckvpQ/9J++J8Eu+AS8YD7J4BdgWAglt0XhkPMkRRRjWwE9YPeSZ+KEdwa0e3MWTk34aMJ9Hjw7NPOKFoqI0zMadj+xYMNPjBOxad6fGsZ8mFDhly8vezes2wnSqi+isoCKBWm4fEzexNY8o9O+8U11Z18Wo0xCL1fLcP87NW42BjgkjsyqjLAa3gCd4Z8H4ps6BSTTq2+h4HqimJxVcL4FH+RRAHVOIrWzAIDp6pBFXEoHbIhfZr5PfogwPJytraVx8qbthj4wD8wYydfjUax/xOkoeLm1cobrMnaPwCoyhlESb0E4WkX3Mr5ssVMQD0FQiJmc/CrHf3oS0HDxbdO2TlvHLG70ec6IWYL55cSl4ppDFE9WByuP2/1rmkhRoj00J3a+pwzNJP61+o7N9c2DXcs651J+D+9zASK8N5jXyXg87s9IudKQoordEY9LRkXYUklP5iLZWgLJ3/fLh//IvmnvJCpHCQnU3ygfjpb0XO8/6NpX9kA8LuUDS2NeuQkKIJvSvEvq/ZDvKVrXg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9f3f8303-5b15-4d6c-0fc1-08d9b8558ab5 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:12:59.0207 (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 03/10] avformat/aadec: Avoid copying data around 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: p5TSVsEOnb7M Content-Length: 4102 Up until now, the packets have been read in blocks of at most eight bytes at a time; these blocks have then been decrypted and then copied into a buffer on the stack (that was double the size needed...). From there they have been copied to a packet. This commit changes this: The data is read in one go; and the decryption avoids temporary buffers, too, by making use of the fact that src and dst of av_tea_crypt() can coincide. Signed-off-by: Andreas Rheinhardt --- libavformat/aadec.c | 42 +++++++++++++----------------------------- 1 file changed, 13 insertions(+), 29 deletions(-) diff --git a/libavformat/aadec.c b/libavformat/aadec.c index a3a7664469..7e97120070 100644 --- a/libavformat/aadec.c +++ b/libavformat/aadec.c @@ -32,7 +32,6 @@ #include "libavutil/opt.h" #define AA_MAGIC 1469084982 /* this identifies an audible .aa file */ -#define MAX_CODEC_SECOND_SIZE 3982 #define MAX_TOC_ENTRIES 16 #define MAX_DICTIONARY_ENTRIES 128 #define TEA_BLOCK_SIZE 8 @@ -247,13 +246,9 @@ static int aa_read_header(AVFormatContext *s) static int aa_read_packet(AVFormatContext *s, AVPacket *pkt) { - uint8_t dst[TEA_BLOCK_SIZE]; - uint8_t src[TEA_BLOCK_SIZE]; int i; - int trailing_bytes; int blocks; - uint8_t buf[MAX_CODEC_SECOND_SIZE * 2]; - int written = 0; + uint8_t *buf; int ret; AADemuxContext *c = s->priv_data; uint64_t pos = avio_tell(s->pb); @@ -272,7 +267,6 @@ static int aa_read_packet(AVFormatContext *s, AVPacket *pkt) av_log(s, AV_LOG_DEBUG, "Chapter %d (%" PRId64 " bytes)\n", c->chapter_idx, c->current_chapter_size); c->chapter_idx = c->chapter_idx + 1; avio_skip(s->pb, 4); // data start offset - pos += 8; c->current_codec_second_size = c->codec_second_size; } @@ -281,24 +275,18 @@ static int aa_read_packet(AVFormatContext *s, AVPacket *pkt) c->current_codec_second_size = c->current_chapter_size % c->current_codec_second_size; } + ret = av_get_packet(s->pb, pkt, c->current_codec_second_size); + if (ret != c->current_codec_second_size) + return AVERROR_EOF; + + buf = pkt->data; // decrypt c->current_codec_second_size bytes + // trailing bytes are left unencrypted! blocks = c->current_codec_second_size / TEA_BLOCK_SIZE; for (i = 0; i < blocks; i++) { - ret = avio_read(s->pb, src, TEA_BLOCK_SIZE); - if (ret != TEA_BLOCK_SIZE) - return (ret < 0) ? ret : AVERROR_EOF; av_tea_init(c->tea_ctx, c->file_key, 16); - av_tea_crypt(c->tea_ctx, dst, src, 1, NULL, 1); - memcpy(buf + written, dst, TEA_BLOCK_SIZE); - written = written + TEA_BLOCK_SIZE; - } - trailing_bytes = c->current_codec_second_size % TEA_BLOCK_SIZE; - if (trailing_bytes != 0) { // trailing bytes are left unencrypted! - ret = avio_read(s->pb, src, trailing_bytes); - if (ret != trailing_bytes) - return (ret < 0) ? ret : AVERROR_EOF; - memcpy(buf + written, src, trailing_bytes); - written = written + trailing_bytes; + av_tea_crypt(c->tea_ctx, buf, buf, 1, NULL, 1); + buf += TEA_BLOCK_SIZE; } // update state @@ -306,16 +294,12 @@ static int aa_read_packet(AVFormatContext *s, AVPacket *pkt) if (c->current_chapter_size <= 0) c->current_chapter_size = 0; - if (c->seek_offset > written) + if (c->seek_offset > c->current_codec_second_size) c->seek_offset = 0; // ignore wrong estimate - - ret = av_new_packet(pkt, written - c->seek_offset); - if (ret < 0) - return ret; - memcpy(pkt->data, buf + c->seek_offset, written - c->seek_offset); - pkt->pos = pos; - + pkt->data += c->seek_offset; + pkt->size -= c->seek_offset; c->seek_offset = 0; + return 0; } From patchwork Mon Dec 6 01:12:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32045 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3912932iog; Sun, 5 Dec 2021 17:13:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJxoz0MQ+Zya/zz6bsOI+EWr5CTetRPmK9dWivDDQ/eDEDvRCH7IcUhmIr9rMX0KkO/20dWh X-Received: by 2002:a17:906:82c5:: with SMTP id a5mr41038938ejy.127.1638753206224; Sun, 05 Dec 2021 17:13: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 n8si21804266edx.93.2021.12.05.17.13.25; Sun, 05 Dec 2021 17:13: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=lDWeMrIY; 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 CED2E68A7FD; Mon, 6 Dec 2021 03:13:14 +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 9A06C687F4C for ; Mon, 6 Dec 2021 03:13:07 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YY4+le0VmzW6QntYcLHUOu20kB+R+VPmeSis6kYEdwqyGkhKCFEqsO+gM4JORnYvr+D2AJYAGWU6FWcHInWUX+i9OzmACmNcKW8CtKQ/moqJnmd8gGlc6FV5/fAdfEeg+v9Fip5QtegsY+7kfO+uIzjTnHpBnpWuslVU+2EJBnmEkOU9A9M/3GSURgdbGGPXTwF3tqPmekM8Gwez/2PPuGjitsc2fHGI5IeeTJGKdWzqwzdjJs+JhNae6sILX1CpEwVbox4+TNhmi+f9H1cIXdh9fzHR+xUTdJ4xITrBb/a1fgwKm6izpvZj1ztHM373SZIcT8BLApayhYiCtddc5A== 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=G14h9ALTDs1bD93ieZWQlStNkf1Zwmh5F5rZbeIWzr8=; b=UCgbkb35h0GxeTw+as+x3MHBHDBx67bxNzeGk51ES7gcCWgKhn4/oN0HIRiyGnA5k1PX10tGrn7axVXstQdsVR2IZFQ4yW/olvkrNghJnb/dvZiOyqPEkkNKTidUe7mo9g1wH2zuGASNmXBCZBLU4kfD22gC9+z0SjYhpQxEG3PECRWN23WSqzbY2vtbX974x5ENTp89wuiLoJB0/7FYLkbYzd/CL/TP46LiXaqVRKM+01D4q02YX5JFnt3z8qeVIVmp6MY3zroxEXSSkrLHPocU8zg4qsy0CJyrzb/lodxldTyRIk/Kjfo3xEkriuc8XdKUI3g2OYgPV4LOF6KAxA== 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=G14h9ALTDs1bD93ieZWQlStNkf1Zwmh5F5rZbeIWzr8=; b=lDWeMrIYYDSJuSSEAGZpvlUExCiFBCoNZvRfpwn09r6aY3nG2x44o+g2BPh4je3vkbXQdQ8TX5YHKLajv0jKUz/GdyeO3looIT/UUuTjj5764XyJd9jJvSIoYtxMBY5kw6Vdv4+oFIA1tJLw0zyzal/voro6cH4TS1hIMC5fG4sLxN3SBk7r1NhLs07u+N1P15//e004hGgJBUZKc9mdyFSbRWiTygnv7hwBXgFZSSkZwA10POg8n38OMwQzP2ICn1KauPM9r1bWj6zfqIQn+Tbp4NzIW6dim5BCLdO6kWqj7BcYnKheThRZSRb87L7rIFSynOZDOqEM8GnFLkLF9g== 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:04 +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:04 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Dec 2021 02:12:40 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [dItAGfZrATEph40Dp6fUgOZxxd/Pc6Hz] 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-3-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:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b184c985-b57d-414d-f491-08d9b8558dc5 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT2s5ZWgpZq8Fu1c4CoKhX6pWEs0qFFUe/lwOFTmmgoUVKiR8BpCd4z29KNY1gJgdxBlkJAT3GiGfHAzbTY28AtdHPZ82Iwv7tAaGGxMKjvNkvhvfBwaXXuPt+3K2oZR+q5Ka7uW2/PN5DAlU69GVyYP9zUGWR1K806VI7LS18E3sa5JqV29ZjGdCHSVVHRvnqT1zCjiO2s7dmUx7vINWa7Pf4V36B8508cydB/32ZYLC1zUH0ZDZWOLFxzQNKrkcS+ykq2/Wr8JHqMLSOCWqRveeDn1KMTm9jJLvqpKhDl+k9PXMTb1chdswWX5VkyseJRtuOZ1X3kXdETg1rZKuDMjkKALKMaCcv+y11CHlmFp1xwZMqH88pszqq0fxPXTsQ2RbCa4EEvCZYYXkBb7Pc/VvJ4vxW90OB9vm3Kvsnkng0TQbo5hal8qv/4fHxye4DkE6FVHVVjPdrZ5cFPm7+asfwHgTfVSdjnHMv0SVPwAf/03kit5UJGm+qFT5B1J7R8FxZO6cJDzHnc2AZjxa6b0LQUhFhI8+8BTK/EcWFDBji0nzclKzKX/izkUnX+Oa7RtkfvRWgZJ6CuB8sU/5UBCwjyj0CDZNmQSxOBvihQPCNEfEQ5CJ8TvYlHLcsdW9PoAxY1J6Lw/gURn6azVNO5evGvpHDsHNdpY+MU5daVFtzdr7BtYthFiay6eB7bpe6ht/NIi+Jvh1q1bPE1R1r+uczrPGWYukYHQ/GFj4b4Je5z8nYobVkZTrlTgomC2L4= X-MS-TrafficTypeDiagnostic: AM6PR03MB3686: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WvaiHuXUNQnp1uUlTEGpW5E30hRs58XFt2t4fJLftzyMQdDoCDDQFUSrruvqeRQ+C+KO3i5wiwNPrLRA2t8m4YZH68HnTs1M5IVsIglYvh9dV+epXPt9YdWSAfi1OcuNoHGO+Pj+dxIk+IuU/EGkldPd8UL9MLRe4OjQG3kaXLUSjtSFfqpNsxA7KKZ2M11iRUO1wSQHzU5fhMEpHMG0A5vYDSph824J+IfAncMst2hlmTBP5zSZabEHer339SLijE2D2zRRJ7DkOSdGeMsmxy3mPb0vdvZ8VZzv6OpUIbMKw1dpB7K/flmiv2jBzxbbUQfN6G02a3JPiJxwYv/US21ugPzNPLoGd6DmabIarKtnTleG/o06/2VmZFILFnDytpmT7kYPj4VxH0d1J6KlPP056bc+MuOvXuFrGfj67oEnB3FxV2PaK/6lfAWpfZmQ9sainog17+RN61Sg+lZmR4Wvs/Br3I6jutQHaOHl9CapLRHiOLUGBXXRQiOJz+3uBZloJoqAQ/+TnVEyTN3Hr/q5c6ON2+gUq1BEAKnCMCGYUNQuM3aZmrm+tqKXVGM7p8J+wAs9+uWFjV9AMKAknw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LJMKBscDGuKFJd1AvZsk8E0VBtI0/2tks744Glq338qHTv7/Mw9RpbLdBIy2En1tylFZjtW8qudiedGFF7RV8+jNXRULsXLanuSIlXBusSGciP3t9fURxxiMGJqGfelySbdzFUqTaDG4vCQGaTABgkeVX9crM+l8c0oogTzfruGSA89jwOL50GXEHS3G7j4RFmb0P2xl12lwpnNtDe0R5e8lsZMl5G8h6DCWpeOURZsahiq99han9N5juBB1NVPdqsMe8kgVOodxdunFYeyfbBjj7ff57CKC6kAt/NusUtdSc+kFzig1kJ/O7bDWOk5PqGmwQeutO5G1eOknITSMF+N/vKf94SYt3urAa8NxRyBgqpo3CGIhf0Ce7fkD/UKQTTOxDWBBHWYBj0PKLeJf0tPybKScYUsGbmK21l0sm8Ybwp/7Fw6n+IMLZLk4jUWiuAL7KCvMHAwsd8VTtBc1gMZReKKT2m/YwRfQpyIwJaeQWnCcamI0gchy01mW/KrM2FKNi2M8NcZhYlFf5+b3h9HvYMm41dj2RsTSj7bsRIJ/NRffpATEt3yq7gCLVhhiqozaGYY0cCqrZrl03hWtMGlZEaD730ytZJMH92uk+7H45NSD8h9JDBxla91cIoFDR7RDxX77ZjbLcerBtPa9ZFHBJC0M6XXxxQEE5Ut2YS8dZvt/FtZOKvMnfw9b1zKUj0A+KzpzilVurDQbjfjWbgqcl67b5VrQ7uxqQohkki+23EdlQp+XYBwthR3MPsA1AKnF1TxZDxvsy9ZXCAZta9S+T0pHPfcCsztx8hIsZKi/57o7zJoDCANRxA49eZez9/IoZ0ESpHdJaHqotbqXJYtanzlChrpJ+KmYRSIu/tu1EO641AQbSE7NO9GdBtxZYzo/YrQ71KHFWdtikyArQkeTsV6+qrqYo+evzAo+D/4V8FFSHTJBrs96a2v/O+/qkOc9zIlgiHwdvQY8O4c4PQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b184c985-b57d-414d-f491-08d9b8558dc5 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:04.1801 (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 04/10] avformat/aadec: Don't unnecessarily reinitialize AVTEA context 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: HKsejqVMsuhv We use ECB, not CBC mode here, so one does not need to reinitialize the context; for the same reason, one can also just let av_tea_crypt() loop over the blocks, avoiding a loop here. Signed-off-by: Andreas Rheinhardt --- libavformat/aadec.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/libavformat/aadec.c b/libavformat/aadec.c index 7e97120070..24116b1f70 100644 --- a/libavformat/aadec.c +++ b/libavformat/aadec.c @@ -173,6 +173,7 @@ static int aa_read_header(AVFormatContext *s) for (i = 0; i < 16; i++) av_log(s, AV_LOG_DEBUG, "%02x", c->file_key[i]); av_log(s, AV_LOG_DEBUG, "\n"); + av_tea_init(c->tea_ctx, c->file_key, 16); /* decoder setup */ st = avformat_new_stream(s, NULL); @@ -246,9 +247,6 @@ static int aa_read_header(AVFormatContext *s) static int aa_read_packet(AVFormatContext *s, AVPacket *pkt) { - int i; - int blocks; - uint8_t *buf; int ret; AADemuxContext *c = s->priv_data; uint64_t pos = avio_tell(s->pb); @@ -279,15 +277,10 @@ static int aa_read_packet(AVFormatContext *s, AVPacket *pkt) if (ret != c->current_codec_second_size) return AVERROR_EOF; - buf = pkt->data; - // decrypt c->current_codec_second_size bytes + // decrypt c->current_codec_second_size bytes in blocks of TEA_BLOCK_SIZE // trailing bytes are left unencrypted! - blocks = c->current_codec_second_size / TEA_BLOCK_SIZE; - for (i = 0; i < blocks; i++) { - av_tea_init(c->tea_ctx, c->file_key, 16); - av_tea_crypt(c->tea_ctx, buf, buf, 1, NULL, 1); - buf += TEA_BLOCK_SIZE; - } + av_tea_crypt(c->tea_ctx, pkt->data, pkt->data, + c->current_codec_second_size / TEA_BLOCK_SIZE, NULL, 1); // update state c->current_chapter_size = c->current_chapter_size - c->current_codec_second_size; From patchwork Mon Dec 6 01:12:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32048 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3913044iog; Sun, 5 Dec 2021 17:13:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJwrqCDN2RRruJ5ZEADKd3rUXJ8sh1FkUJaHX7OnFCkglId7oNWp7gtJtZ/yJGZNop0kqT9a X-Received: by 2002:a17:907:d17:: with SMTP id gn23mr40831555ejc.25.1638753215744; Sun, 05 Dec 2021 17:13:35 -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 do16si19232682ejc.357.2021.12.05.17.13.35; Sun, 05 Dec 2021 17:13:35 -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="R/wdTV1v"; 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 DB00E68AA67; Mon, 6 Dec 2021 03:13:19 +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 BD06A68A78A for ; Mon, 6 Dec 2021 03:13:12 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OHMxi4ZMgG2vo9K8rexT34Y3pzegCY9NjPFPIsyssxOK/odhDoWFLklPKAMMDYGDOHLV0U7sRHIP+NGGr38dKVXYY1JMTRU3TtFky1gVcuaK3QcgampzT9hFTKRyD8nyKy+VPJpGRyz3jQT4KxDWGTmCnaantM4TuQu2jv3rBf0fW7vzq2SsIpzvT5CdgFDypr7kU0PnCXOr6MMVg+rjiVAhCRULsJFHr08ErlTI2D4vlFcj4tUAxbfvS/IKWceuXL7CwfhYLhXwdN9IlWqHEpx6xeBMgTT/G2te8c0vnrjIbRpKV3pjoO1Kv5xUEjb7WSSXYvuoAC7TG6euAeBZcQ== 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=NQrfDqhlhOFzlj+Fpne4x/j1tTbKbuhwSdcqcrPwFfI=; b=ZsymIh1iozY78PTVtvqB+efbwQq9r46FM+2r9Cb/zFOguZr5f15WPMzR+26Oask4Od21jJ/vYilQ1rEuOUy4PzMXCwQecgUPRY3Gq3XUAzjcKcTAqLuBu/Iju0BJlRfbLz87nfkOJYJ7x7IRU4q3flS8GdftEil2QTEhkkYywVUBVWuPrR5DSdGbHnIaHir6py+u7I9DWoDo1R4egZyeZTfZIZzOHmguc4hsZn4bNzJYxhDacVwxKZR2RchqdWeB9pAlcptlALRxH0Rl1y0OHGBaZH5ZwYia8nPHoLUKciiAuM/hG/kOZrieZIchHg+SimIAvunSOuh8+8wDn7Ux/w== 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=NQrfDqhlhOFzlj+Fpne4x/j1tTbKbuhwSdcqcrPwFfI=; b=R/wdTV1vZBWIMvhloiUjH6KbJh+LTudzGWKpYavO96AJ9wIZzuo057LkP1JWUAO53KHeZ/+x6Vj+bE/KEtc1PPzzXlbQgyCHJrij0NMDDLc9mASZP3JwCOTgwTFb6zvxw/EV4nqRJdDG5sDc0LI2bHrn6S+cGSUY8D8Pky/HYHLMX4lR8HLqW47KnnurmlErp9YlTgQlNzW4dcuyizj49uI6Mvz1MnTmR6XSv0L88vwVygUUS4h5xDoXzIj64VRQoNlC3hzmDtz+9LhEA/twboOkRAKnMzSuNOzdGGxPULLm2KqYcRX67DFOjvNSyqsHzUEAytG2M4UONZpyBYevdg== 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:05 +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:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Dec 2021 02:12:41 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [dZN4BIX7pXRN+JhsCrBo3UMzYCSOhgNb] 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-4-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:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 162c98dc-99f8-4872-543d-08d9b8558eb4 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWqLpJmXNddFmQxwc0tuI0lsNYdo24ZJVsamWg5s7ZeX/SS9XP5KPxG3y28yRf+qbGSYAhOYFFO9pz6EEM31xj7XeA0JUmbrnNbK7VFElJFp1gY2QqZxpw9qQeVpEJqMV4pu1B3RGsLWW5HEc9f+TOg1GuhwqsAEC4nedTDehDyuigX1UQxbIzd5MYqgi1duy+v9Sx/YkZT6TgOiIKh3TuU/LPwY7XkrnSig9vVSO8yfKCUYdvvApyaRoLWOvSZlOyQEYU16F2oW7uQwqXRxoGHPT3cNLE+o+gDMWTLjmWy/0VHmi2GKL58mZNd0OYPyM9BTochcxunOkP7fiFfTPANgUW6Q3Tbj4aSOK8nQOnWD1ga3SX0EPjCuijyjMTckmQgYSirnfdrhAmRzVL84HBYF7JwWEGqKAC6/mIJ8xWpnpIxSYmzfTjqfwJvtMPfWG9JYBRnZW3kTPKRdJ7uichtK6RH6XUxovjiJRLdwY5VRPicRdtyxFYp+DIEuP1+T1+ap33zA7kHbFNShyOxEWBUObOcEfLy9D+0ESYjI0KkzeVCZVbKqwSS6sBZzwbHtc9KlXoHyZND3WUh3g9hd96Hjxr18cIEu1cGcaSfniTbkD8ZUPwB6nSpEXdIql/dKFq5oe9LTct9daoU7UKFgbMjC+KXGgbnTuTTNZ7zCQN+iPSCC0BMrX0wAPFq6wz4Opgd7BJmPibfkEiXrAB1e4W8CBT/nM0xTSE= X-MS-TrafficTypeDiagnostic: AM6PR03MB3686: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wXD6WkYnOuuCFudinawjG+hylzj9jezlkQCnD2hEXNRWqsSgwznK/PmYlQmwLkRkfRslKgiQ1jH4Dg8zu404JAI4IrirfDkUee9+JqeAC3bLaC8OWKxqn626/vlHPGJqMnkQQXKqQpUtcsJRFBSMgIC6rsICjWX0OAdeZ41N7WZZ8EMef4jY0u3EW8tWwX+CuPAf6T0n3o8AqnR5JJMNRCJjP/657/07xLuVaxTrIyjY6HmdIHe5de8zmOoPDaazsh/tarodsBhce4GZl4gnYE4m/KQEQyRqH/K8kO6d9jSFk2+z53YcM+r3y0MYCQa0JevBZXkpFGT0ZZAAGtRd3/bz5UtqVVJUyz/tcXBzIO1Dn3ZZ9XRSA0hLsvobrxRwF95ULE/7rqR3dP0DIoRs9osowybJPMDIbvzK7ahYGPsOu1AuO6h4MZqEri8lpX1oJstMpRo0eFUzxtFlQ3SHkB+9balncxkY8l4bptGh+/nP2JC9IT2Fa3+c8yKhawyenmt1KPPq8aMYGsI/2tmo8m9C+ldinT8pnmwjncZfOXUEJm+hhouJ0O/ScHcgPc20DgWBuN0XSrVv4AXeTXROEg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JtKkAhhkRvpTx9pUiSptb7wqbXYZlRvTwiMsgBZgfoqTDLSGUnxeoxUrSjUbq2c0iwWB7BxCpTbsobXetsEvrPuhypUxIDrWevi9UrAUhrRWFMxxSIORD3oYWDELWXSnttF6spptw9ibOhJAZ17kYano5WgKWYr35xlMNwmP37lqVV50m17MU0hdxWv+MHoSZUUUG4qIzuA6Ku/feD1qJ/88Mu9Gjuty+xy/9slEajw4q2gNfCq0VW8pTscHG1T2h0u1BA4iEgWzi0Sbt8mwQiIK/rrM/oInXjygHG/MPKFZWnNR75PvomBtolKhnkyC7SPG9kxY0HBGw2/b1d2o/d9XWNMhkZUsg2jFXHM5v5KU/Qbd0Eb/lv+PbkVDO8W8I9Bnx1wgunQPfI1fotxDmf0EN8SRjEGTfCotv4fIgfYGkHfDAewraxp+NRO/8vuVNolO39ikjDCh4hiBLG+/WJXeG/k/wHKmf6x8oRP3enxeS9JwSRf0BdI+25iUMZk+pdvn209W20+bXSF4clSnZGkJCbi8Ga6ambYCjUsZmxwEDvR9Q8LIo6mFB3kp+iTF+NbDIKRKd1/1kpImwJ8Sh+MOWrvINIjDKyzSRNRYdpRslF0uZCt58tdur/cnAx/5wrVvo/pYiYcl7rmb1szHcpemYNVONN97LhKixvOvFuRprOyDUbAgCYQe5tUqZVpyCjEFPa7aQQvEBOQMh+mea197nNOvh69pP30m5yKJQV7t/3hfv508LA7XGE8ymXoiMSHmwNNWDwgChxRpLzpJTDC7Tvvo5dSJkz8cwjMt73VyzuC4PQ3DGwbmnCixEZcrUVI9xL4gIYI4kElhjl2o387B9NW6zVOGBgIIiwOHcVkeGays4FaWdo6bUnhI1vmVZ2CDZvpeoLm7Vh3k9axeEciDyDEak02lR6Vby8Iy/UReqviuMBh89ONmYUBhrWGVn9reVOdZV5Cu6hA21mhMOQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 162c98dc-99f8-4872-543d-08d9b8558eb4 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:05.7280 (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 05/10] avformat/aadec: Simplify deriving file key 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: n+8G+thSTnFo Don't use different src and dst in av_tea_crypt(); use in-place modifications instead. Also let av_tea_crypt() encrypt all three blocks in one call. Signed-off-by: Andreas Rheinhardt --- libavformat/aadec.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/libavformat/aadec.c b/libavformat/aadec.c index 24116b1f70..5f49a543e4 100644 --- a/libavformat/aadec.c +++ b/libavformat/aadec.c @@ -71,10 +71,10 @@ static int get_second_size(char *codec_name) static int aa_read_header(AVFormatContext *s) { - int i, j, idx, largest_idx = -1; + int i, idx, largest_idx = -1; uint32_t toc_size, npairs, header_seed = 0, start; char codec_name[64] = {0}; - uint8_t output[24], dst[8], src[8]; + uint8_t buf[24]; int64_t largest_size = -1, current_size = -1, chapter_pos; struct toc_entry { uint32_t offset; @@ -156,19 +156,11 @@ static int aa_read_header(AVFormatContext *s) if (!c->tea_ctx) return AVERROR(ENOMEM); av_tea_init(c->tea_ctx, c->aa_fixed_key, 16); - output[0] = output[1] = 0; // purely for padding purposes - memcpy(output + 2, header_key, 16); - idx = 0; - for (i = 0; i < 3; i++) { // TEA CBC with weird mixed endianness - AV_WB32(src, header_seed); - AV_WB32(src + 4, header_seed + 1); - header_seed += 2; - av_tea_crypt(c->tea_ctx, dst, src, 1, NULL, 0); // TEA ECB encrypt - for (j = 0; j < TEA_BLOCK_SIZE && idx < 18; j+=1, idx+=1) { - output[idx] = output[idx] ^ dst[j]; - } - } - memcpy(c->file_key, output + 2, 16); // skip first 2 bytes of output + for (int i = 0; i < 6; i++) + AV_WB32(buf + 4 * i, header_seed + i); + 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]); 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 */ From patchwork Mon Dec 6 01:12:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32065 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a0c:cdc3:0:0:0:0:0 with SMTP id a3csp5353937qvn; Sun, 5 Dec 2021 17:13:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJzD6z3imTa0ZYPw0eHstd8LdJgcDMHl0xkINBGia4Ol9//W+N05/VOKHPYB5OSZg31vkoB4 X-Received: by 2002:aa7:c155:: with SMTP id r21mr50359892edp.124.1638753237024; Sun, 05 Dec 2021 17:13:57 -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 s2si15432656edx.402.2021.12.05.17.13.56; Sun, 05 Dec 2021 17:13:57 -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=orzC0Itg; 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 12C3668AC9C; Mon, 6 Dec 2021 03:13:22 +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 28DEA68A78A for ; Mon, 6 Dec 2021 03:13:18 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QxFwVlhqxSt1MqX5LogHymWqlKxkyeBR1fYYmqR5PJSa1oIzFxXmWyeleAffaMitZt4ikRC5U60w+X5fWDR7eKTUPp0uwnSFJZ+aAVMO3IXjXOi+yguhsxvEk1jcxlBOTfyBuHsuAaadE7hNUBrBU4xLMZYlL6gAkfgOBn+13QQHhZVt79EquLGSjm6mgVfOLG77ta0RQfhqvcnlsnhgwLsyo26Tx5shh8X77hbVeRHqv/3VL+oEU9lTl9gsjMhSYdU5YLI4AS4im2I5JF5dN33PWl3LM4FCNgRMq82dpZW6U6/BC/J7f6gC/wXzgcffv+ZaVgS6yo8oZGp2h10UoQ== 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=WqndYr+5hFnio7+eGNdlbFq7+UBppKsrkdy/pKeC8oY=; b=GJHwixcjnUEJNdGpJtIjRWI/z7ggRV99nppegHHnEl7NnGubgbGAJHCxC13pDTYaEAbQ6xBHteelTDzFrhS4ipp81nb69h5MImF4SGJ2AtUmpLDuoROZ4KdmM50I4F84hsJioGFOxLob42dUV8up+eKSgNZdTBWJXNZReygJn8HYnsQ6xi6wvxpumCLJsCMUV5VvcKS9aCiFiwB4o5RdmOBt+90B9pigCl+iS42zZ8TrUwSZnxyIiN+2AQdpED6ZLOjwvEn3mqBzNV4mqdEdBZzUd6WTLZ5lC7LmD+nF+Dc9clU4GXAgnsA39dSb31VGBMiyG6g5nWWQtXiH7Bes3Q== 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=WqndYr+5hFnio7+eGNdlbFq7+UBppKsrkdy/pKeC8oY=; b=orzC0Itgs1iZ6TesceUSfh6rkjtCggL1WjWeJixPdywCgq43dXRfcc71X8dFizjfcIhmEVCNFCW5QthX2OSj6knN9g60Nac0nVzZZdAsV+45eXHQN+Ilczzib0VZOMMHPu131q1S7NBi0bJxS44PD9zSn1u0rkYrrV6J9UXwk5jwRP75s68Xl49tuqLW/LlbDI+larzWI4RlNZpzHl5ET7PJl93zUK1PIQAH7K6pefJ0PYiE8i2RolGjWP+MhFfc0QLLV9rqudFkKF0092e5SwrS4BQu5sUzGIRJtYJfpDsxifRTQQkNoxLyC5NSVRVck/dGqcFTljgyZlIPszaNAQ== 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:09 +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:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Dec 2021 02:12:43 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [znf4187twsDFkH8cPZIiWlzuIMto0oiG] 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-6-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:09 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f47bc581-2db9-4d38-4dd5-08d9b8559132 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT2s5ZWgpZq8Fu1c4CoKhX6kH77AbLS0BCOdkYpqWbyrFXpU7hu6JzlAnHvv4pOuelGC7hWnLcSPBwXJ27SBAKtDGTJhlPEeIiq8g2tpsO0zacdIc23+d0nnzjFOx4NhpFa0BrSdoopK3Wt/ffPrAb2GPWeJLITEMi7ftaLJ5djYLYFRQga+ElW4c9o7KZZLYKlPiwkeKWNouU2Du3g8asTrQNle3KMVdVZA1ug0/9I+hvbDkHtQ+dk6xnQyJ06fcWMW1sMUfN80309sND2uZZZeSRddg7Mbn9z194y1KtkX4C2T0cF/d5IJuOvnsRx1PlHLGx4SENVzfLxbZyYVZx3rGpXzwEqnEE27CbJ7FTwCYVFlDDTzrUeUqky91hIOmfrviRiFn1hwv2WnBSsfMzEm76p8P12AMiq0976zqSkKsB8hlQuuETw20+1YJGD8KgTox6KmsX0CLF1XslJQ6R6+cwCp8f6ve7wGusZ0l7RGdggXq/RnFTyO69NZ7rLQnwRk6RjW7DMvFF5RfRnd1Fo7E0oHJq+A4Flm45BsE91+n8EnR68PS9dJo464CODh1rFi+qN6bz31utc4sj9LHiby0i6IsngAGb0q9Jthre3SDSfvRY0enPruJKxpcVXZbMk4msLDAXxIlzbSh6diXVXprMgJuyYkab+IaLekrKwxPLrAGCt2UV7fs3SpVOn+8yTzED44GqzONKz8+aPcGIhEV02kGrw4u9ShSfgPXfw7V6i1lvRo/a3YfJIcKxdl6o= X-MS-TrafficTypeDiagnostic: AM6PR03MB3686: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FgoSkNcstGSsMug7wdSEnQtoSDn3qJl+48JLdHpggs3OXvNrYCI0cwdGwRkJiQfhkOiyMVVvte0VhivlOHH8xV78ksWLnBPVvK2sBqymmeW+wvmN2NAV7uDngqcEOYgw0ozWwtUQ5V2SGEPifx68mQs4f8NrD9LPdtG4D3KkYqIXFwjfT5l8lrHHGmsvkvEId6sRXehwLH6xssT+Y0gN7ZaCKchbBQapQMVCMj4wKUZxlhwhHQ5arVZrfSW64DFqJ3kOgMZaz79ltn97entwCX2ckT3EC3+nao/x9XvMoQhkpLJv84M4u8EQAWMRz/9eyx2Aa8wJTmPZ9Yj+K31tuvXKwBTaE/WsuFbAwAWOSP3Hf0ByBHZeSFrhanpTfKNyNCkH7Zokkq/QT/t/XOZISkKgtgh73DedIHWI8zHU52RScuEnDsM8uardxzESz+Yj09DWmG7U5txZ4wWdrmo3dn6YKy+fNaTbfHWJEFGnp4vqv408DlyGZ/UyPjDIBp9ZWK3BagCFGwTyhzsCzUtfTsYr7KerHSaxBLG0SSbaQLZKBB2ZQunkBhBXRGkzTnrSRsO1BW2dXxuwILApIdNJJw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: i3UOj/qPGvbY7vG6zvGVNQdUOY1Vn3Z+PSWVbrA2tL9MBx5I/xC+TkT3veLNxnhTRbxULYK7FUtIpHEPGjZ3ScfbS8xnGx6GV1TWdpOEOq5Zmm4gaaEr0xszkpncRyDsOj+40nRcmKGfzv7wh48n7hRny8W1JT9wd2tGuHzBMH67ZjZ7LKOquMY/f2xdRBuy1wmLlrjzbTcd9Ig+LK83TgP/Jk7XgA0ZIpIFAtItN2KU87DwEyzO/hoj8Eqt7770MOONGUe9TILRPmnplRGOtEWfbB27FvPdTNOcKEBIXld5YzoMEWLD7dP0bUocEnHaMPOR9tpkVkXcUSRITqPOmK1YTvKKIoIcFdORQMfO8BT9BDVAHaJz2l9UeNCcGwIz4XvmL/jYfT//faPP9l2Ex/DYgS04DfQXk+qp/PyH8EGN4rJgESEy2dZAln6nAj8Ce9pU0EZPNJklu3kPGgwiPWJJKNnT/x5eJXnHo+Ee9tgwD126Sh1h1dMC8b5wb+EzK9p+aYxgJPLnB3jezgRSXzdpvBrsoeKvIigxoVHfmg8vaKnbEHZyywdU7CoYsQBjob8hxoUUGRTulno7/C6lynU8q+p2gzQuGcvMi3GeGu75DJQOch4qBakd5O/YuRRykd/ZMiHa36wFDzNEYPoeab7UzgoRzfmwB21WF0eI4TnBgVVpH5Nos5OcicXtPYtulvYzRIC/wIU8gcISgd3JB76cF718HIPy/czWow6eSjjdoqRu7mvzz0/HW41lSmNjLhE4ttu+dYRfOhVGg8H9f7sbXNrkUH48CHzLnYaa1paueEijeZEZnqlYKVki+ZK4JQEWhv5tkYKm+0fMHzb3DiyGpSnHKwXyZ3LyTsQSPm2Q6VZBsQNJEOrVFeeYL0dmJqjGW8G14s2gimGRIN62TKDGZTuuoGO7kcmAklPpcSSlNsesQ//RKaoUO5Qq36t97mzP52Mp/Z6IV5E/wg+lLQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f47bc581-2db9-4d38-4dd5-08d9b8559132 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:09.8922 (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 07/10] avformat/aadec: Use smaller scope for variables 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: 6vuyp4zxtxka Content-Length: 3310 Signed-off-by: Andreas Rheinhardt --- libavformat/aadec.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libavformat/aadec.c b/libavformat/aadec.c index 840a9968c6..b8a5428f1f 100644 --- a/libavformat/aadec.c +++ b/libavformat/aadec.c @@ -71,7 +71,7 @@ static int get_second_size(char *codec_name) static int aa_read_header(AVFormatContext *s) { - int i, idx, largest_idx = -1; + int largest_idx = -1; uint32_t toc_size, npairs, header_seed = 0, start; char codec_name[64] = {0}; uint8_t buf[24]; @@ -80,7 +80,6 @@ static int aa_read_header(AVFormatContext *s) uint32_t offset; uint32_t size; } TOC[MAX_TOC_ENTRIES]; - 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]; @@ -96,7 +95,7 @@ static int aa_read_header(AVFormatContext *s) avio_skip(pb, 4); // unidentified integer if (toc_size > MAX_TOC_ENTRIES || toc_size < 2) return AVERROR_INVALIDDATA; - for (i = 0; i < toc_size; i++) { // read TOC + for (uint32_t i = 0; i < toc_size; i++) { // read TOC avio_skip(pb, 4); // TOC entry index TOC[i].offset = avio_rb32(pb); // block offset TOC[i].size = avio_rb32(pb); // block size @@ -105,7 +104,7 @@ static int aa_read_header(AVFormatContext *s) npairs = avio_rb32(pb); // read dictionary entries if (npairs > MAX_DICTIONARY_ENTRIES) return AVERROR_INVALIDDATA; - for (i = 0; i < npairs; i++) { + for (uint32_t i = 0; i < npairs; i++) { char key[128], val[128]; uint32_t nkey, nval; @@ -121,6 +120,7 @@ static int aa_read_header(AVFormatContext *s) av_log(s, AV_LOG_DEBUG, "HeaderSeed is <%s>\n", val); header_seed = atoi(val); } else if (!strcmp(key, "HeaderKey")) { // this looks like "1234567890 1234567890 1234567890 1234567890" + uint32_t header_key_part[4]; av_log(s, AV_LOG_DEBUG, "HeaderKey is <%s>\n", val); ret = sscanf(val, "%"SCNu32"%"SCNu32"%"SCNu32"%"SCNu32, @@ -128,9 +128,8 @@ static int aa_read_header(AVFormatContext *s) if (ret != 4) return AVERROR_INVALIDDATA; - for (idx = 0; idx < 4; idx++) { + for (int idx = 0; idx < 4; idx++) AV_WB32(&header_key[idx * 4], header_key_part[idx]); // convert each part to BE! - } ff_data_to_hex(key, header_key, sizeof(header_key), 1); av_log(s, AV_LOG_DEBUG, "Processed HeaderKey is %s\n", key); } else { @@ -195,7 +194,7 @@ static int aa_read_header(AVFormatContext *s) } /* determine, and jump to audio start offset */ - for (i = 1; i < toc_size; i++) { // skip the first entry! + for (uint32_t i = 1; i < toc_size; i++) { // skip the first entry! current_size = TOC[i].size; if (current_size > largest_size) { largest_idx = i; From patchwork Mon Dec 6 01:12:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32047 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3913533iog; Sun, 5 Dec 2021 17:14:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJwFCT9upWvUTsBny7T/sNwFhvWgdQf6FMyn+/1/EfR4u9rp/MpOOH8kh7V53gPmBWFHQ9ix X-Received: by 2002:a50:d594:: with SMTP id v20mr49756970edi.401.1638753246828; Sun, 05 Dec 2021 17:14:06 -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 i23si17183235edr.261.2021.12.05.17.14.06; Sun, 05 Dec 2021 17:14:06 -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=uJuD+KBD; 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 CE22F68ACF5; Mon, 6 Dec 2021 03:13:22 +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 4C7C468A83B for ; Mon, 6 Dec 2021 03:13:18 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ok3Q+7b36Rr9/BRCZW5ThbusiUgUg9blasiCHv0GfDxhlBw2krfom9vKe9/5B9bDA+u8mA9lcy8U2xd6yH58Q66K8HCawgf1tIg4m8KoUTNuYT8ak86lDHeaC6io26s3jD+wBiyqDbvcUtVFTZ8sz0jtJaoz+FUMKeSwEyq/itgMCXBXpvf959wH2Izw62DQ4mmX9LFgP52+p9P9+KlSyzQKV4jOgpJWBDb4XTEYqQq/sYbRhXpm6d2nDoj9ImpzEEpVvmrYkC8sJ41Yo8C/Ph/EjRJuxSyfKVO91ClqdFQ+YFGHavay2KwYRaSnhbORJcp1bHEDIs+NtA/iEpipjw== 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=jpHj+cUzfrqIrQ4WlY89YQXlD2UkR9WPAiaR/iQHN8Y=; b=d1X1szMRIziGfHVJjuDW0glKZwIav0qMiQH5v0Rxy6oR7Ar3o0o3aCrjyw05VbYz4sHtXvOh4u1A2o0+HS25Ajt2gtQ13uUx6FRSMbIrfo56dl7hBDw6TiLaNQCl1cKLD5wQKO3epAnE6WPPZxNxSaKLrorBlWM/h1MWtZdcgrty3ftbKAzQi94xDhE/nJBwWGwi9OSo2hqWDph9Oco5jW/+40YpgOwtq7MXV4drfP1xu1qv5r4rHap31cvSZw9JtQCM+Xzd/YRYEocsxiTNRiEl1sk3y2PIdq+JkDSiwr/jUhnfQrjX5xlwzTF5NEKqu2lX38AfrfBVdo2OfRjm4g== 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=jpHj+cUzfrqIrQ4WlY89YQXlD2UkR9WPAiaR/iQHN8Y=; b=uJuD+KBD6lKR7JqO/9bryWNtrNE/dTGn5BQy2u+H+i7IqOdt/RYEgGXsD62r2BNJYqFA6ZrJphlIwBK0bg+NHw+K7g6CfvEiiV3KEfC848/wUHuX8EOtIlAiMTuZ+5rp3jfbnlnDbSYvPgevQi7Ctyf4V67CfM0cZADP7KF4E3MYto2UDWDFq9z2fT858ogX7o2MWIndAhPkzhjL+GMr6RFwXhvKI+SyxgaWar3vO08igzqPtnMelVK0NDX2jgEYhNiWGUi9EGe0FS8aJ0AI6L25hc8lXh6L5CZIgaRP1TvG8SPMqCuBhbJfB4sVYZJNHoaO8GRp3RszYinEMp6k5g== 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:12 +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:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Dec 2021 02:12:44 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [s+WtzmbYpRtWz4u92ZHnujxBL0plK1ZD] 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-7-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:11 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dd49944d-e718-48c7-f2d1-08d9b8559297 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWqLpJmXNddFmQxwc0tuI0lBn1hbcbmr4VLcYc+kXbrqrJyM7M6d3kq2htuNl9voDR0fZCY1Sd8Mjaso3CqzXMKHSd2NO5MkO+sdl8HchrkL8YoRyMIwF7Dx0ksRdc5bDxMB13xruswtgcc+/GylcnOdDvzxTvSAMqEukE4DamAaHyRKbxVgiKjgzHAb3TEbEDC4mGRi/OItwhD5TqPcBARfnemm86n4tBmiI8imRHpm4u1YrRcJaLHw/FZ98jKOKK8JdQovEGW0AJOPkEDGt3BTuh9OQZ66LzK6fvwB18rUyHGY/ObozcudYCe5i0/vGwPxjRerXaYNCf9vs1stvVW5DYA5Mzt814N0IXoM3nAzDotZuxFdSvBQ2EcVcdJqcv2qBf5a5cMkdOeawFgal60RUj5pCHYPWZdGEqj+IgqYGqUFUrE3k608OBwv++VZz1nMv3UbS/C4yWY106+yh40fTTxozZnNYnsnCiqigBvjNs7JJTdUusdUitIITD1tRBUO3P08SkZ4vIEyvy3CUv+K+67eNBdFPWXCzaiOAWwv7hbriFs/PBiByPixBjDCyMVxNGvsWR28R2+mTC2x+8mb5st8/NqgD/Ql4Cg7Gq73OQYvp4I7jTBFQo4SicyswbbR1uJQt18cdZ+IpdVOYKBXffUsavwjp1oZWbaqZCaqMgMKF52dD57cAfIwSBL/Nvce1xJqJu3p1J3qu5TxyGLU+Wvaoq1znc= X-MS-TrafficTypeDiagnostic: AM6PR03MB3686: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QITaa3/3Bukz0vOdfyvcl6YMgfS3+Sm0ji6/cHxNphgmCTuotz4AsHa8WY2tCygC2yFKd+Zg3bZQ88jyTnjfdzoZbd0zsI0GwMlic8wg4VPPJTK9uWlJiKo6CGgL7BGDvAEIA10m4JIX1p9Y3HFZP1qJyy0gz4H3Q1s/lp3hvi6ZiIoObYSZsK6b6I1XvmX2JTHBYuvZ7IGr8oZ6LFiqkMiFMKC9dTXq0pf5vLrjhCezMN/Y1BRJg1axAiX+ucYyYSESQgvd2dKKMqlNvCfn3G2L2JRm+JLVXFw9jlGhsqvlTuSFev/uWMHvevDaob56OGVYjjTkXBfwEYDn7KXkeVmZBwZhJhwCxQesAd4E3nmAcg8gpQ9Ct9z6YxXpzL+vj5ZEKMErdkx4TCgyjwyHJDZo0jBpsDLBfJEEt3VHPng47CF9ghMcIxe5YJ5nwWELvPSvcvs0Vl/v1/QaEUPt+Q5bGLbt21QMEHSosKMUb6ZYuDp4pO1BYCUwiM9RPaWL5E7l4Su2nNuBMIZxffrGVLMK9VvPjMVi58vYBx/tXSpMNm8QkqmWyOYuUPBo27+iqb4lFf8PXST/wGeqQYDlIQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QKCwSp+5doRbj2GO56UC4tmnG1g0hXtAnU5G03z+qtMZF1BhR/aASH0aADkt9AY7RfFRRoOaJEVkzvnv5Ex4YsFBjesrQ7gkK/mmxbxWWve4Na1iZVAHq/Qpalo9E1+CZdYoSU2abbivURLV8+oVh2TliNVooLthQYFKcLFzU6UlgUGRunn/+wQ5ejczTxy2t/6mjZXAHzO+EbeRqMqc0CIwGDirCkQYnk2XnBGGQtMy32r3kjsSNA13Zt5QLfUqkKBta510kj7PDTUV8Fk0mg53O6IHGACoXydPTK8UkIFHKljFtSXFcPGa1YORVbhHVASUaDV5+CrkIftjzdQoWpMum7kei7Sm6VmFPhYHzV+38R+H1629/CW3WPdJRBMhWdQjthICklg3xkDfFouATqkH14+g4pgH/e3iqAy9MWb0baBUgmK8nVcWM462oEmPWd1Uibs5y39fQNYBbIer9VjU/odlygTiOINzxhqtumpAHgskz7ecP0/j5hGFwTuQ5lclA1FV4wYGXxLkrHa4Ma3DYMLoceI6gNCqtmM/ANI1PepgzBs2QBJ8nB6Zug5wQF+waFvEIq+u6s1VQnmAV/7jEPSyJEnk5CWMbCeLRIse8VtRSUX/Vq34PlWvfHNCj7pSpuSwAc4MgJteWy96jVGhvho4DLHwXiYm9ley10ZMLMvK518ElHjWOOeQH5IH9FtA25pR9y5WcdA8D7UAd7AdRyVG7WKSaqRvkE7RiamvtZlNshhvjQ00Uu8Kp4ODcHjq2/rNYlVkO/WbA3OBo53QYrpzm/DDq5kT80giDoASURQu5BDPzNdgD511Cha4B2fUuEnTEmt02Tdtt1fznD86RatQlh69Vr+xLLPAvQNtulHE9t1JWuAuvDgo+Sd8bYtJM5rWh+a5RddWFsoDNGqwmlTRzCX8q+WM4ZlPOrRM5xzVd4pS3HXvMH9720TY4HkN18lvN5gcKxeqHeS6HQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dd49944d-e718-48c7-f2d1-08d9b8559297 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:12.2516 (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 08/10] avutil/aes_ctr: Avoid allocation of AVAES struct 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: ZDtUkihQwood Signed-off-by: Andreas Rheinhardt --- libavutil/aes_ctr.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/libavutil/aes_ctr.c b/libavutil/aes_ctr.c index 0c2e86785f..517d09cf96 100644 --- a/libavutil/aes_ctr.c +++ b/libavutil/aes_ctr.c @@ -22,15 +22,16 @@ #include "common.h" #include "aes_ctr.h" #include "aes.h" +#include "aes_internal.h" #include "random_seed.h" #define AES_BLOCK_SIZE (16) typedef struct AVAESCTR { - struct AVAES* aes; uint8_t counter[AES_BLOCK_SIZE]; uint8_t encrypted_counter[AES_BLOCK_SIZE]; int block_offset; + AVAES aes; } AVAESCTR; struct AVAESCTR *av_aes_ctr_alloc(void) @@ -68,12 +69,7 @@ void av_aes_ctr_set_random_iv(struct AVAESCTR *a) int av_aes_ctr_init(struct AVAESCTR *a, const uint8_t *key) { - a->aes = av_aes_alloc(); - if (!a->aes) { - return AVERROR(ENOMEM); - } - - av_aes_init(a->aes, key, 128, 0); + av_aes_init(&a->aes, key, 128, 0); memset(a->counter, 0, sizeof(a->counter)); a->block_offset = 0; @@ -83,10 +79,7 @@ int av_aes_ctr_init(struct AVAESCTR *a, const uint8_t *key) void av_aes_ctr_free(struct AVAESCTR *a) { - if (a) { - av_freep(&a->aes); - av_free(a); - } + av_free(a); } static void av_aes_ctr_increment_be64(uint8_t* counter) @@ -116,7 +109,7 @@ void av_aes_ctr_crypt(struct AVAESCTR *a, uint8_t *dst, const uint8_t *src, int while (src < src_end) { if (a->block_offset == 0) { - av_aes_crypt(a->aes, a->encrypted_counter, a->counter, 1, NULL, 0); + av_aes_crypt(&a->aes, a->encrypted_counter, a->counter, 1, NULL, 0); av_aes_ctr_increment_be64(a->counter + 8); } From patchwork Mon Dec 6 01:12:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32046 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3913664iog; Sun, 5 Dec 2021 17:14:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJzLkNOZ82FIltfyN5ebSxcxUdHv1DdcFtrhVW9vZRS5SX7KO8Ya4ImW4lbqf1DJVuWhsSSH X-Received: by 2002:a17:907:7da0:: with SMTP id oz32mr41037593ejc.176.1638753256543; Sun, 05 Dec 2021 17:14:16 -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 ht9si18269535ejc.620.2021.12.05.17.14.16; Sun, 05 Dec 2021 17:14:16 -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=kdGqjB3v; 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 B134D68AD8B; Mon, 6 Dec 2021 03:13:23 +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 721C568A78A for ; Mon, 6 Dec 2021 03:13:18 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GPbbZRWRdg5MiyuA5D2yO3j58kov3re7FJurHPzxOdevnE0tF4R1oELHPnBO59m/Ra8eE3jwskrdnBWAOO7ZTUMd0YKjW7LNluCskIYdWIklpRG++jYtEDVeVb6YfokoAVKlXNeKO1TRM67KBoHMb/vBzVM4W3XIQN+GkkVHJ1kAnlAx7pBy2Sfy63zvltYeiNBxsCkIIka3cODwlZCpZZizW2Yjz8VCmUwnaunSmqOzzm8HJKufwvX7H/QODW5dRxCZrzXYjDmO5rtOMOzgl962LEGe81cbqPjZK6elP2geaih1L9VbkSkIXz1MgDoPoA5h0srktrO8jIjBRwdF3A== 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=5LSshc9jQ3YyUW/zo1+v2urSJsBvY9scyZ3oPNMG5rc=; b=mBX7xxaWNaAnRq0ObnvSwOmXq1VzPTD8YNHKvViwtqNkcj3aUNrPczVXACta3Qw8gpsvexipAJfvGD68VaOp4fhgmBuNIpZDuwrf/XwNrMHnKV1WCP6K2irleE+NISIBCe/jOuzB7xWRi51nfgLC7R1bCyb67dkT1cEytltOczHEKlNArfjR6rC6NN3prqUQdc5sV4fzjFF8rOaxqohF9Uer+7JQNB2IayuyEPEW5EGE8xaiJqUXSGjwV7YU38aOvQAKpbruTO5pyBXoetiaXmojKn2m5xUnjl8tTmnblqTNjsC1zediZnE6iRcVlsnLs2uYjJUdrSJ+5oKDgK/rxw== 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=5LSshc9jQ3YyUW/zo1+v2urSJsBvY9scyZ3oPNMG5rc=; b=kdGqjB3vs/n/rAA7tZLuhHyZT7VJMQwuHl+6xBufNixxmilVr9VCI7Ttpkjwa0lkA4zB46KW9I8Cry5yK2HlcDuomxWoFiL/LZKVHU12x/Gpliljk8aU16aIUIxpMF2meOS6JmJLECZemGHHCuLhF2o4BlRLPasEYAleAPMksDWe4oPQabsQhsblNJ/RWxhkYpgVubhRtH5t8bidgRG7NqiVPcqGD+HHnYQMhM9vcC89xM124Gxq7JZHQA3fWkh9J7tzgGUj7AhelJODB2yU9Lg6McGXmiL7s72WOhzT7JlnFLAqWDwcz1GdOaX1R75/iQ0HotJdfGBf6B1Smk9xRg== 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:14 +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:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Dec 2021 02:12:45 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [9avbDoUaimnTuzF7PObU7W3fDQZJwIQS] 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-8-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:14 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8a6fe688-08d5-4cbe-d099-08d9b85593ea X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT2s5ZWgpZq8Fu1c4CoKhX6H4mv5aHVxIHJ+iHxA8UA7tU1rTnh/jRDJuvsbr2jE4KKAopn+lPZPzWaWPQVT3+hdeRQ2H72oYeLuG30VaEXmOYFeo0esJIyKB5GMOxMfsbuf+Z2X2RREl9lqeodxTadSURzkj4XyoUmMIU/jHh9oZJMaODHSepALQyc3SPE2TGUIIFc2OkXgQncgDgQLWTjDBBENOuRGjpPnAXQ4LWUgS9C1/oQEPpeLesgv9ZysoW9mvUXCLdhCtGwneq5EfYdAg7SYZPp3hO0dEx4SHDczI/tv8+S0qLNmerM8HswOoixwSyL7alWR3U9S4s/KsxE6nESKrs9OrMWXMBZgiz1RQijMgjtS8mo3zq0pUPPD3AtRv10wTYzQcxv3gft3nnpgW+t1Zxe/wyad6T/I1x3yCrxG41pkkM82FGGne3kKffIhsOj+BaQDpIGbKXanFdp+FGNQF35So7qzPv9bFtuLkRske5aMVmBqvd0t+43s4/GY3ClQWRyZNtFZw9/Kaaaqy3KkvX3nOOX1m2WsumlzLoIjx36s8ukAONEaFDu2KE6rQTQhGfay1yT/i+ArntXnzuBrgRZ2U4c5zqC2xOBD/HixcoSuZ5FsQ1+2LmL2v62qs8wBXqywzObfWTDcrPxGxFVT3NgOgm+KDZfpHOMz3cvSpiiJEIyvJztZrRFBBa8pu5QzM1OEuzLD7L3w0tw3NKTo+rB67+XejEc7zqF3Y+qab2eqlk00fnnlixAtn4= X-MS-TrafficTypeDiagnostic: AM6PR03MB3686: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZJ7Xy61UnsTVOmTQxAFoWBtWOEFM4GhmExfy+NOQOzG4zu44Wg/BjHGiZXXXMjAtcomy0cr9CNRsZf9NQQLgnjeeYV/iyCxCyVjvSFyuNtMmEViR40PR16dtHdeZsKQ1ezlQ7YTN+NmVDILrpw2XO5z1aPXAva6JBaHciaXAElTM/pEZoA1bwJ8jhdzWZA2bYMK23sXLvg2EfQSrH536GaifHjbV6xhBLLjNwUeroP7WuPmagyin+dvx9OXLhK6aCBY7VnTdcGu36BcSGjyJjWy3Ga+3Z7BDklno99tX+Lo9Pj2VEyNgOSNydPDT4ITtNj+qXp3TysKdntBWcSdAV40dssKqz3su9UZbNZJlaf/YrjB5A+H3GjfCKAaPyh+W9n23DG4kDsWCusWKFaiS7Y6LmR7EGcLsPtN16D777BBhJe+a72m/5zaybwG4p8pzfrhNULoTyEnJZSIIBbtkojWQA9wuqiMrg/Qjbzpj01RDx1f0d71L391hwtQQTP4Kz27+62ZFWPznrbja5QFE1QOUkdr1ckuZZo5jIq5aEUuzeyWWgQMZmhic7P+rt76xgZUSvoDP/jUlYKZyjYvueQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KDVowZioijwXV4nOewRzGcUEFnKz8zYWuFnp2/tp1NvEgLTRVddf7492/z9l7VIF2NU1kY6m//qI/LCvgcPhreWjNiYlAecFAN38vMgzkZm4aVQDFvbUlzdb6kaRQmqEJyS3ZwyZatefa605maGaWTK00q00sB3IFvLn4Ntl84wv6B/wacd58u2ycPec5QMka2cCzbkGPTm+DDzBoS2qUI1IPotAQe6Q0suU6UH6/So/av5l18G332uwxDrtPqVYt7kPe+MsphgTebAyLppKSWK+pZ7m01z9mtPwRKV4X77WnoxFvleXVSPncNy+axBYIN4aqlGy+sZiVNjAPh5gCTKpFT+8OI8p5WZiFjc+6N4sx2SBDE8W9AtVgK/PfSpGuNrOPUglCxHQThbLQUXgtHqrExSWjin4eHa9hPyj/D07TV9BAR0FdG06lXB+0XYflRXRVJy1Pg0/zqxWJg8rkR1BW2AHzoAnUB9vQgBhtEfX6z37o152m3lq5YzsGaCZs4FVgKswXbfptPO2OkXVE2c6lRAOmJ1I0i0WysFkroAhhbQM5jsLb1qfRxDbS8cP+vjzKMCtxq+dMmB+d3mkzB+fNb7w4pSoBCgeTwq3TIxuc3TBaDYMI8km93G6G7+oeBjl9qDx2qCPcQCCsuhvN0sZn6GZjtXlg+om2TXZqwAjFM5stxAnW4/yYqdBmqsnhg3MUitDtRA6G/lzunB51WacI3xXg8FYcjwR4upJNsTtntO71y53uWKsU+kE5DT0IHBzh099gFjEOLipLT/gyEksb9AC19VhM8t5SVH77dQQazvOqIE5z41SeXjFN2FrJua5zudX7+F6SNr9IXBYA6leKOeZ0b167uS9wbQMew7n/RxztKkEpYMM6UXSALSjiYPj7uYXbp8GKDZN/HHqliHDAIuKfQ5tp4EhJYz3I8uNRUQUhtPyfQN9k/bq25/TJThu2lwZNtPEy0KOz6todg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8a6fe688-08d5-4cbe-d099-08d9b85593ea 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:14.4724 (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 09/10] avformat/md5proto: 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: /vwAGEMcPdD0 Signed-off-by: Andreas Rheinhardt --- libavformat/md5proto.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavformat/md5proto.c b/libavformat/md5proto.c index 0e04b90aac..14cefe719c 100644 --- a/libavformat/md5proto.c +++ b/libavformat/md5proto.c @@ -25,6 +25,7 @@ #include "libavutil/error.h" #include "avformat.h" #include "avio.h" +#include "internal.h" #include "url.h" struct MD5Context { @@ -57,14 +58,13 @@ static int md5_close(URLContext *h) { struct MD5Context *c = h->priv_data; const char *filename = h->filename; - uint8_t md5[16], buf[64]; + uint8_t md5[16], buf[2 * sizeof(md5) + 1]; URLContext *out; - int i, err = 0; + int err = 0; av_md5_final(c->md5, md5); - for (i = 0; i < sizeof(md5); i++) - snprintf(buf + i*2, 3, "%02x", md5[i]); - buf[i*2] = '\n'; + ff_data_to_hex(buf, md5, sizeof(md5), 1); + buf[2 * sizeof(md5)] = '\n'; av_strstart(filename, "md5:", &filename); @@ -74,10 +74,10 @@ static int md5_close(URLContext *h) h->protocol_whitelist, h->protocol_blacklist, h); if (err) return err; - err = ffurl_write(out, buf, i*2+1); + err = ffurl_write(out, buf, sizeof(buf)); ffurl_close(out); } else { - if (fwrite(buf, 1, i*2+1, stdout) < i*2+1) + if (fwrite(buf, 1, sizeof(buf), stdout) < sizeof(buf)) err = AVERROR(errno); } 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) {