From patchwork Sun Aug 4 10:30:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 14220 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 8C829448A3B for ; Sun, 4 Aug 2019 13:30:49 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6D18068A7D9; Sun, 4 Aug 2019 13:30:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C2BD6801B2 for ; Sun, 4 Aug 2019 13:30:43 +0300 (EEST) Received: by mail-pf1-f182.google.com with SMTP id p184so38153523pfp.7 for ; Sun, 04 Aug 2019 03:30:43 -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; bh=yZW+1ORLnMf4QBkS9BqZN2k6qpRs98WxpykImrvUq7E=; b=ouOGw6qPbMbONQoEs4cmZAjNTsJKxkgkGZvovrv3ieybYIWaIGBIh2fCbPOoCkOt8R 2aLF36BPEZUGAQynCV2lpbTV1pSHJqZdjIQMXV9BvG1GehofXFqYU/Qp2oYyCkQ1Z0UR 88q7wrxuP6+uozM4b1bMcjuIdwcNW2mb+4Oi6Bdm+8CvFfknp2gKB7slVhZEb4rdOc6v 1f/Ims4QPzVgZRf3q17k2GTy3mJhy7wj9rZAyZTnoPOV3xzI7TYfSmSsnovlfgU/fdiv pPz3oOpfZf3hC0aRxaWCUZfmQGGBmFHnLHfgk92Q4ZwddsqPX4jIaG0nq9lcdH/c5mzE VzsA== 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; bh=yZW+1ORLnMf4QBkS9BqZN2k6qpRs98WxpykImrvUq7E=; b=pNGZ9KiVWWBS2tAO8vwZX1n/s80je7jXB1sut/PRA0OkzOpcUXGHmepCHTGpkA5TQc WY+kj2pBQTAz86KP/RA3bWn7zUoYu+Iq4cmG9XyTk7o3OR/JOh5jWiDeIBdTy3TQ7M8Z 4mE6UsiOyUixa1lS0kWpj4fppOHFW4vTjsjwWgFzRxNL/PsMZlGAODn+3jk8AnRdaM1Z 2nPUzFACZfM5uzWQsRp+NiyZxR3d+XoBGpSuKUhd9XNbQXdmzkFzJn7/6+xhrC0rVywV KHZJsdkEMLP4l/vMOLnKTlfoJ86kl4YP4eIZMYQQKhr3N3IAqtfieP3PLKBfQo8QG76n DOuw== X-Gm-Message-State: APjAAAWiz2EFyvRibXOmxKdEHP/M1GcUCMvsR7SuSHAN3JSg9DL6cYat jQu48fyfNvss14ir9RsnMQkZ+xhr X-Google-Smtp-Source: APXvYqy9wHjel990+Amc3ZUTMzFfuqchF881/TqcevA0tj54LUjZCtBbm4aUTrwlAjhD2KHPb3nFvQ== X-Received: by 2002:aa7:8106:: with SMTP id b6mr68065569pfi.5.1564914641340; Sun, 04 Aug 2019 03:30:41 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id m101sm11271875pjb.7.2019.08.04.03.30.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Aug 2019 03:30:41 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sun, 4 Aug 2019 18:30:37 +0800 Message-Id: <1564914637-18037-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 Subject: [FFmpeg-devel] [PATCH V1] lavf/showinfo: support mastering display sidedata 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao support mastering display sidedata. Signed-off-by: Jun Zhao --- libavfilter/vf_showinfo.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index f6f8f49..8889c01 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -34,6 +34,7 @@ #include "libavutil/stereo3d.h" #include "libavutil/timestamp.h" #include "libavutil/timecode.h" +#include "libavutil/mastering_display_metadata.h" #include "avfilter.h" #include "internal.h" @@ -133,6 +134,32 @@ static void dump_roi(AVFilterContext *ctx, AVFrameSideData *sd) } } +static void dump_mastering_display(AVFilterContext *ctx, AVFrameSideData *sd) +{ + AVMasteringDisplayMetadata *mastering_display; + + av_log(ctx, AV_LOG_INFO, "mastering display: "); + if (sd->size < sizeof(*mastering_display)) { + av_log(ctx, AV_LOG_INFO, "invalid data"); + return; + } + + mastering_display = (AVMasteringDisplayMetadata *)sd->data; + + av_log(ctx, AV_LOG_INFO, "has_primaries:%d has_luminance:%d " + "r(%5.4f,%5.4f) g(%5.4f,%5.4f) b(%5.4f %5.4f) wp(%5.4f, %5.4f) " + "min_luminance=%f, max_luminance=%f", + mastering_display->has_primaries, mastering_display->has_luminance, + av_q2d(mastering_display->display_primaries[0][0]), + av_q2d(mastering_display->display_primaries[0][1]), + av_q2d(mastering_display->display_primaries[1][0]), + av_q2d(mastering_display->display_primaries[1][1]), + av_q2d(mastering_display->display_primaries[2][0]), + av_q2d(mastering_display->display_primaries[2][1]), + av_q2d(mastering_display->white_point[0]), av_q2d(mastering_display->white_point[1]), + av_q2d(mastering_display->min_luminance), av_q2d(mastering_display->max_luminance)); +} + static void dump_color_property(AVFilterContext *ctx, AVFrame *frame) { const char *color_range_str = av_color_range_name(frame->color_range); @@ -271,6 +298,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) case AV_FRAME_DATA_REGIONS_OF_INTEREST: dump_roi(ctx, sd); break; + case AV_FRAME_DATA_MASTERING_DISPLAY_METADATA: + dump_mastering_display(ctx, sd); + break; default: av_log(ctx, AV_LOG_WARNING, "unknown side data type %d (%d bytes)", sd->type, sd->size);