From patchwork Thu Dec 19 05:09:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 16880 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 A47284485BC for ; Thu, 19 Dec 2019 07:09:31 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8F2C868A613; Thu, 19 Dec 2019 07:09:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f66.google.com (mail-pj1-f66.google.com [209.85.216.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D22846881F4 for ; Thu, 19 Dec 2019 07:09:24 +0200 (EET) Received: by mail-pj1-f66.google.com with SMTP id t101so1936385pjb.4 for ; Wed, 18 Dec 2019 21:09:24 -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=34AQ0SVIzSOt92QIWi3RcmK/6QHWCMvSgHm7E6gE7Ho=; b=UMGFfraLHDCjH180UvrYu/2OuIEzvyWQFwDq5GL529eFL8ZbXG/x4pNVRfUwbK24ZD PMRP0pYIh3xU+T8HW4RcXV3q6EwptdeFpsEIGxhOiPrvyJPwlXzgYVGUD5Xl8OKsZOx1 TY22UqJE+lsoUTRqPbfS+zyzQmDFd2M2RivN3FJc4lt/24EMlOqbmdhWdyr+pfl+5FSL fPJTrmb8toEXXQbjCRXeiRlglWFXtMPthEZXtIALiGDQ+eba9aDDE75JPbWcBhZoz2ia SuyGC2Wucb9R+Hgt82MpUpKfmCGBO0f4V8hiWqqecJjKP5wTYtdes5UOFKM6a37AhYmj e1zg== 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=34AQ0SVIzSOt92QIWi3RcmK/6QHWCMvSgHm7E6gE7Ho=; b=LSaxwbVCkfAc1WeYJzcSCZYgtB+P90yKwkaE2y7Dsv0sDsEmKZyU93Yjb2BFGezrO+ TZOVSyvhKc8pBSe0zGWDHwokBDKx3KwVbPN0AjYqcApjF6zqbAB5TJr97/ti3uh4gAbV 74Vb+fcwlWRkULbj+pR3T5CwxFxWZaDbe9HL/uPTFKjpNz59N9hAD8Xflx29pOxcmuWu rv34JZXvrhq4y6pxNWS0fIYtWbT2naGabQVBcYld/bZDKCggznVaJ2x23Nzer/7rsESI 9Kv/EbwqYPfWIOXvZKciVZOw4AMzkMs/WKP94GLhGGdWBKxECaeeLSW5AbLcohX/PBLo w5Zw== X-Gm-Message-State: APjAAAVnrlt2HYbdmUbkC7Eyr01vkjulXWSDXAvUbne5Sd9C94muy2Sc DLXg1OzwYHex32uuoOrC1gzgJCJn X-Google-Smtp-Source: APXvYqxx/l/MmhjrMNOM6qvI1nSWbHz0shovTWuQnDA9QibX/3QsMc7wgQyYIS3V2LH3PPWjc3mENA== X-Received: by 2002:a17:902:c509:: with SMTP id o9mr7023758plx.112.1576732162971; Wed, 18 Dec 2019 21:09:22 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id u6sm4925897pjv.31.2019.12.18.21.09.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Dec 2019 21:09:22 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 19 Dec 2019 13:09:05 +0800 Message-Id: <20191219050907.15041-3-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191219050907.15041-1-lance.lmwang@gmail.com> References: <20191217102217.4811-1-lance.lmwang@gmail.com> <20191219050907.15041-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 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 | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index 31f6b32aa4..bb3b37e0c5 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);