From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id BA3B5420C3 for ; Tue, 22 Feb 2022 14:21:31 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E0DDB68B0F6; Tue, 22 Feb 2022 16:21:28 +0200 (EET) Received: from mail-oi1-f180.google.com (mail-oi1-f180.google.com [209.85.167.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CB82168A896 for ; Tue, 22 Feb 2022 16:21:22 +0200 (EET) Received: by mail-oi1-f180.google.com with SMTP id j24so12448377oii.11 for ; Tue, 22 Feb 2022 06:21:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:content-language:to :references:from:subject:in-reply-to:content-transfer-encoding; bh=51c8Z38g9oPVkRR7elK+sqe6SRNXcaAYM6o6OtD2DDU=; b=bqzi533/bpIhKgMhvEFlPPRV0dUmd4sh8OZvteyo0ms2wBMfAz5AbmJstC0KY1c+QM Ec96aR1RDETp09//uVu5f9svw45xsna0YBgZ6BPOGq0ZPftq7yUPYph78zqVt1SV2lvL YWWYY79ytXPH+qzZ6EpfLqpcsNKQlvTOOaYczkTJZOY0te7mMuxi4YW8SIpv2pXj6cWi tFkjUz0+kjNQ6XYPjXbEZbUbG4ZL0WIWKT9rY/uXEtTglOQk7tygAsNnWHGS/V23bUVW rX/q01zpDHOpUS/FETqCAt8uWp/uVS2CfRhTaUAeRqu1sqdbaMbMDkAHTfCPkD0Pdw8W RslQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent :content-language:to:references:from:subject:in-reply-to :content-transfer-encoding; bh=51c8Z38g9oPVkRR7elK+sqe6SRNXcaAYM6o6OtD2DDU=; b=RfPTCF7ID0UYZD7v7AKY0dkd7gQPw3DRv07qG7l+tYvAQY5TJMZTJ9qCOpMlxRELQX ToEMRZV0OPsiyY54Gne72/DAwUOX2k3xz+m5cshIWxr2Z1oTfqxz++RKZGXaOFqWJWhW Mrc4tpjD3yUzhbg5bermhQA7WW9z2M7FcoXfJFEFccBMSH/AmQXBkxAV1FQ/NO7rkoX4 1oXxNQeK6pKIylgtaTzBuaypTheJ7Vu5oJEz60EgPmDmVKtTkVX6C3RrxsVaSPiF6bOD 5z9d/Q4n4cFbm3Ria+zyDIEnusq39asE1uAsAGshKHVOb8dEm6lyPrCWEs6Eg0xwWX7o IONw== X-Gm-Message-State: AOAM5331bl3S3llJ+EIdpzWYYt8YHQfy/tSNFMHx12mLeUvXkqw0r5kA tD5wICMwRp0C1D9wlElJ0mGdzun9510CVw== X-Google-Smtp-Source: ABdhPJx/jZiAgSOAWFCwDJGiFpXu8Dr6uD3/Po/ysac3v9Z3tHsNTprPAClqQnjF9SzcQ/K+K6rePw== X-Received: by 2002:aca:ba83:0:b0:2d4:13f1:8530 with SMTP id k125-20020acaba83000000b002d413f18530mr1960990oif.169.1645539678182; Tue, 22 Feb 2022 06:21:18 -0800 (PST) Received: from [192.168.0.11] ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id a15sm8907755oil.13.2022.02.22.06.21.16 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 22 Feb 2022 06:21:17 -0800 (PST) Message-ID: Date: Tue, 22 Feb 2022 11:21:14 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220222130153.289215-1-zane@zanevaniperen.com> <20220222130153.289215-2-zane@zanevaniperen.com> From: James Almer In-Reply-To: <20220222130153.289215-2-zane@zanevaniperen.com> Subject: Re: [FFmpeg-devel] [PATCH 1/7] avutil/uuid: add utility library for manipulating UUIDs as specified in RFC 4122 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 2/22/2022 10:01 AM, Zane van Iperen wrote: > Loosely based on libuuid > > Co-authored-by: Pierre-Anthony Lemieux > Signed-off-by: Pierre-Anthony Lemieux > Signed-off-by: Zane van Iperen > --- > libavutil/Makefile | 2 + > libavutil/uuid.c | 156 ++++++++++++++++++++++++++++++++++++++++++ > libavutil/uuid.h | 167 +++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 325 insertions(+) > create mode 100644 libavutil/uuid.c > create mode 100644 libavutil/uuid.h > > diff --git a/libavutil/Makefile b/libavutil/Makefile > index d17876df1a..e0f40412d0 100644 > --- a/libavutil/Makefile > +++ b/libavutil/Makefile > @@ -80,6 +80,7 @@ HEADERS = adler32.h \ > timestamp.h \ > tree.h \ > twofish.h \ > + uuid.h \ > version.h \ > video_enc_params.h \ > xtea.h \ > @@ -172,6 +173,7 @@ OBJS = adler32.o \ > tx_float.o \ > tx_double.o \ > tx_int32.o \ > + uuid.o \ > video_enc_params.o \ > film_grain_params.o \ > > diff --git a/libavutil/uuid.c b/libavutil/uuid.c > new file mode 100644 > index 0000000000..7bcbbe487f > --- /dev/null > +++ b/libavutil/uuid.c > @@ -0,0 +1,156 @@ > +/* > + * Copyright (c) 2022 Pierre-Anthony Lemieux > + * Zane van Iperen > + * > + * This file is part of FFmpeg. > + * > + * FFmpeg is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * FFmpeg is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with FFmpeg; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > + */ > + > +/* > + * Copyright (C) 1996, 1997 Theodore Ts'o. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * 1. Redistributions of source code must retain the above copyright > + * notice, and the entire permission notice in its entirety, > + * including the disclaimer of warranties. > + * 2. Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in the > + * documentation and/or other materials provided with the distribution. > + * 3. The name of the author may not be used to endorse or promote > + * products derived from this software without specific prior > + * written permission. > + * > + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED > + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES > + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF > + * WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE > + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT > + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR > + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE > + * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH > + * DAMAGE. > + */ > + > +/** > + * @file > + * UUID parsing and serialization utilities. > + * The library treat the UUID as an opaque sequence of 16 unsigned bytes, > + * i.e. ignoring the internal layout of the UUID, which depends on the type > + * of the UUID. > + * > + * @author Pierre-Anthony Lemieux > + * @author Zane van Iperen > + */ > + > +#include "uuid.h" > +#include "error.h" > +#include "avstring.h" > +#include > +#include > + > +int av_uuid_parse(const char *in, AVUUID uu) > +{ > + size_t len = strlen(in); > + if (len != 36) > + return -1; > + > + return av_uuid_parse_range(in, in + len, uu); > +} > + > +int av_uuid_parse_range(const char *in_start, const char *in_end, AVUUID uu) > +{ > + int i; > + const char *cp; > + char buf[3]; > + > + if ((in_end - in_start) != 36) > + return -1; > + > + for (i = 0, cp = in_start; i < 36; i++, cp++) { > + > + if (i == 8 || i == 13 || i == 18 || i == 23) { > + if (*cp == '-') > + continue; > + return AVERROR(EINVAL); > + } > + > + if (!av_isxdigit(*cp)) > + return AVERROR(EINVAL); > + } > + > + buf[2] = '\0'; > + for (i = 0, cp = in_start; i < 16; i++) { > + > + if (i == 4 || i == 6 || i == 8 || i == 10) > + cp++; > + > + buf[0] = *cp++; > + buf[1] = *cp++; > + > + errno = 0; > + uu[i] = strtoul(buf, NULL, 16); > + if (errno) > + return AVERROR(errno); > + } > + > + return 0; > +} > + > +void av_uuid_unparse(const AVUUID uuid, char *out) > +{ > + static char const hexdigits_lower[16] = "0123456789abcdef"; > + > + char *p = out; > + > + for (int i = 0; i < 16; i++) { > + size_t tmp; > + > + if (i == 4 || i == 6 || i == 8 || i == 10) { > + *p++ = '-'; > + } > + > + tmp = uuid[i]; > + *p++ = hexdigits_lower[tmp >> 4]; > + *p++ = hexdigits_lower[tmp & 15]; > + } > + > + *p = '\0'; > +} > + > +int av_uuid_urn_parse(const char *in, AVUUID uu) > +{ > + return av_uuid_parse(in + 9, uu); > +} > + > +int av_uuid_equal(const AVUUID uu1, const AVUUID uu2) > +{ > + return memcmp(uu1, uu2, AV_UUID_LEN) == 0; > +} > + > +void av_uuid_copy(AVUUID dest, const AVUUID src) > +{ > + memcpy(dest, src, AV_UUID_LEN); > +} > + > +void av_uuid_nil_set(AVUUID uu) > +{ > + memset(uu, 0, AV_UUID_LEN); These three seem unnecessary. We don't need new public symbols for this when we can just state in the doxy that you can copy, compare or zero by assignment or zeroing or any such standard method. > +} > diff --git a/libavutil/uuid.h b/libavutil/uuid.h > new file mode 100644 > index 0000000000..b5d8166898 > --- /dev/null > +++ b/libavutil/uuid.h > @@ -0,0 +1,167 @@ > +/* > + * Copyright (c) 2022 Pierre-Anthony Lemieux > + * Zane van Iperen > + * > + * This file is part of FFmpeg. > + * > + * FFmpeg is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * FFmpeg is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with FFmpeg; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > + */ > + > +/* > + * Copyright (C) 1996, 1997 Theodore Ts'o. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * 1. Redistributions of source code must retain the above copyright > + * notice, and the entire permission notice in its entirety, > + * including the disclaimer of warranties. > + * 2. Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in the > + * documentation and/or other materials provided with the distribution. > + * 3. The name of the author may not be used to endorse or promote > + * products derived from this software without specific prior > + * written permission. > + * > + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED > + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES > + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF > + * WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE > + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT > + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR > + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE > + * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH > + * DAMAGE. > + */ > + > +/** > + * @file > + * UUID parsing and serialization utilities. > + * The library treat the UUID as an opaque sequence of 16 unsigned bytes, > + * i.e. ignoring the internal layout of the UUID, which depends on the type > + * of the UUID. > + * > + * @author Pierre-Anthony Lemieux > + * @author Zane van Iperen > + */ > + > +#ifndef AVUTIL_UUID_H > +#define AVUTIL_UUID_H > + > +#include > + > +#define AV_PRI_UUID \ > + "%02hhx%02hhx%02hhx%02hhx-%02hhx%02hhx-" \ > + "%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx" > + > +#define AV_PRI_URN_UUID \ > + "urn:uuid:%02hhx%02hhx%02hhx%02hhx-%02hhx%02hhx-" \ > + "%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx" > + > +/* AV_UUID_ARG() is used together with AV_PRI_UUID() or AV_PRI_URN_UUID > + * to print UUIDs, e.g. > + * av_log(NULL, AV_LOG_DEBUG, "UUID: " AV_PRI_UUID, AV_UUID_ARG(uuid)); > + */ > +#define AV_UUID_ARG(x) \ > + (x)[0], (x)[1], (x)[2], (x)[3], \ > + (x)[4], (x)[5], (x)[6], (x)[7], \ > + (x)[8], (x)[9], (x)[10], (x)[11], \ > + (x)[12], (x)[13], (x)[14], (x)[15] > + > +#define AV_UUID_LEN 16 > + > +/* Binary representation of a UUID */ > +typedef uint8_t AVUUID[AV_UUID_LEN]; > + > +/** > + * Parses a string representation of a UUID formatted according to IETF RFC 4122 > + * into an AVUUID. The parsing is case-insensitive. The string must be 37 > + * characters long, including the terminating NULL character. > + * > + * Example string representation: "2fceebd0-7017-433d-bafb-d073a7116696" > + * > + * @param[in] in String representation of a UUID, > + * e.g. 2fceebd0-7017-433d-bafb-d073a7116696 > + * @param[out] uu AVUUID > + * @return A non-zero value in case of an error. > + */ > +int av_uuid_parse(const char *in, AVUUID uu); > + > +/** > + * Parses a URN representation of a UUID, as specified at IETF RFC 4122, > + * into an AVUUID. The parsing is case-insensitive. The string must be 46 > + * characters long, including the terminating NULL character. > + * > + * Example string representation: "urn:uuid:2fceebd0-7017-433d-bafb-d073a7116696" > + * > + * @param[in] in URN UUID > + * @param[out] uu AVUUID > + * @return A non-zero value in case of an error. > + */ > +int av_uuid_urn_parse(const char *in, AVUUID uu); > + > +/** > + * Parses a string representation of a UUID formatted according to IETF RFC 4122 > + * into an AVUUID. The parsing is case-insensitive. The string must consist of > + * 36 characters, i.e. `in_end - in_start == 36` > + * > + * @param[in] in_start Pointer to the first character of the string representation > + * @param[in] in_end Pointer to the character after the last character of the > + * string representation. That memory location is never > + * accessed > + * @param[out] uu AVUUID > + * @return A non-zero value in case of an error. > + */ > +int av_uuid_parse_range(const char *in_start, const char *in_end, AVUUID uu); > + > +/** > + * Serializes a AVUUID into a string representation according to IETF RFC 4122. > + * The string is lowercase and always 37 characters long, including the > + * terminating NULL character. > + * > + * @param[in] uu AVUUID > + * @param[out] out Pointer to a array of no less than 37 characters. > + * @return A non-zero value in case of an error. > + */ > +void av_uuid_unparse(const AVUUID uu, char *out); > + > +/** > + * Compares two UUIDs for equality. > + * > + * @param[in] uu1 AVUUID > + * @param[in] uu2 AVUUID > + * @return Nonzero if uu1 and uu2 are identical, 0 otherwise > + */ > +int av_uuid_equal(const AVUUID uu1, const AVUUID uu2); > + > +/** > + * Copies the bytes of src into dest. > + * > + * @param[out] dest AVUUID > + * @param[in] src AVUUID > + */ > +void av_uuid_copy(AVUUID dest, const AVUUID src); > + > +/** > + * Sets a UUID to nil > + * > + * @param[in,out] uu UUID to be set to nil > + */ > +void av_uuid_nil_set(AVUUID uu); > + > +#endif /* AVUTIL_UUID_H */ _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".