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 CCEAC4227B for ; Sat, 30 Apr 2022 17:53:26 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C739968B292; Sat, 30 Apr 2022 20:53:23 +0300 (EEST) Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 26CE368B143 for ; Sat, 30 Apr 2022 20:53:18 +0300 (EEST) Received: by mail-ed1-f44.google.com with SMTP id z99so12388936ede.5 for ; Sat, 30 Apr 2022 10:53:18 -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=/xv75IjmlFKxQ/yYyjoahgjZfyz9BdmfQhvi4UiB6so=; b=EcOxUH4V3yJl8rmtURPqNmvnFcRJQPZIZptQcHti1scSsFOwxjQ+ZX5lD11XMgigaz kew/aEpNdeg2sMJxZH6x1TFAGbusGZKQ5rArSPFtfZBojhsgVZS9s34bpx/5E4VRfgzR HuY+dOJvdrSwsIgqhTEUCHV6l54grIbGsFuWIDhk8x4JIHgHY5PZv4r99tEtCyVdGEz6 Y6iHSE2byD8t21Id0OFwQ3vAvFE+b9awpnozTBbcFUmtl+mwOiO7JuJEUQn82Sm8B/LQ DHMLd5yWzgjVwYs9C8EpNEPLpNAVwwNmjkGWuUFBgFfXOUdgTyIV86yqR1CoRM0sf/2s gPdQ== 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=/xv75IjmlFKxQ/yYyjoahgjZfyz9BdmfQhvi4UiB6so=; b=hhTfGGWxvbCtnOC2EbdoKRYfQqr0f9FngC0XF0zeeeSqVxfICp6DyPN7y0P9jxWdPM JNWGuVX5saV3a+7yltZNohaJU1aPMen4V37KiJqAF1VvBI3CmrUzxZw5NxFcKUdEkf1S OMTvhrMKiaXGOeG6Hy8FmDFCreyB615ab1U1MU1G3Fd1+UVak2ET1opqc4TfcPPQzgxF NbPqp5MnM+JG33anwkT4Ujc+9PsIGNCOGr8+tBRq6n63plazj60anYmpJIeLct+2e8vW rnX9QQYdBxGK9/4Le+dWQnzIjAmSUCLyBcZlIt0cN+Y6/4QN47Fd8ofaFZzbaY359C5a irRA== X-Gm-Message-State: AOAM530XLTXXxhT0iY7QO7RgmChTMQIvY5XyNiW3UJ6x7YgGzqXehQy2 3VddJtGtcRUPfCVN70Mh14dRyE07eo6/AkU7 X-Google-Smtp-Source: ABdhPJxIDfTxGjJyEnGTC93eDCOYncrKJ7r4V0N5GmD97DrlDfNHG3OLiGmQyRCZ/PHVO8jcNNwV2A== X-Received: by 2002:aa7:dd45:0:b0:425:8cea:8c76 with SMTP id o5-20020aa7dd45000000b004258cea8c76mr5309890edw.353.1651341197181; Sat, 30 Apr 2022 10:53:17 -0700 (PDT) Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com. [209.85.218.41]) by smtp.gmail.com with ESMTPSA id p21-20020aa7c895000000b0042617ba638dsm4279289eds.23.2022.04.30.10.53.16 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 30 Apr 2022 10:53:16 -0700 (PDT) Received: by mail-ej1-f41.google.com with SMTP id bv19so20911813ejb.6 for ; Sat, 30 Apr 2022 10:53:16 -0700 (PDT) X-Received: by 2002:a17:907:a0c9:b0:6f3:996b:3333 with SMTP id hw9-20020a170907a0c900b006f3996b3333mr4738413ejc.224.1651341196005; Sat, 30 Apr 2022 10:53:16 -0700 (PDT) MIME-Version: 1.0 References: <20220424101409.95486-1-zane@zanevaniperen.com> <20220424101409.95486-6-zane@zanevaniperen.com> <02a9b3be-e7a0-6283-188a-6033fde862b5@jkqxz.net> In-Reply-To: <02a9b3be-e7a0-6283-188a-6033fde862b5@jkqxz.net> From: Pierre-Anthony Lemieux Date: Sat, 30 Apr 2022 10:53:02 -0700 X-Gmail-Original-Message-ID: Message-ID: To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH v2 5/7] avcodec/cbs_sei: refactor to use avutil/uuid 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 Sat, Apr 30, 2022 at 10:31 AM Mark Thompson wrote: > > On 24/04/2022 11:14, Zane van Iperen wrote: > > From: Pierre-Anthony Lemieux > > > > --- > > libavcodec/cbs_sei.h | 3 ++- > > libavcodec/vaapi_encode_h264.c | 8 ++++---- > > 2 files changed, 6 insertions(+), 5 deletions(-) > > > > diff --git a/libavcodec/cbs_sei.h b/libavcodec/cbs_sei.h > > index c7a7a95be0..67c6e6cbbd 100644 > > --- a/libavcodec/cbs_sei.h > > +++ b/libavcodec/cbs_sei.h > > @@ -23,6 +23,7 @@ > > #include > > > > #include "libavutil/buffer.h" > > +#include "libavutil/uuid.h" > > > > #include "cbs.h" > > #include "sei.h" > > @@ -41,7 +42,7 @@ typedef struct SEIRawUserDataRegistered { > > } SEIRawUserDataRegistered; > > > > typedef struct SEIRawUserDataUnregistered { > > - uint8_t uuid_iso_iec_11578[16]; > > + AVUUID uuid_iso_iec_11578; > > uint8_t *data; > > AVBufferRef *data_ref; > > size_t data_length; > > This feels like a step backwards? The syntax template files are explicitly relying on this being uint8_t[16], so giving it a different name is confusing. What/where are the syntax template files? > > > diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c > > index 7a6b54ab6f..b3105d6ccc 100644 > > --- a/libavcodec/vaapi_encode_h264.c > > +++ b/libavcodec/vaapi_encode_h264.c > > @@ -25,6 +25,7 @@ > > #include "libavutil/common.h" > > #include "libavutil/internal.h" > > #include "libavutil/opt.h" > > +#include "libavutil/uuid.h" > > > > #include "avcodec.h" > > #include "cbs.h" > > @@ -43,7 +44,7 @@ enum { > > }; > > > > // Random (version 4) ISO 11578 UUID. > > -static const uint8_t vaapi_encode_h264_sei_identifier_uuid[16] = { > > +static const AVUUID vaapi_encode_h264_sei_identifier_uuid = { > > 0x59, 0x94, 0x8b, 0x28, 0x11, 0xec, 0x45, 0xaf, > > 0x96, 0x75, 0x19, 0xd4, 0x1f, 0xea, 0xa9, 0x4d, > > }; > > @@ -1089,9 +1090,8 @@ static av_cold int vaapi_encode_h264_configure(AVCodecContext *avctx) > > const char *driver; > > int len; > > > > - memcpy(priv->sei_identifier.uuid_iso_iec_11578, > > - vaapi_encode_h264_sei_identifier_uuid, > > - sizeof(priv->sei_identifier.uuid_iso_iec_11578)); > > + av_uuid_copy(priv->sei_identifier.uuid_iso_iec_11578, > > + vaapi_encode_h264_sei_identifier_uuid); > > > > driver = vaQueryVendorString(ctx->hwctx->display); > > if (!driver) > > This is fair. > > - Mark > _______________________________________________ > 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".