From patchwork Tue Mar 17 10:54:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 18262 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 1248844B10F for ; Tue, 17 Mar 2020 12:59:54 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E053768B5E5; Tue, 17 Mar 2020 12:59:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9488E687F97 for ; Tue, 17 Mar 2020 12:59:47 +0200 (EET) Received: by mail-pg1-f196.google.com with SMTP id u12so11526154pgb.10 for ; Tue, 17 Mar 2020 03:59:47 -0700 (PDT) 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=KS7OASXkP5ye0e2STEX0NWwIz7+LHwr2wu6TfAleIbo=; b=raUJkpL3I82RxXa/zXhGhKmJ0Av4TBV73Grx74jYnST2245H0REDSxBiZdLNYNGsE5 KauTszrKMQH8M95UWES4xwreidcwqoG6zDOnWONMDsz+8C+LVBmHgWP9tXQloXP4QA+R ylyaF3k2izU92Z2BmATkUPSWjKpYzQX95odmvs4l5t0Ps+sNs85ZscYCNaPouQB2XdtL RmERuTBq+OKm/L3egqMQrlFCMROjoJ5H+7tZstfUscwGfiJ/mffs9s0V8mYWKVyHJuB3 rmP/hunh5KQphvH3+QD6mO7uc3Te8rSBwiNygpuXXy/F9MdMeiiM7Mwn6ELWNdaMfEDH /INQ== 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=KS7OASXkP5ye0e2STEX0NWwIz7+LHwr2wu6TfAleIbo=; b=RxM/8zWJ+qgfrVqxEk3uPdT2trpWVhcg3GbjKEcL/3FaJPt3mMeVU7LkTk3oQU/7E1 mkp8HznRepWtfdfTLO0NBJD3LqQyWpLqxa2mLO9eWv+XMCkPLPcOiSk2sn3mGwV56EwY X6w5FMjI1MmCh04ezM1MBwWAe/SyrPRW9WH/H5f3NySNJD16PRFKcM+srsURErKGkK9v 93DHmK/xbC264gZXAC/FjbS3O1gajMieEsFe4w9rwgKO4bfb3y6YKls8W1Vl/e6f2IPO z/AzOAoE7lqapbyyAKg2ILuzRTwqoN4E6fyUUnjv6oiteNyyYDtVNst8nQomQXnM9o6F Dv7w== X-Gm-Message-State: ANhLgQ15q5R7l9bSvaLUSZAlLh4dxPAJ1fAETHEPZcwWoKXB/4g0zHLd Dvr8Pm6o+3fC8vcj0tjCXQuY8VLS X-Google-Smtp-Source: ADFU+vvvPsH+WngwLAXHsMRNiIpi9aNRwNrw2UD3w6BPteIXcQS8tSWeSr6IcYMrkBzWp4crbvMI+g== X-Received: by 2002:a63:731c:: with SMTP id o28mr4360402pgc.139.1584442460075; Tue, 17 Mar 2020 03:54:20 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id 6sm2752224pfx.69.2020.03.17.03.54.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Mar 2020 03:54:19 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 17 Mar 2020 18:54:08 +0800 Message-Id: <20200317105409.2795-3-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20200317105409.2795-1-lance.lmwang@gmail.com> References: <20200317105409.2795-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v9 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 79b79db..36b9bf1 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);