From patchwork Tue Jan 7 05:03:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 17224 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 3CFB344B956 for ; Tue, 7 Jan 2020 07:04:16 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2128368A48B; Tue, 7 Jan 2020 07:04:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 904BD689DAC for ; Tue, 7 Jan 2020 07:04:08 +0200 (EET) Received: by mail-pl1-f194.google.com with SMTP id az3so22690108plb.11 for ; Mon, 06 Jan 2020 21:04:08 -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=ympV7RNxFEHhOKqsRkXlSCJ4FC3brdbxIwLFEZF9YrM=; b=SIixvIRnkDLeLwvlw45kNoeII0ujqjEaEWF0/S1iiyBk28EfcMm+h3jCzEpzyzk0YX mlBvAdiV9vRYHxWl51oPK65hFPoNrXLVBl2SPu2J/822sW77nKVQ9aKuVUjRDAFX3JXv /+zHJDJp+W3ZKt6w60RRADOOMWfGLOYfRzoaMNOIk0S0N3TQbBLKhEEuv3gaKsn87Yo0 jGpLEB3/LcPOdXHnHEGJvqF+IJZHxF/bx7wljU5Lldb5lwDP6/6sRBZUthWKDLLiwwSJ TsbxUybqzVcYvMSflPcVIy85wdKKcdOXHX+7oEx0kiVs0gSOH7HRfC62h3ohIJFQET3K YgHA== 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=ympV7RNxFEHhOKqsRkXlSCJ4FC3brdbxIwLFEZF9YrM=; b=qj237/O50rSMHzahaj7ueck/n2HUtSX2UDk6CO5ssUdhofm+/C4mI8wKidSkWMKIzm OFppaUc0Z5WeMLWBVMl2k6NNCLn8S223rT1+xh1d1kT3zEOqGEZWbRBuCHvH8kAGGThy kX7ziF8fHUD2MZSV/phWxSn7T6eYcD5c7HI9P+Db+Qx4sKDjQ0PyPAgC52+W0QnjpQ51 bgUQv/LICJ0cl75aYB2SEZZAkNGtqJ/mCFgai19tqP+KGi0kaXr0slaWyxMCSsDtPJcj qSuSdHmOUC00w+LmI+7FKwM9P4WaG89VSAqX27J9N+umM02GLXBpXEoiLbJKqKujEJS+ xZ8w== X-Gm-Message-State: APjAAAUgKMXpCkxx0J5/9XZMF7R19GjotrPr5cGz/9UhhYpXPhEc2Hv7 hvJX7mHooC3NjBtosUKay5L108Ff X-Google-Smtp-Source: APXvYqyyAMT7awUvrzZ9wr7X9IURJ2Vqkx1cOtAlojaDW9SCj5c8OfyO8o9BGcoKYR1axvkRPFefew== X-Received: by 2002:a17:902:d68e:: with SMTP id v14mr96574686ply.216.1578373446640; Mon, 06 Jan 2020 21:04:06 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id j9sm74096591pfn.152.2020.01.06.21.04.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jan 2020 21:04:06 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Jan 2020 13:03:50 +0800 Message-Id: <20200107050355.17503-3-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20200107050355.17503-1-lance.lmwang@gmail.com> References: <20191217102217.4811-1-lance.lmwang@gmail.com> <20200107050355.17503-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v7 3/8] 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 | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index 31f6b32aa4..14e73019d2 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -23,6 +23,7 @@ */ #include +#include #include "libavutil/adler32.h" #include "libavutil/display.h" @@ -169,6 +170,39 @@ static void dump_content_light_metadata(AVFilterContext *ctx, AVFrameSideData *s metadata->MaxCLL, metadata->MaxFALL); } +static int string_is_print(const uint8_t *str) +{ + while (isprint(*str)) 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, "%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"); + + user_data += uuid_size; + /* Only print the user data details if it's string */ + if (string_is_print(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 +353,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);