From patchwork Mon Mar 28 12:41:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 35016 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp205445pzb; Mon, 28 Mar 2022 05:42:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz6jh2PwOlG0bSkIjKMeaty8FxmW5f/JyzPUZvT2gX53gxJa0qDHe3s2q7U9gXrXQjixqTV X-Received: by 2002:a05:6402:2706:b0:418:fcb2:3a02 with SMTP id y6-20020a056402270600b00418fcb23a02mr15739762edd.111.1648471323634; Mon, 28 Mar 2022 05:42:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648471323; cv=none; d=google.com; s=arc-20160816; b=mgapm3PsVgmqt2N7/SJqnLEWT2Dri61vFyRI2CNWdnHqSTufX8CKXj6XlSjW2K+ea3 2uyYqL5HBkJFG6oXK2Wgbx/oBTYGNtdA3s30qTHHyIACDD2i0MFPjoF73cswJQFl/Gg9 YWUwpJd7Lqph8f5Q3wgTMJbf2YZAdyH99cGWzpI1xW0nfu7EV+t7cjMW/UA/bjdQzsLa 903goh+K44wxKKLc3OAkcrAdZYjDtRZSxErOK2/wyW9Zj2UO9R+OHACRZwsV4Hq80wjG JPIASIz5WIBbYEtu/VzXzaGYmyO6ioe6BS5+dyMtM1PyMtGVgGnHppDyBXJRjnjnnDgc WGWA== 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=DBA4RLSH/29x6cnmwEHwbKbr1nwHlaMRlJPkOo+IGwM=; b=isJ0Vj6QLUewmMLEJbazt5EbrM/EK4eIHABiNNonvOphCm8UK6YBQIrvywHJzw6JGz htOljjIbJ2HwUpeRP0z18piAF2YRHab3EgVvFTmB7q+mkEK2vgtmJmb8sRQbrOeCU8bB uml5lWHihK0d3xhTsqTbHhsN/zcffV5j+c9AeycYpfeAC9uDsi4z+9VXrkPPmcnnOWKU BfnRZ4i3KG/9cqvOCjCoJZ1IYtbv4GKSwkQjdx7GX7LrmqMAoxreGjSN3D/H8jwCFsXR TBsfOBkG1CRw5pojKa7w/Cv3bE1xEIBh/QbzQ1YtO2xd7TQ590uH44e6I9N+liU1WHKj b5kw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=XIejxeZ3; 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 c3-20020a50cf03000000b00419040ba62bsi13247073edk.395.2022.03.28.05.42.01; Mon, 28 Mar 2022 05:42:03 -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=XIejxeZ3; 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 A93DD68B122; Mon, 28 Mar 2022 15:41:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C2DEF68A8FD for ; Mon, 28 Mar 2022 15:41:21 +0300 (EEST) Received: by mail-pf1-f171.google.com with SMTP id b13so10637372pfv.0 for ; Mon, 28 Mar 2022 05:41: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=ldo9N2NRGQBSjR/UBqMkBrXVR75o4K3HaFgdH+Vm1oE=; b=XIejxeZ3oODrwPRAcfhxCm4QE8/G2q+rW0gVkyNh0o0f4tJ47HRbSfHe90INkX5Nlw 6pwtpOnE7FgExAChRMmtsbszZZN2PRTAtQk+BQ/0tm1kWT5dUbLXux85kTUCPPxK3rQL CuQYgXDM7THwsjDaGe3TV/HLTYLNzSCbQMZy83O9XTBPJH5QJ+U0W6sWwk0fAE97rJ9P gjizemSAw/vhE1+tWkrWOFJ5gYD6X2jsGTrRidiwLQ/YQAddgH7ejAhtu2Wez3WJxPGY XTLl1Nmp5mdDEPDYRKm7pKVOzG4+gzJoTm4RamrUpptMTl0Q/toPZjIeSem7i3zWwzsd cyJQ== 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=ldo9N2NRGQBSjR/UBqMkBrXVR75o4K3HaFgdH+Vm1oE=; b=isD1QxWPWnHE8ykxVz7zrg1EbcZpbTBecCu0ncQIxN/busZToqjQ2ndOQatnSQ4RTJ HmzTZeNCD486K2jOHebm7HKGyVpyxm0b375F7FVoK73Ndn5ys4KOfxsoNn5yJokul+5+ K/OGd4aiFUTi3yShWtnyiUBx3qeG4EmyvkFGVsGxHFYIt7gE3dczCoWBNbPYb/X0Qlyy q/xptWxDrfurNF8LbeQwMKTHcHMcqfblXzL+3wbjkPiyQ3c90OWa7G5KNWusVebSIefR /g9Cu3wPX24aJwyxeR+Zo2KPA0A+zmrNQkolZqcIRuvh8ML5RaOHi8o8urkqQLf1mEFw A2Xw== X-Gm-Message-State: AOAM5323oTWdlOHO7FWWK3E/Dt3bhOFw+g518Z0MNIgi3fyMeGxLwTaB 1FDHjlQG1VyN2mLA4Aby+wKCijN1HPOK4g== X-Received: by 2002:a05:6a00:2408:b0:4f7:a8cb:9b63 with SMTP id z8-20020a056a00240800b004f7a8cb9b63mr23070294pfh.33.1648471280037; Mon, 28 Mar 2022 05:41:20 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id b2-20020a056a000a8200b004f1111c66afsm17895304pfl.148.2022.03.28.05.41.18 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Mar 2022 05:41:19 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Mar 2022 20:41:11 +0800 Message-Id: <1648471271-22016-4-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1648471271-22016-1-git-send-email-lance.lmwang@gmail.com> References: <1648423513-21261-1-git-send-email-lance.lmwang@gmail.com> <1648471271-22016-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 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: +O8FMyUCKG36 From: Limin Wang Signed-off-by: Limin Wang --- fftools/ffprobe.c | 5 +++++ tests/ref/fate/hevc-dv-rpu | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 05c167e..39773c4 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2605,6 +2605,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]