From patchwork Sun Mar 27 23:25:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 35007 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6d9d:b0:79:214c:b845 with SMTP id gl29csp4097679pzb; Sun, 27 Mar 2022 16:25:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyosiEov+pTQAOQE+txp1kXm8n8OEABq4qaNkqWDn719VZQts5JlZo+faN0rVqd6OKDQz4h X-Received: by 2002:a17:906:4fc9:b0:6e0:648e:5156 with SMTP id i9-20020a1709064fc900b006e0648e5156mr23669293ejw.412.1648423549310; Sun, 27 Mar 2022 16:25:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648423549; cv=none; d=google.com; s=arc-20160816; b=yyHnPgn/SpuVjd5VL//n4DDd2lCns9Glt9ZDXKQXGHGEpboJ8+SyCnnFy9T69PUAUt Aske+tkrA8erbbF40mgqVH6+M8RgvYX0NRmM/IINLJBB/SArVMDN8e50WFur0fhC/gwm 7nBtTx3Do3jv4UIv8u4VgY6BQG8cMeMC54d5owIhFKkujtv3eP6Ds6kEvwuYoaaK1GoZ WVSSA0kGwBrjyuynPyJxKphYxPNj6gfragPgId5K1AtliDhCUW2LAL3q2j58VqkSgL8T Vv8muOVFlig1jlviEb/UGWLDdBZraLW+3WXoDbD6JzTFxCH++nXGPaJOABO8T+fBnC/L NcIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=z9SbYHG5GR+m1I4oRSOh/eR9Dg1x+IQWEaFcBtURRF0=; b=LadeUORL6Eq2nLGkZSIMbqSEzCUw18G12KGhxwXr2MKtaftS+XgYEeEJr6aMe06DM5 rYg3DHnUs1RaFPGwzWO6m86M49csDgSmDE22Rgdg1hZ9UOF/iv3XObRiSuGzZWdgcNLQ zGIrUCHBQRd4WP1TRtFhI1E5LWenfiWMd0YDQtq06XZqT6pp5U3FV/7iD6xEO+b6ocWu A64fGYnndHNi/ptSAYh7aU3+EzYP5Wi4z6S9T9RCbCzeF8g4RRRwZIDiz4yx6pu8vzq2 a9E0Cj3lCOvP/3OBwVSpCIOKKdk/z029IVBRRGtWQsFnQf4jXV5zJi4bKeCtgrZMa9cW 7MsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=EkPkg9PN; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z8-20020a170906668800b006df76385b9bsi10882285ejo.59.2022.03.27.16.25.49; Sun, 27 Mar 2022 16:25:49 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=EkPkg9PN; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4B1C468B28D; Mon, 28 Mar 2022 02:25:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA6A868B279 for ; Mon, 28 Mar 2022 02:25:21 +0300 (EEST) Received: by mail-pj1-f51.google.com with SMTP id p4-20020a17090ad30400b001c7ca87c05bso8388975pju.1 for ; Sun, 27 Mar 2022 16:25:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=04fHkXyvgp77p7YDdAu3zlzgXdGy8r8AYFNJ4Dfq9s0=; b=EkPkg9PNgHJSi1lDR9kd83l4jhLV27SMy39i0rsMu3iFa4L5E4rEynofb091Aga7eM CIE+Am3uKD38S+XGb8Yo33/v+vqj7y+PbZobljrlv3ado4mro3/umwIx6QJ1urlbgQWt n6Zh52SwtcGAJ49o3cLZZEuuWdu+AjzUKTx76XTijmjsGt99+ndZnB5zuvrdzDSr6Qnf 5nQaoT1HZM2wGIgYrXWILvKhjzSID0lfOE4TvSyv7NQJpAfLyXMtRPRtf0Fv9Hj84dme 5JJSCoDOReBZwZ6XVFS+mrw0CcyWqJBJcy9B2qICUjBpVtmyRUdWDkEBv8RpHQ1C034D 9iRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=04fHkXyvgp77p7YDdAu3zlzgXdGy8r8AYFNJ4Dfq9s0=; b=P1KPw6FeWJnngJDl3tNH1en3mzYplQl1k14HwLz2nWONApc/b9Itm1+P/vTzqTDhYm MXtiBubVLSJAQrc+SQnsgOm1Hqt7+MOEryP0TldBprSf/POLbZw6nzgsxOD8r2vr1lGk 69h8j6sS4UmFYhAqsjZeeiwAh3owwON3EZeIiFdymin+LOhhWvBbOZL05ljCrzWfkcYW Nn5Vv2gPz1fg/8XtNcu/Jn0yQJ0jaNFBbvENjfuCVlvCTBZQVc6EHboOw9nLFlAFDIgP 7Z9kUO66LFIg2rHhc7+8LfOCT9MVzt9/ktiCVgZG+zVTRmiY4Hzwob3Y3AH5g3modpUA 6sDA== X-Gm-Message-State: AOAM531v8MqKRkhZ7o3uCytTMHPM9H88ZOeM+m4MqbOVL1SYCl7/B6bt tpNLEIWpPoMJOxAg5RhgS+niMNIf9OVCZg== X-Received: by 2002:a17:902:a501:b0:153:f956:29f0 with SMTP id s1-20020a170902a50100b00153f95629f0mr23688559plq.120.1648423520094; Sun, 27 Mar 2022 16:25:20 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id bh3-20020a056a02020300b00378b62df320sm11000934pgb.73.2022.03.27.16.25.19 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Mar 2022 16:25:19 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Mar 2022 07:25:12 +0800 Message-Id: <1648423513-21261-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1648423513-21261-1-git-send-email-lance.lmwang@gmail.com> References: <1648423513-21261-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/4] avfilter/vf_showinfo: add support for ambient viewing environment metadata X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: Dam3JDxoG4J8 From: Limin Wang Signed-off-by: Limin Wang --- libavfilter/vf_showinfo.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index 12d3931..ad86251 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -42,6 +42,7 @@ #include "libavutil/mastering_display_metadata.h" #include "libavutil/video_enc_params.h" #include "libavutil/detection_bbox.h" +#include "libavutil/ambient_viewing_env_metadata.h" #include "avfilter.h" #include "internal.h" @@ -651,6 +652,15 @@ static void dump_color_property(AVFilterContext *ctx, AVFrame *frame) av_log(ctx, AV_LOG_INFO, "\n"); } +static void dump_ambient_viewing_env_metadata(AVFilterContext *ctx, AVFrameSideData *sd) +{ + const AVAmbientViewingEnvMetadata *metadata = (const AVAmbientViewingEnvMetadata *)sd->data; + + av_log(ctx, AV_LOG_INFO, "Ambient Viewing Environment metadata: \n"); + av_log(ctx, AV_LOG_INFO, " ambient_illuminance=%d, ambient_light_x=%d, ambient_light_y=%d", + metadata->ambient_illuminance, metadata->ambient_light_x, metadata->ambient_light_y); +} + static void update_sample_stats_8(const uint8_t *src, int len, int64_t *sum, int64_t *sum2) { int i; @@ -812,6 +822,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) case AV_FRAME_DATA_DOVI_METADATA: dump_dovi_metadata(ctx, sd); break; + case AV_FRAME_DATA_AMBIENT_VIEWING_ENV: + dump_ambient_viewing_env_metadata(ctx, sd); + break; default: av_log(ctx, AV_LOG_WARNING, "unknown side data type %d " "(%"SIZE_SPECIFIER" bytes)\n", sd->type, sd->size);