From patchwork Sun Apr 24 10:14:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 35428 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1335324pzh; Sun, 24 Apr 2022 03:15:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxx0sx+cwbVT6pCgbWjvAS93MdMixLHqIgLisBgjxbjAhGPkNoYF5WPLrhvWJSQSdRlyKnp X-Received: by 2002:a17:907:1c9b:b0:6f3:833c:2816 with SMTP id nb27-20020a1709071c9b00b006f3833c2816mr3715706ejc.601.1650795319795; Sun, 24 Apr 2022 03:15:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650795319; cv=none; d=google.com; s=arc-20160816; b=rNQDpcxcm1ome5shT1CRO+bW22Q+MlyofDlUlpgChfyfVuerMDx/AIekMv50HREjT5 pgyeyCvip471H6SJFss23OWMzmqoEAWtRiyzKJMjNtQnIDInEGCsVpj7dGhRay6YyPUj sDNS5/5/sK/buPg7OYmJSjcGL7mrn2unTgF+sRXnP9YYnInIKV33fgdo4f17vLwBoaZh FCaZvOyhPPbGtC6y1tGiGwd1ElmiTRmGbv+qef50WFQUUr+DqTnGNxZqqjvxH1fX5TyZ qIXzAN+RVzjqRihbsvOD4uihjZbCYIFvGUrN6wj9qB8gT+r1ZS2gb5z7OiU9NEOkBHHt Xt6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:delivered-to; bh=2o3ZTKY4ZdWkjoL1Tpg9duto+QesmlJuN8m4MUPtQho=; b=H9t+6qzcV3oWLnQzAkDpdnoPDrrPEYH77CSEzwAMRpn7SdI6pCvDiii9EYbLMljZl4 epRmf44DnF3W4Cf37MPj/3K0J49kjN2/EUkTenesJYif5M8hwabxqzBkSWVerIc/sqX6 AYUYO6vixm9GNw5QPqJoOInWDxJu35cPw9i6lZnNHHl9NzqL19yEWDNutEkUb6J3f7yL GsZpaAbooDlFMu5pGO1aBGv8VLo3VLPn5T87EdmiqJpK2FE7zVdd2rlKO29eAqVBk3ae VrvGlPxnnPaXZX4XwsZr3ASfTVQBipFivqxFp1EMKlzqN8Mk/hhvz/288jjfaxMBR1Ap XTQw== ARC-Authentication-Results: i=1; mx.google.com; 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=NONE dis=NONE) header.from=zanevaniperen.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n9-20020a170906840900b006f37d29a841si2228676ejx.264.2022.04.24.03.15.19; Sun, 24 Apr 2022 03:15:19 -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; 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=NONE dis=NONE) header.from=zanevaniperen.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9466568B2A4; Sun, 24 Apr 2022 13:14:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out0.migadu.com (out0.migadu.com [94.23.1.103]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3037568B28B for ; Sun, 24 Apr 2022 13:14:48 +0300 (EEST) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 20:14:09 +1000 Message-Id: <20220424101409.95486-8-zane@zanevaniperen.com> In-Reply-To: <20220424101409.95486-1-zane@zanevaniperen.com> References: <20220424101409.95486-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: cadance.vs49688.net Subject: [FFmpeg-devel] [PATCH v2 7/7] avfilter/showinfo: 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 Cc: Pierre-Anthony Lemieux Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: wgPM5iaMGQ4A From: Pierre-Anthony Lemieux --- libavfilter/vf_showinfo.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index 12d39310ef..0d6f2805bb 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -42,6 +42,7 @@ #include "libavutil/mastering_display_metadata.h" #include "libavutil/video_enc_params.h" #include "libavutil/detection_bbox.h" +#include "libavutil/uuid.h" #include "avfilter.h" #include "internal.h" @@ -421,29 +422,21 @@ static void dump_video_enc_params(AVFilterContext *ctx, const AVFrameSideData *s static void dump_sei_unregistered_metadata(AVFilterContext *ctx, const AVFrameSideData *sd) { - const int uuid_size = 16; const uint8_t *user_data = sd->data; int i; - if (sd->size < uuid_size) { + if (sd->size < AV_UUID_LEN) { av_log(ctx, AV_LOG_ERROR, "invalid data(%"SIZE_SPECIFIER" < " - "UUID(%d-bytes))\n", sd->size, uuid_size); + "UUID(%d-bytes))\n", sd->size, AV_UUID_LEN); return; } av_log(ctx, AV_LOG_INFO, "User Data Unregistered:\n"); - av_log(ctx, AV_LOG_INFO, "UUID="); - for (i = 0; i < uuid_size; i++) { - av_log(ctx, AV_LOG_INFO, "%02x", user_data[i]); - if (i == 3 || i == 5 || i == 7 || i == 9) - av_log(ctx, AV_LOG_INFO, "-"); - } - av_log(ctx, AV_LOG_INFO, "\n"); + av_log(ctx, AV_LOG_INFO, "UUID=" AV_PRI_UUID "\n", AV_UUID_ARG(user_data)); av_log(ctx, AV_LOG_INFO, "User Data="); - for (; i < sd->size; i++) { + for (i = 16; i < sd->size; i++) av_log(ctx, AV_LOG_INFO, "%02x", user_data[i]); - } av_log(ctx, AV_LOG_INFO, "\n"); }