From patchwork Wed Jan 8 15:46:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 17258 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 101DB44824D for ; Wed, 8 Jan 2020 18:11:54 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E84E668ACE8; Wed, 8 Jan 2020 18:11:53 +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 786F2680C14 for ; Wed, 8 Jan 2020 18:11:47 +0200 (EET) Received: by mail-pl1-f193.google.com with SMTP id c23so1320626plz.4 for ; Wed, 08 Jan 2020 08:11:47 -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=bSCXMWtFMddt4ujF3HU/p/+JW0h7KChTS576PQh7EcE=; b=hIKoaEiyq6zkinsO76NJlL32HsMJjX22Umh/O6bUiOkGVM6BE758t7+XahJ9LUFcLa +TD5r8co8PDL8Vdh1LL+jgtiUxnTBYcnsAzdM4JsJfv9vco8UVJLGQtIPoKZ2c+tO3Xf VGzG2vdSv/0GSj72thUWeM6NUlP1Rp9m6G2T/a7zbivC8DvaDZxbMkhPBon3tXk3C2wo 078o6C/pjzhFoMNX0jwTF5o81WYXA48c9/XLwSYy5PtsYEx4Qcr0NxvKnokGyOAr7ECG k2gFY/EpZSCMEtRl5Z3G4LOPZG4DtFV+CNusFuUAxA2tZLQrFipOnb6B07NfCsLcGtmj HUWA== 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=bSCXMWtFMddt4ujF3HU/p/+JW0h7KChTS576PQh7EcE=; b=mRNugUsFxs8nsPeOZRc0spfspkv6pftemjb+YXplPp1MNoA349HDGT+s0clQW1WlWT VOCo9v1ZcDhBI/9Ybo+DwLtcuiDPzUcAycfXIYj9zPkSwVfp0b/8OXboTxJnF7qvvSwQ MGngtL1/BYiLevr44fXJld5zgEQBJopH+uoH/jG+zNkrFw+W2SU/9Tk6T9r2a2ltudwN pAFK3EQQCPgPd8VOYnvHQX0Os0VVYFQ+F9AT2WGfZhbOrGV3dwWOECy05ArwBCj6bepb sollTkNzqu3GCzRegxVB1yfqvKGxg4EshihyMLahZPwCI3W8VMnBFb2DxK2O7ut1aHDn NFrw== X-Gm-Message-State: APjAAAXwCfGhKgsbIIyNv43t67mfSgN+0Qc5LfjXmPt85YjEJxMx+tDB TBUQDXqjwjDA906WULXChhy1AJfL X-Google-Smtp-Source: APXvYqxwt9VDB2zXBRm1Ba04iHX7wNE0B8K8V0CUYMbZysap4oqAY9xRnE+d2lpnPRm+/3XFOPQu/w== X-Received: by 2002:a17:90a:2203:: with SMTP id c3mr4920209pje.68.1578498377162; Wed, 08 Jan 2020 07:46:17 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id l2sm4109316pff.59.2020.01.08.07.46.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 07:46:16 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 Jan 2020 23:46:02 +0800 Message-Id: <20200108154603.5748-3-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20200108154603.5748-1-lance.lmwang@gmail.com> References: <20191217102217.4811-1-lance.lmwang@gmail.com> <20200108154603.5748-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v8 3/4] avfilter/vf_showinfo: display H.26[45] user data unregistered sei 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 5fff123..fc24e29 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -23,6 +23,7 @@ */ #include +#include #include "libavutil/bswap.h" #include "libavutil/adler32.h" @@ -170,6 +171,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_sei_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); @@ -347,6 +381,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) av_log(ctx, AV_LOG_INFO, "GOP timecode - %s", tcbuf); break; } + case AV_FRAME_DATA_SEI_UNREGISTERED: + dump_sei_unregistered_metadata(ctx, sd); + break; default: av_log(ctx, AV_LOG_WARNING, "unknown side data type %d (%d bytes)", sd->type, sd->size);