From patchwork Sun Mar 27 23:25:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 35008 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6d9d:b0:79:214c:b845 with SMTP id gl29csp4097760pzb; Sun, 27 Mar 2022 16:25:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy2r7dWlFQVhup0WUJ1e6PC05v+byphWp72ORO2r4rujMTe3TCl5j8OnXP9c+WiSQvE5nX1 X-Received: by 2002:a17:906:9b93:b0:6da:6388:dc57 with SMTP id dd19-20020a1709069b9300b006da6388dc57mr23943574ejc.338.1648423558525; Sun, 27 Mar 2022 16:25:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648423558; cv=none; d=google.com; s=arc-20160816; b=GJTa0e2L6B+C5thrJMZCTUBFteCPmkTYyr0Wmh7toLReexCKk2R8iBMD1IxpLSdNnK lsYdX8KSgD/jp9bgxuTh2lO/GrH6ELm6swKudOS+Tc/+Rl6UZ3+XqodyGESEFoo00p+0 +vx+SFrHXMh3JFWGdyu9EzpHMOXqxZKwh6nypB76bQ4/MRdFk8Rz4rKJFmkUDyAj9vP6 T3p84V1Vs7rfIXB2zKcayfwP2KWi4RS6PPQP1ERGRac2P5dJMa4h/gvnmHzc2tPiI6b4 Qz6/5kmFYlXglrBJy8enB+GBcPnrt13rlSYbNTb6knTXuO8Zj2Ofk7Ny3iumc6GEpWUj VtWg== 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=i2wehJF7YNjShFj2MdoaeNHTaYW/LAfCMMDkyaIvsC0=; b=icJCTbiUaI6BQaVHsUCYRr/cmK/nQaklR41am1T22IKzxxeUKbaPqlW/0URfNmPTmt bhjIPnJFdthITFnJwKFKqcmZ3jeNEfaiJBksZrUonMgjxabRr4YlB7D0KMLBNh3RjNU5 IxrGE6vkmgaPVRMcRcr0SdENdcrz21q5Mzp0QocQvK3J516QjZ2I0wBNSPR2BHH1CjRd yo/QGiveye3YL8N/IIwLDZ/wTbbhUzJ8isSx/D3Usi2vocnrqNP66SzFbAL6bmLbk2L5 T83oJNJWJTTu4rsLf9OxfW0xIPWok9DUD0s7kAgRRlxlpguTbB2wHlxI8Ri7PCcGOM+w ufbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=kS+QNmLV; 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 t7-20020a50d707000000b00418f9b49b63si10754424edi.475.2022.03.27.16.25.58; Sun, 27 Mar 2022 16:25:58 -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=kS+QNmLV; 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 2949568B292; Mon, 28 Mar 2022 02:25:30 +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 DAFD368B276 for ; Mon, 28 Mar 2022 02:25:22 +0300 (EEST) Received: by mail-pj1-f51.google.com with SMTP id gp15-20020a17090adf0f00b001c7cd11b0b3so8233223pjb.3 for ; Sun, 27 Mar 2022 16:25:22 -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=KhMRibGVCyVeiqM4l33mrTM/WqISbmha4jJrMb/yx5M=; b=kS+QNmLV1IpfstMIFmKfHqeTpH48iH9j9mkKeEORXtu/bLj+SgZABiqSHJ9LhQLC+f gnaih3ZsukOZ5almcl1D/CWXhjxUHn3HyMLQve1zDPlFu6t6zrU46ubszKx2EO+N+I3K bsomZfIv97i/RJ6x2nk1rGAUxB/v0UKoXUOiyLGeqYjN5u4RNl8E5lXhEBUXXHjL+D4p qZb8/rR2V+8P3ea9u11dWJeqFwtufotJDhgZvZFra6W0O47PA59rZX4MjJPMuHCdyFw7 y22sHXiMZAQDLJdQifG9CayOslu850pgI4jI0aN/ge5kELShhMu5mJV60WLBSxVWjAJ0 nQKQ== 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=KhMRibGVCyVeiqM4l33mrTM/WqISbmha4jJrMb/yx5M=; b=c1fv6bh5mA9UWNrlbBX6Ru2ls1iTNARV0Ob68q3kkiypbE3WULaEHB9dGjWdpeoSjH dV+skfu5ilYyej7Y6HzOoFPSgHCcPMwt7Yt3TR5aqJIgClt3XXf8I514rOLWSgajWBhV h74LQL22PssfBEEQk2kuqWFVrUpTBJxFMVsduaHhQeeNS6hqrFhfhuNJfPbQbQY0aqO/ 925k+3o4IfziWZGY5gOU2LMWHHN6TaFjLmNQHwy3Hz+vmsN+aFIg0lN8Sj3dfhebvdh9 Oc5zOoV6joTT2tut8wtHy6r8wUY2fzc074bdLwbCxdIQFZrd4PsSpW6f1z83uQbMk0F2 cixA== X-Gm-Message-State: AOAM532gFugd1rAtYjggYnj4Mku0TBGydSdBJv3bFhbXuIZ2Ohib7hOj l10hnPmGYRe0/QWdcVCd5ku7og4MdLDDoA== X-Received: by 2002:a17:903:404b:b0:154:297b:7125 with SMTP id n11-20020a170903404b00b00154297b7125mr23445291pla.11.1648423521251; Sun, 27 Mar 2022 16:25:21 -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.20 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Mar 2022 16:25:21 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Mar 2022 07:25:13 +0800 Message-Id: <1648423513-21261-4-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 4/4] fftools/ffprobe: 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: sjv3HdTsVHog From: Limin Wang Signed-off-by: Limin Wang --- fftools/ffprobe.c | 6 ++++++ tests/ref/fate/hevc-dv-rpu | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 05c167e..5abe496 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -52,6 +52,7 @@ #include "libavutil/parseutils.h" #include "libavutil/timecode.h" #include "libavutil/timestamp.h" +#include "libavutil/ambient_viewing_env_metadata.h" #include "libavdevice/avdevice.h" #include "libavdevice/version.h" #include "libswscale/swscale.h" @@ -2605,6 +2606,11 @@ static void show_frame(WriterContext *w, AVFrame *frame, AVStream *stream, AVContentLightMetadata *metadata = (AVContentLightMetadata *)sd->data; print_int("max_content", metadata->MaxCLL); print_int("max_average", metadata->MaxFALL); + } else if (sd->type == AV_FRAME_DATA_AMBIENT_VIEWING_ENV) { + AVAmbientViewingEnvMetadata *metadata = (AVAmbientViewingEnvMetadata *)sd->data; + print_int("ambient_illuminance", metadata->ambient_illuminance); + print_int("ambient_light_x", metadata->ambient_light_x); + print_int("ambient_light_y", metadata->ambient_light_y); } else if (sd->type == AV_FRAME_DATA_ICC_PROFILE) { const AVDictionaryEntry *tag = av_dict_get(sd->metadata, "name", NULL, AV_DICT_MATCH_CASE); if (tag) diff --git a/tests/ref/fate/hevc-dv-rpu b/tests/ref/fate/hevc-dv-rpu index 6879f71..4ad5436 100644 --- a/tests/ref/fate/hevc-dv-rpu +++ b/tests/ref/fate/hevc-dv-rpu @@ -119,6 +119,9 @@ source_diagonal=42 [/SIDE_DATA] [SIDE_DATA] side_data_type=Ambient Viewing Environment +ambient_illuminance=3140000 +ambient_light_x=15635 +ambient_light_y=16450 [/SIDE_DATA] [/FRAME] [FRAME] @@ -239,5 +242,8 @@ source_diagonal=42 [/SIDE_DATA] [SIDE_DATA] side_data_type=Ambient Viewing Environment +ambient_illuminance=3140000 +ambient_light_x=15635 +ambient_light_y=16450 [/SIDE_DATA] [/FRAME]