From patchwork Sat Aug 10 14:58:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 14372 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 63F50448504 for ; Sat, 10 Aug 2019 17:58:53 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 39F4668A86D; Sat, 10 Aug 2019 17:58:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C11BF68A86D for ; Sat, 10 Aug 2019 17:58:46 +0300 (EEST) Received: by mail-pf1-f195.google.com with SMTP id g2so47559676pfq.0 for ; Sat, 10 Aug 2019 07:58:46 -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=r+/Ejg5Qu5YwZLgFVJQOMd6QUKpkKIZou+cAlH53yvE=; b=fcxXLKsN+RfsQCtpk6FYOc6Ohz70Z4LAnVblcvSU5urG559Boh0YOAYI1+tQqAfEIA DcjTXffndeiN1zU2wIsfAp70gBcrEzbmxGQXxMsB3bPpeXEIDItrOZBzRJWV+q7oWI3+ vfbhy+48QXr+VPGD5YyrN33hPOmlbuBLJCTRoqjyVYrswZQWCTvOx0ZHLz58V35w+fwA D3n37PESsySWvLB/og28N9oMVKsCfmeGGPbPS3ar/7MxxShjMCopDJmR89pVBazaZdCN eqJ64UgMPq2NJ3sh8wwA6GtPDr9euIwdeA8f0a/SoTCAcBGwDoYvBuDfJmPN1TXm3lrC ZPGg== 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=r+/Ejg5Qu5YwZLgFVJQOMd6QUKpkKIZou+cAlH53yvE=; b=haZFSNtmwVSHfXSbWSRXYC9T9msUfT8wecQcCHV2ZkeJoyK27ItNz2MWLAni+MTNlh 6eC6iuPyMQzsmkiWP79WfCsCbGiU0uTeYW97oQg6E5bWDSRfoZBfLSKhZu1KHwL5q4/1 mjItJ4h58ctZhzHJMYeu8x66Gi+4xaTJu/8HuXADKD7EliJ3gH+K20QcwO0VWEe8+JyG sPpTt06El+JThjpJZhSKx6cjdPwWdTRXh8xb3jBErIED7oEbFK7w2kUeBI+gVKQ7H6Cf 9yDaGF3pifJLujj5vfNJrZQJrlnz+z2SoFDVKvSw4MNLslBcIzQFg3PcJoUDrncUAMRF 4jHA== X-Gm-Message-State: APjAAAVIcRH+SHGNiXpzDSFR0rhJM/zOd9UlpMfpCkzaalcf7aYHCGFr XViutauRhfvqLuMjvYOTIJeBCXgu X-Google-Smtp-Source: APXvYqxLaJRQRC2VDxCKUvDrVHdyXZBwSHw29hvudeWD3lrSXF8C+lI+1pXEKQUFX5gmic0WqmW+8Q== X-Received: by 2002:a65:4509:: with SMTP id n9mr22284458pgq.133.1565449124844; Sat, 10 Aug 2019 07:58:44 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id t9sm8468111pji.18.2019.08.10.07.58.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 10 Aug 2019 07:58:44 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 10 Aug 2019 22:58:30 +0800 Message-Id: <20190810145830.12284-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190809022802.9740-1-lance.lmwang@gmail.com> References: <20190809022802.9740-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2] avfilter/showinfo: support Content Light Level information 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 show real information instead of the unknown side data type message for HDR10 stream Signed-off-by: Limin Wang --- libavfilter/vf_showinfo.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index 9fa322e..94d17bf 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -160,6 +160,20 @@ static void dump_mastering_display(AVFilterContext *ctx, AVFrameSideData *sd) av_q2d(mastering_display->min_luminance), av_q2d(mastering_display->max_luminance)); } +static void dump_content_light_metadata(AVFilterContext *ctx, AVFrameSideData *sd) +{ + AVContentLightMetadata* metadata = (AVContentLightMetadata*)sd->data; + + if (sd->size < sizeof(*metadata)) { + av_log(ctx, AV_LOG_ERROR, "invalid data"); + return; + } + + av_log(ctx, AV_LOG_INFO, "Content Light Level information: " + "MaxCLL=%d, MaxFALL=%d", + metadata->MaxCLL, metadata->MaxFALL); +} + static void dump_color_property(AVFilterContext *ctx, AVFrame *frame) { const char *color_range_str = av_color_range_name(frame->color_range); @@ -301,6 +315,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) case AV_FRAME_DATA_MASTERING_DISPLAY_METADATA: dump_mastering_display(ctx, sd); break; + case AV_FRAME_DATA_CONTENT_LIGHT_LEVEL: + dump_content_light_metadata(ctx, sd); + break; default: av_log(ctx, AV_LOG_WARNING, "unknown side data type %d (%d bytes)", sd->type, sd->size);