From patchwork Tue Dec 17 10:22: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: 16854 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 C18F144A003 for ; Tue, 17 Dec 2019 12:22:36 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A52A368A215; Tue, 17 Dec 2019 12:22:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0AA6568A132 for ; Tue, 17 Dec 2019 12:22:30 +0200 (EET) Received: by mail-pf1-f193.google.com with SMTP id y14so7278206pfm.13 for ; Tue, 17 Dec 2019 02:22:29 -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=YLGoLv8m6lG6bVZk1oUfgXPLHR20UPYwfWsglu3EFYc=; b=Ofok5X/RmQ1BzKqX2zYRfqeNXWV0CFdba8pEZb4kH3ZcJNCz2nf8OG625OHOjA6r36 y4AfmiZjOXyH8dj88X8K20kJPz8XPw/Lwais71i1yy2ida9Vds2Cc1vPTA2zXU+PKHqN RnpaWoihfFLWKRaKAkTPPN7ckWPaiK8wsU+JHtpWHC+YQg6Tg8NPxJ/kro5KWs2a93K/ t52ds7nrNzsQ8eZ0dHqfryFlhoMps5ZS+5L9tkT44a3f+fAd+juDgQ3BSsEkBqB6/Qf+ RgPPp1w1hwtlvHiUJKAMGJadOFX/7DauH731BfsEsYWByQE5e+KKaVY8Rxp+tZwxUJKY 2cVw== 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=YLGoLv8m6lG6bVZk1oUfgXPLHR20UPYwfWsglu3EFYc=; b=f1/qVhl+oLeAPYL/gZo2vwdXUjinsotGTh7iJG2AvwLQroO2RDmNf9TlkclcjS7zow I4awTnLPVVBHsrlv+Ft1QgDBRrTxpWC3M9HyldSlsqetGyHDbgcvyV0xF/xRlLZhoDEs PAI8y1utSBSBtsfL1NVg91DCF/DZSijGDEfRXZ4ROmIx66mRsJaKvtDmgCdlLWN0VLU5 cm1ZIjh2ucrELIXAadrsaSbLsa+1+/HypZZRkltv+Vwe4KtgY2xVjh92jjFIgKqNXL6g XUWgq+M5sO/0JmhnRY9F2NuGccyr60YQiYNYP9C8dSjzZlc/n2nw5ASgY231zZMlg4dk 8DhQ== X-Gm-Message-State: APjAAAWPfgY55H8q34xhWiePUvlh3tln4xyugSBgs+HD6xMyxA6n5INN KV9dVUj32mEvuTevwYYbGXH1O8vb X-Google-Smtp-Source: APXvYqzYqcfYH/nYKIR4oWEhgjq3RzTTAIRFeGBiAKoKu5cO1v+1rqTZVOPfwnmPfuG7Cdo5PYDOzA== X-Received: by 2002:a63:d807:: with SMTP id b7mr24771143pgh.52.1576578148039; Tue, 17 Dec 2019 02:22:28 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id j7sm29027254pgn.0.2019.12.17.02.22.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Dec 2019 02:22:27 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 17 Dec 2019 18:22:15 +0800 Message-Id: <20191217102217.4811-3-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191217102217.4811-1-lance.lmwang@gmail.com> References: <20191217102217.4811-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v1 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 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index 31f6b32aa4..0d227983c2 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -169,6 +169,23 @@ static void dump_content_light_metadata(AVFilterContext *ctx, AVFrameSideData *s metadata->MaxCLL, metadata->MaxFALL); } +static void dump_user_data_unregistered_metadata(AVFilterContext *ctx, AVFrameSideData *sd) +{ + const int uuid_size = 16; + + if (sd->size < uuid_size) { + av_log(ctx, AV_LOG_ERROR, "invalid data"); + 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", sd->data[i]); + av_log(ctx, AV_LOG_INFO, "\n"); + av_log(ctx, AV_LOG_INFO, "User Data=%s", sd->data + uuid_size); +} + static void dump_color_property(AVFilterContext *ctx, AVFrame *frame) { const char *color_range_str = av_color_range_name(frame->color_range); @@ -319,6 +336,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);