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 9306F432ED for ; Tue, 31 May 2022 15:54:28 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C628B68B6BE; Tue, 31 May 2022 18:54:25 +0300 (EEST) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BDEBC68B65D for ; Tue, 31 May 2022 18:54:19 +0300 (EEST) Received: by mail-pl1-f171.google.com with SMTP id c2so13216248plh.2 for ; Tue, 31 May 2022 08:54:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sandflow-com.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=MeTSYbEA62HUbqd20pbLfYGbgkN4RjNmurJ57Og42Vo=; b=CYLNiCYK4ZtRpQOpSZzylZPhdLA8APUBso9cQuCqu16NP3e0uei/zS1WCWvqkDOjLi hJ3hhumSGHq2ijwKIFnyFojDIkJe049bnX6AozW1rv8mchQlJZSZin4k6ry1ncehj3QW 4a85M9HS7MiiUUKQHJtmpHzmyU/t1wdJZwzJYhqR9UnPCzy8lfS6lIyYrJeJvIdq9EaW Gov2jlO0+bAf/oZlgkHrjYSwUEZdMw4fziGlXTrxS4PnMT6D7BduAjUpLKbR92mmrlis c8LhvX2s2PnjXnxpKf8i9VwAcAlyRfivW9BVowG+WKbALhmTUNUcYgDumrmo0vChaujJ Z1Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=MeTSYbEA62HUbqd20pbLfYGbgkN4RjNmurJ57Og42Vo=; b=fUWg8xv9TkcLeN4N0q79f6hA0AV+/HGQHBW6zqCQ2OGlhVC17ErYDelL5meW3WU/Fn GGBjIAIfaAwGpn2AV1vo0pYQA28oETPRXn9ABmrTtEVGhp4QhqnOux1h/nPDV33aALTf 15MNOYiA0bDlgCybS0DH900LNxCLB/1dg0kVhzUTqH+0qj+1eUomCYtFaKWaTZBLnEFS 7G1IxQUrazyaWpum3qOh1HCUzU190z430wiJHSMV/Kvi53qr0Br8g2HO7a6Q8jnatQhz NoV00unn3X0agyzTpg/qxTaMOHZLQER0+Gw+hRIdr7uAiDasjal4ByS3MSxko7RdU2AT Miqw== X-Gm-Message-State: AOAM531466hwROyDiCo1q+jh7h9fsGkqw1rTvrs/h/aiMhRDXNxdBzcO NjrtQUsc/2bvly//jeN40D6xN4jsWBgnNQ== X-Google-Smtp-Source: ABdhPJxu0UPmxXMg7XY6rVmfhhA8y4uECdCmFdD34iqutN13RyhD/n0grRUpMpAvQHFe4pIC2x0aAQ== X-Received: by 2002:a17:903:3296:b0:164:13db:509 with SMTP id jh22-20020a170903329600b0016413db0509mr1820304plb.128.1654012457435; Tue, 31 May 2022 08:54:17 -0700 (PDT) Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com. [209.85.215.171]) by smtp.gmail.com with ESMTPSA id n12-20020a170902968c00b0015e8d4eb2b8sm7155170plp.258.2022.05.31.08.54.16 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 31 May 2022 08:54:17 -0700 (PDT) Received: by mail-pg1-f171.google.com with SMTP id 129so8936581pgc.2 for ; Tue, 31 May 2022 08:54:16 -0700 (PDT) X-Received: by 2002:a63:57:0:b0:3fa:b4d7:827 with SMTP id 84-20020a630057000000b003fab4d70827mr30014924pga.113.1654012455997; Tue, 31 May 2022 08:54:15 -0700 (PDT) MIME-Version: 1.0 References: <20220531031334.19488-1-pal@sandflow.com> In-Reply-To: From: Pierre-Anthony Lemieux Date: Tue, 31 May 2022 08:54:04 -0700 X-Gmail-Original-Message-ID: Message-ID: To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH v3 1/6] 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Tue, May 31, 2022 at 3:40 AM Andreas Rheinhardt wrote: > > pal@sandflow.com: > > From: Zane van Iperen > > > > Addresses review comments including: > > > > * simplifying av_uuid_parse_range() > > * removing avcodec/cbs_sei from this refactoring exercise > > > > Co-authored-by: Pierre-Anthony Lemieux > > Signed-off-by: Zane van Iperen > > --- > > libavutil/Makefile | 2 + > > libavutil/uuid.c | 142 +++++++++++++++++++++++++++++++++++++++++++ > > libavutil/uuid.h | 147 +++++++++++++++++++++++++++++++++++++++++++++ > > 3 files changed, 291 insertions(+) > > create mode 100644 libavutil/uuid.c > > create mode 100644 libavutil/uuid.h > > > > diff --git a/libavutil/uuid.c b/libavutil/uuid.c > > new file mode 100644 > > index 0000000000..8943212f30 > > --- /dev/null > > +++ b/libavutil/uuid.c > > @@ -0,0 +1,142 @@ > > +/* > > + * 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 > > What is this used for? Nothing as far as I can tell. Left over from now-removed libuuid code. Will remove. > > > + > > +int av_uuid_parse(const char *in, AVUUID uu) > > +{ > > + if (strlen(in) != 36) > > + return AVERROR(EINVAL); > > + > > + return av_uuid_parse_range(in, in + 36, uu); > > +} > > + > > +static int xdigit_to_int(char c) > > +{ > > + c = av_tolower(c); > > + > > + if (c >= 'a' && c <= 'f') > > + return c - 'a' + 10; > > + > > + if (c >= '0' && c <= '9') > > + return c - '0'; > > + > > + return -1; > > +} > > + > > +int av_uuid_parse_range(const char *in_start, const char *in_end, AVUUID uu) > > +{ > > + int i; > > + const char *cp; > > + > > + if ((in_end - in_start) != 36) > > + return AVERROR(EINVAL); > > + > > + for (i = 0, cp = in_start; i < 16; i++) { > > + int hi; > > + int lo; > > + > > + if (i == 4 || i == 6 || i == 8 || i == 10) > > + cp++; > > + > > + hi = xdigit_to_int(*cp++); > > + lo = xdigit_to_int(*cp++); > > + > > + if (hi == -1 || lo == -1) > > + return AVERROR(EINVAL); > > + > > + uu[i] = (hi << 4) + lo; > > + } > > + > > + return 0; > > +} > > + > > +static char const hexdigits_lower[16] = "0123456789abcdef"; > > Our typical order is "static const char" Ok. Will fix. > > > + > > +void av_uuid_unparse(const AVUUID uuid, char *out) > > +{ > > + char *p = out; > > + > > + for (int i = 0; i < 16; i++) { > > + uint8_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) > > +{ > > + if (av_stristr(in, "urn:uuid:") != in) > > + return AVERROR(EINVAL); > > + > > + return av_uuid_parse(in + 9, uu); > > +} > > _______________________________________________ > 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". _______________________________________________ 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".