From patchwork Mon Jun 13 23:24:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36206 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp756571pzb; Mon, 13 Jun 2022 16:24:33 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vVBPIIK8oUznnMppglC1j4jgforCgvngr5u+kaWm876TMncehruCakVKzb/ky1J7CPmhEP X-Received: by 2002:a05:6402:b09:b0:42d:bd80:11ac with SMTP id bm9-20020a0564020b0900b0042dbd8011acmr2581659edb.244.1655162673360; Mon, 13 Jun 2022 16:24:33 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hb13-20020a170906b88d00b00711ce8500dcsi8338865ejb.559.2022.06.13.16.24.32; Mon, 13 Jun 2022 16:24:33 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=ZoC22sLe; 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 661EF68B5F2; Tue, 14 Jun 2022 02:24:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2030.outbound.protection.outlook.com [40.92.90.30]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3F7CA68B194 for ; Tue, 14 Jun 2022 02:24:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Llo8yqqJ68CnKyQQV9Np+wXHEm2cD2eWxRRmte4jSAjx82UvSlxhdm+0ALDGMQwO7y9qmLmNMYwo8f7KAFowyr3uwo1+5kppoj8cz0NguhJyIHkuYTDaf+ChHUnHpsjv1Etr6pboMjtl8+UcI6DlCzDVCfd0cpFoZCZxwDNh17MIAKV3QZRxWgmmo75Mzpq5f1y9psz35F8c9ohDgyOar655xZa4OrVc7rDTvJ5u2L6XRlo5Abpi0fDU5gGWsnwwUPENnsTNcTTexZy77BkjHxKIShN4Rs6qQLxJF3W1yVpSN/q3NVVDttBGq12rnpjnTNrbG78FMZYF4ePQHwvFyw== 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=kJq4rmI7MyLRghz7iYbgKxPOwcSXX56TU3bUTUa30+Q=; b=aAp4UYxw6NvdSLJGNJXd7CrQXcpKvMTTME/4wAUAwv1puPCUe4Z5ZuM6GOrw7Ok6/Q0KmhE8brnQmh/tKCRoi5GGxakWV5N81h2qEnr9KVQqy3GnzoLQ6i8Q98c+V5OSoKIMkM5w3ViIMsI99Inpf//duO4p4LIlt/qTylrTJ53Ul3J51Vhb2GCg31LGEO36nUcYE9L2oxbYz8HphAE6WEVtUMhL2KwSaYBK1AgDqrrKsTujNXxU5NFp4QaL0FpCTcTdxo0jR19yIacVl4F0xTcjKcGUWbJNmdCWfeuaT8yq4Q04nrROxhs0uV1o07Amq/e2y9qOa8EKixujNsz/HQ== 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=kJq4rmI7MyLRghz7iYbgKxPOwcSXX56TU3bUTUa30+Q=; b=ZoC22sLerkZ7SJg6paT9vLEk8rBj4g82s9eBObspS6xImKhMfZOdwJ4u5IhuMzmmFo7FN6b9RNkAChyScr6KSOl2yRGjB3degOr6douWvdJdOIZv7Dh3xO2Va6LXORhked6lwMEti8EufPVpcDGOdUqTt/Wg71kZTX5pGocb9+LFUr7dr6364xEJKAxuYfv+cBQDcFrrUZu7xpTvtMlyaf5c2k30f63mqAozP4Rr68XruBegZAKoNc0TQVFVihgidM7cugWsjdn6tgbKyO+pN3qREDFVUwyBKqyIQI64z3xfoGnTDCqmU7IQMTkqOeZRG4gbOYGhW1bmJVPy5YBS3A== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by VE1PR01MB5581.eurprd01.prod.exchangelabs.com (2603:10a6:803:11f::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.14; Mon, 13 Jun 2022 23:24:21 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5332.021; Mon, 13 Jun 2022 23:24:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Jun 2022 01:24:10 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [QzpxdM+8N8sl672Kh1RtLaVvKcq1VjGX] X-ClientProxiedBy: AM5PR04CA0022.eurprd04.prod.outlook.com (2603:10a6:206:1::35) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220613232412.759781-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2fbbb31e-89e2-4684-d7c5-08da4d93d846 X-MS-Exchange-SLBlob-MailProps: EpEO96k6WonlsmQbMk8hUqf8Z2+0UmttlPMsSa7pIDeJrJbpWhxD6DZ57AJFa9lHfCL9cvXcrutCzIaBwoOWr6443BJ0fTfJWihR8/vxg+4AMWknLqI041LEjnwoLxXFNZolQqY/ZeyniuAF45DSpuIvAfkZM3ABoPZAfR7tMZgLsv24BopTFl8pNlJSkXZvUjjxI1D0c44ru6zpon3ki9CBg/b0hMrSMYl2JQyu1Wd5HJ7fDR1x0Ept6/2mAC/u0ZKAkFzb+nl9nmPSpj51jLD/2Wo75RuwY8ipZfwVJm5SOGOZXfWJO9XWlYZRKjXQthFIFyrwdlEtFQc8a5Q+ZpM29qon114BmJL4zwx29tU6TWum1mg74tHubizYqGgI+0FyTp83LbyvCspqH1IrRDoWlRCWB1vZt+6PrWUI2skDoPSJKLzwIsb7snKl8lne97TVXZ4Yx9SPQQ6OxCPNtlTqeQaS4FFeZIGTk8ZM2ed/oN3HqzaFxyoR+XsfJYUMP+vWRhLr2AP3FP7HxFYo9ZJ86SjMhZmTae7fCS2YvI2I34LHlzlsP8oPQBt0Lieb5yn3CZt8BFfL+Jk3dob5GEy32Yy3IDH68aBhQpINWoeg7Ur5fUr6RPD2dAgBdXas4scWTyo6LR4sFJUtVNvgPXP6bITs+XaHAYSuAwv0UG40/8s93BvqrqK1Pfo0aPsIozrzJqvA+B9FFgB7Y+jFk8SqpHCohEDqm8YvEA3PUQY4pV+0r5jzyD3PKrnC3hVgji8bgkFRVQ0= X-MS-TrafficTypeDiagnostic: VE1PR01MB5581:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TY6dFaT/Guf3qQOWKFKMwMeTRQhZCYvlwwEaAXyEzU+S53fXGcl+7UIPhr/vHYXEyE81AKdXmO6X4jEyzSpetKDeDi7Wrqxn+QdQSQaL+U3gGOKX573E3YBy3/LJh7oiZ1G5MiA7wZJZUhmR9fq54HaqKhXmmbsitPl/pC6gY8WWncJjY1tJRqWVzAo62DLAHGn6Nai7T1mcol3rjIcEnbvS0ACI8TADRmQ3xkDJQ8VLPqljxg5DEhqas6SfE2jCfx7A4mrN/qhtpx7o4OFu5vWROdMYBBApKIXzF5eRfjAMpqPt6sqDHeiCVUZ3m+3AlrR57Z0cd1Tq3vpwPo8x/q2lMteQc4hW9HL5iW2E/e2T2cuiLXItVfsbLyWCsjgcyk6D+qw/7PXtjgcX7Hvz+4ZyuLKHhWVAEwFUAlRsXpbkXsTjAqQExEuYYWIc/kmfjI8fCOB27pQzLdw6YA7YQZWSbVyr0bfBrxKszEFTwoI5spe37Os2Lqrnnc+n8ywepwyQHOZlr48kGMr14/lOTJAIZJwW0HGTOPJa2cx9DEnwuFYFnKN38SG/jcJI5LsoX/MhIn4el6RscnQApZlr5w== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: i5ojmD1s5w4Vk4IhoGr491Sg0mnkNmw29btB6FQigymiKz6nVXqhsFxroqVy5flbAQQgat0PpP0Jci39pDfTjrr0GovHjgYdmhTG3DBpvWWl47PlzjcE0kaU0NlucFrFvyMHQlpGRLrEWNIRruhGf6d5fHdLHIyQKqnhOzC14ws0Djal7iZv7wiLXwsNEJgh/0jQMJWBBhW4s3SIQ6LUqtl9y/j5LOcbzut3kh/EvuvQAQax4rQka+yIZ+KFmi+pq+ARv6wErYK/5R0DNsh2eeoNR6G5JJSRLx9ribYSref9uM+2bQeSiiyXZW6kkNIkJ1eQzYn+LL0RYkbnViDl2QsM9l5buZlj7QBZsjGgc56VxVtnrl8V0kUbMpekf2UrEevbbAgR+gcqJtCA0JsPoLFPvdfayqbuTGvEJpZiPZ3E5zs+EWgEDBQOD1lPb1vSdvVQMFBBLNyR4M/3HAYR3ieQZYY5Co4nuiqYT/23jnNLmtXA1TeWH9Et0NaV2JjSRk/dBBeEcTJJw5RORqXyaf3KaEscx7+XaVlAzA5gsi4+XValJN37jev2dg3Km8lYi7f535Jkhjcgb5psAi2vJDvdcIn8lQjwJ54BC2FzHRlZjYxybrRaP7px12djjW5Aa4m6t23XLCyMP7ctgvFYLLb2vbHR6h/SR2+zpr55SpgLBwDG4kdX4iXyr8LK0ytPVRddKFMIq+ckD4dFbeiOVqeeSWekMepuiXHUTqq7Br9Te8eRdujPiAakOKEXnWzwFs2yOYYqDQsDNomPEdZDamsLSIK4ikGdiw/POvp7/82R90Mbm+BGcqj4UhNslWTuy7uhcXkDRHIqsQ+rb1oTm4hp6KNvLM1AjUmOF3CXug6+v68fKF6whIcs5yqLaC94dbeaBixtgl99AdfuU3582VCzq//Zz+41KP9NAoC8YEimcajr3TJngyL1U4q/nisg/L8C1ATUrQELdW4lu5/g00KTyUk0xHUllt+YK8VqYd26C2cIMw6PkP3tDjO0G1+KAypVAHG/KwnirtetvildlB5V776FQCFuEYnA5Bhme9xQV86NqxbI3DZpBw2SLNE2D2YBzz0T25P4pmsXw7sqmfjOy59jFwy0z41BzANBtDH9LU7fbcF8BYE3JHDkQWHCk4C+p2n+HelYkz/jHqFaaE2U3BvgR7NIy1/clUyHGIH/zeuGF4REmjGeZD0sSNbt0K91M8kr4JzFaquZPTj38IDxlIAIwXoictlnYVLp9Z6r8+gkUqX3E9F37XKGwYgM6eeyTVLSyQIJcgg3EU/AQC3O326DvdKPCmJbM5Fc1QmGxQ6TvPSfKAKN3RUy5Je1BZIp2n7ixi62ihYm3wv+Gf6pEayf6Y9jsGd666rycqHUXISG6zIQ3QCdW2XAoqe4Y3z4ksSch34NhxYahABpDGAGcXOcU6/NlUNU05o+whVDbqKos8jPJKhxeiRVWgWEG6FKbZy3Wc1DUv/jHKAVEw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2fbbb31e-89e2-4684-d7c5-08da4d93d846 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2022 23:24:21.3055 (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: VE1PR01MB5581 Subject: [FFmpeg-devel] [PATCH 2/4] avformat/mxfdec: Don't duplicate av_uuid_unparse 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: Jd0Ru+VZkzxq Also don't allocate the string ourselves, let av_dict_set() do it. Signed-off-by: Andreas Rheinhardt --- libavformat/mxfdec.c | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 6a22c33995..392066b65a 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -2118,24 +2118,6 @@ static int mxf_is_intra_only(MXFDescriptor *descriptor) &descriptor->essence_codec_ul)->id != AV_CODEC_ID_NONE; } -static int mxf_uid_to_str(UID uid, char **str) -{ - int i; - char *p; - p = *str = av_mallocz(sizeof(UID) * 2 + 4 + 1); - if (!p) - return AVERROR(ENOMEM); - for (i = 0; i < sizeof(UID); i++) { - snprintf(p, 2 + 1, "%.2x", uid[i]); - p += 2; - if (i == 3 || i == 5 || i == 7 || i == 9) { - snprintf(p, 1 + 1, "-"); - p++; - } - } - return 0; -} - static int mxf_umid_to_str(UID ul, UID uid, char **str) { int i; @@ -3088,10 +3070,10 @@ static int64_t mxf_timestamp_to_int64(uint64_t timestamp) } while (0) #define SET_UID_METADATA(pb, name, var, str) do { \ + char uuid_str[2 * AV_UUID_LEN + 4 + 1]; \ avio_read(pb, var, 16); \ - if ((ret = mxf_uid_to_str(var, &str)) < 0) \ - return ret; \ - av_dict_set(&s->metadata, name, str, AV_DICT_DONT_STRDUP_VAL); \ + av_uuid_unparse(uid, uuid_str); \ + av_dict_set(&s->metadata, name, uuid_str, 0); \ } while (0) #define SET_TS_METADATA(pb, name, var, str) do { \