From patchwork Wed Dec 18 11:06:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 16871 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 DE25444AEDB for ; Wed, 18 Dec 2019 13:06:55 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C20CD68A591; Wed, 18 Dec 2019 13:06:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A901368A4DB for ; Wed, 18 Dec 2019 13:06:48 +0200 (EET) Received: by mail-pl1-f193.google.com with SMTP id p27so808737pli.10 for ; Wed, 18 Dec 2019 03:06:48 -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=ZWN0FYgl1jwTIkEPnIjKMubM6JysNGypZ0J1bKO0e3Y=; b=cVjTznre2FZRs65S3nIWv9Yfmcu1tGG65x4shuRMqkEFNF8teb6PnJ/jfvjzVgTPQn MkLKa+OhLLY6yzyemd4ygJROy5HZxgjbwD4tUAkRvqA2yUsFWqPcSvnRbhz4V1N/vTvO yOkc3/+Vs7s5PbQpN9QB6u4eq4G5RNE9KpKODgszX20vhP1adAKSC+7eOlctfbruFpDM akdG/aldAiN7fbX0rVi/052oTtoHqoLBYd2/f1AXGZMrJiligN/KQdf5yeLPDzeow/mX U4tLtKyvmjCNdEVLVwey40fr4cS9i8bVrKN1jcyn2K+MFEt76ZN6hq91pb6zf1zhBzVv A2jg== 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=ZWN0FYgl1jwTIkEPnIjKMubM6JysNGypZ0J1bKO0e3Y=; b=rfRhUNVRp/V9eTUMqCbsgceCO0mQo7epxZIlpBRiiI1IfoF6FPT6r2o//+un2YTyR9 3xqwsc97GQKpV2uElsJ4lmQQrEW+6e2Rk+IHtmrBCXeknJyVOpgMap2SR26LbA7GBk+J BJgStEimfRd7Evu30nvu0lYagrEiEFRDz6PWsjsKrb9odz2n39ABhqsYjN8QQh8tqjVz u6JEaczwmQWoIRSgXPaxGA/hrMIxdeA6/l7o2EX06u02i1uxnCg3fnQuLoV4Q968GMo9 KZ+3amcot0pwatJJ52r4eMHpjWZY92mB0Jv65HeR3rqqsG4DFfMMeCV3R7kkeWkPAnJK wLMg== X-Gm-Message-State: APjAAAVs8l5kKWHwobzcah7GQ4WHa8YcLggsLLS8T0+c79G3R65IZ3wv nDNxmgvw51ZfbTsLNwu0Zp2atj84 X-Google-Smtp-Source: APXvYqxi/ZPDcVQJqNmjy3CjyFfjUnUY06PF7uibhS4v5Oz/tYCgkbwwuQrrvihE6VxwTxrhJCDMuw== X-Received: by 2002:a17:90a:2808:: with SMTP id e8mr2064063pjd.63.1576667206814; Wed, 18 Dec 2019 03:06:46 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id 144sm2977831pfc.124.2019.12.18.03.06.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Dec 2019 03:06:46 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 Dec 2019 19:06:15 +0800 Message-Id: <20191218110617.13295-3-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191218110617.13295-1-lance.lmwang@gmail.com> References: <20191217102217.4811-1-lance.lmwang@gmail.com> <20191218110617.13295-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 3/5] 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 | 40 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index 31f6b32aa4..77ee7f312c 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -169,6 +169,43 @@ static void dump_content_light_metadata(AVFilterContext *ctx, AVFrameSideData *s metadata->MaxCLL, metadata->MaxFALL); } +static int is_ascii(uint8_t ch) +{ + if (ch >= 32 && ch <= 127) + return 1; + else + return 0; +} + +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"); + av_log(ctx, AV_LOG_INFO, "User Data="); + for (int i = uuid_size; i < sd->size; i++) { + /* printable ascii */ + if (is_ascii(*(user_data + i))) { + av_log(ctx, AV_LOG_INFO, "%c", *(user_data + i)); + } else { + /* don't print the last byte `\0` character for ascii */ + if ((i == sd->size - 1) && *(user_data + i) == 0) + continue; + av_log(ctx, AV_LOG_INFO, "%x", *(user_data + i)); + } + } +} + static void dump_color_property(AVFilterContext *ctx, AVFrame *frame) { const char *color_range_str = av_color_range_name(frame->color_range); @@ -319,6 +356,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);