From patchwork Thu Jan 2 01:28:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 17126 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 75CB944788B for ; Thu, 2 Jan 2020 03:30:08 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5F80368AE47; Thu, 2 Jan 2020 03:30:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB26268AE47 for ; Thu, 2 Jan 2020 03:30:01 +0200 (EET) Received: by mail-pf1-f195.google.com with SMTP id x6so20236939pfo.10 for ; Wed, 01 Jan 2020 17:30:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tk9T21VXpA22SIkzaUiwSPwHzhwfh09loxBgiVpBs7k=; b=shbGiGNDfcV+CLPOwzA2eI79NseDbRgeSLZI03AxT1qJPlNrdKtFXh3vL94Tumd/lf PNksq2uCRo0/+zZXuvGsnEPivMTI9XkCdzd+N9VrhP4OQp5m23vQMIC6bwVBXlOwlyzc /XRfLPZ7NgPheG+HulnXj9nJoIx0AQidLSDn9WlZtN0PwRW79YM4b8l5cpJz68QOgV6Z rX0sQMrSLgIWb38JxZqdCcXAHOoYpv7FwjwGpzQ+3zIsfisETYhHPV3C+xMSe8KBvLK0 GKcnb6rEPtx4TOmYhow74pmFPKP6BaWJWFyV4a+E6gR0pv4q3tF7AKxV5SKORN+dwtkb rQLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tk9T21VXpA22SIkzaUiwSPwHzhwfh09loxBgiVpBs7k=; b=a7KBIVJY+2emWBlc/vm2/QDxRjRKht3hjFu9foC0hFM8mPEFowthN03IG5bauvIZaG XtPqxzs+MG67bXWqFUaBb8WCAvoRi8MCrTXklpBQlSOeuod15r/KwqaexhxDmnSnKq3+ fscVkRHsH+FNAaLcI8Ir9kKmxD6kVhJoCGsrUGrVE88ogxUMvyeVem73LpOQMRp4vHqb 5S90Uf43YYCuUV4fhMh3xCUHmh4kpPbkC+OyCKQ5jEWoMvH+6z69EP2mVxN/gPUIUCrM oX7f6rIJEsBt+BgnrwukMNoei0rXufPhOcj51UKNjBqOv6VafniA/e6re9MRjYA+Gh1B A4OQ== X-Gm-Message-State: APjAAAUCfM/j3Y5UOXdPAz7NQ3uTkeIc5Zrkt8GDeJZssC/uQCGS3q8Q 0tnYEJ5cfc7lTjOO5lR2T0AfDLu6 X-Google-Smtp-Source: APXvYqwRRtOFFkor/OCBvCgv/AcGAh17iRktbgMrKLOa/d5LraXrx8Jw8nEZeyro/GoPHz6F8ofakA== X-Received: by 2002:a63:de47:: with SMTP id y7mr84969058pgi.270.1577928600174; Wed, 01 Jan 2020 17:30:00 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id q15sm57121583pgi.55.2020.01.01.17.29.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Jan 2020 17:29:59 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Jan 2020 09:28:47 +0800 Message-Id: <20200102012848.18881-3-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20200102012848.18881-1-lance.lmwang@gmail.com> References: <20191217102217.4811-1-lance.lmwang@gmail.com> <20200102012848.18881-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v5 3/4] avfilter/vf_showinfo: display user data unregistered message X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavfilter/vf_showinfo.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index 31f6b32..bb3b37e 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -169,6 +169,36 @@ static void dump_content_light_metadata(AVFilterContext *ctx, AVFrameSideData *s metadata->MaxCLL, metadata->MaxFALL); } +static int string_is_ascii(const uint8_t *str) +{ + while (*str && *str < 128) str++; + return !*str; +} + +static void dump_user_data_unregistered_metadata(AVFilterContext *ctx, AVFrameSideData *sd) +{ + const int uuid_size = 16; + uint8_t *user_data = sd->data; + + if (sd->size < uuid_size) { + av_log(ctx, AV_LOG_ERROR, "invalid data(%d < UUID(%d-bytes))", sd->size, uuid_size); + return; + } + + av_log(ctx, AV_LOG_INFO, "User Data Unregistered:\n"); + av_log(ctx, AV_LOG_INFO, "UUID="); + for (int i = 0; i < uuid_size; i++) + av_log(ctx, AV_LOG_INFO, "%x", user_data[i]); + av_log(ctx, AV_LOG_INFO, "\n"); + + user_data += uuid_size; + /* Only print the user data details if it's string */ + if (string_is_ascii(user_data)) { + av_log(ctx, AV_LOG_INFO, "User Data="); + av_log(ctx, AV_LOG_INFO, "%s", user_data); + } +} + static void dump_color_property(AVFilterContext *ctx, AVFrame *frame) { const char *color_range_str = av_color_range_name(frame->color_range); @@ -319,6 +349,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) av_log(ctx, AV_LOG_INFO, "GOP timecode - %s", tcbuf); break; } + case AV_FRAME_DATA_USER_DATA_UNREGISTERED: + dump_user_data_unregistered_metadata(ctx, sd); + break; default: av_log(ctx, AV_LOG_WARNING, "unknown side data type %d (%d bytes)", sd->type, sd->size);