From patchwork Mon Aug 5 10:39:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 14241 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 B511D4474FD for ; Mon, 5 Aug 2019 13:39:37 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7AEDC68A89E; Mon, 5 Aug 2019 13:39:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 83C8568A0BB for ; Mon, 5 Aug 2019 13:39:31 +0300 (EEST) Received: by mail-pg1-f195.google.com with SMTP id w3so2308244pgt.13 for ; Mon, 05 Aug 2019 03:39:31 -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=XHnezi8ZT6/tEEK9rHjvOKGAaoSqIABxoiude/B47rg=; b=lpXR7ANUVi6gNeRbJ7LJDvK9Nf4UHvYAyVEBy+eU+k9gCBTBndLT9HQdBhRH5F16m4 rVLgS9mHFb9fgJPleRHKRlewzhCczPJwR0M38V8S8PqO/oBi/+bX5RXpSn4OzIrUBXme wn3VjovR1DjeXp/VM7H3h6le1o+oN+GMv1X/SWHh2q7XVC+Bphd5Bd2DakqtAhXQWs/n fSVFsv+NKUMWC0DNw6CIjwK8CRIXt5gX8WQL7VvaSr+hZWvZ7DYb9IMWCofHF3Kk1t1p LKFzunZAKWuLJ1kexcC+DBE1sExvekkRqUXw35NXAz4x7ZaaaPT348ogiGMdh5arJ53g lzGA== 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=XHnezi8ZT6/tEEK9rHjvOKGAaoSqIABxoiude/B47rg=; b=YydP8BBPqNHsYZn7TIFSz9qM50LNkAixdGytgNF/yQ8WzP/rKZRzMq7qU6jZF/911X SZmuFRkspmf5Dul2cnt9+sxGPdtZhJplQ9cBxltVFQtQC+7/GUK4HDLkvyQVNLVRkINz 1IKhjnQKpysFcej0tKfAwo+88OOEEWyMzFjbMVofk4IApsp9MULcDqz7amirOpiu3oEv qno1nU6Ax/tbRxgnQ9IQZHXmlDeSGf8dcfVsGu8NH/gp6yqZv5YJxMdBg+os/qFiinzN /mK5AeJJ6wbRHwP0hy96MFNPiAjuUApNEH2HST2doWsHVqNCZCg+EKu0Pdlf9Flmdb+1 vS6w== X-Gm-Message-State: APjAAAV5axNsswB5Lvrvv0Ic8/hogKasgX1eOJ9Z7FIhyDccLRABRTia dBVeD1db/WHBLd1y5ZyDoEzl6fBU X-Google-Smtp-Source: APXvYqzE50+TygOvd9Q15xFLCHV0LZIvTbLDl5d8D0JJ/w5H3dSXtYyRisgCWVGeIzWURpF0QM+tug== X-Received: by 2002:a65:6891:: with SMTP id e17mr14004032pgt.305.1565001569625; Mon, 05 Aug 2019 03:39:29 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id ev3sm16491597pjb.3.2019.08.05.03.39.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Aug 2019 03:39:29 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Aug 2019 18:39:20 +0800 Message-Id: <1565001561-8992-2-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1565001561-8992-1-git-send-email-mypopydev@gmail.com> References: <1565001561-8992-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V2 1/2] 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..d5c444e 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_ERROR, "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);