From patchwork Wed Jan 11 18:57:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 39970 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp4979315pzb; Wed, 11 Jan 2023 10:57:40 -0800 (PST) X-Google-Smtp-Source: AMrXdXsld1kCae3Iq8f3MoA9cFQe8YqEhFWGBev41uD5FFquE0fAs2iWmJPD2LSuT9/tktQzbxcw X-Received: by 2002:a17:906:79d2:b0:7ae:987d:d7f9 with SMTP id m18-20020a17090679d200b007ae987dd7f9mr57660371ejo.17.1673463460678; Wed, 11 Jan 2023 10:57:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673463460; cv=none; d=google.com; s=arc-20160816; b=vqsPKUy3OltLQ90mRBfBfnqjqEU0mRm+oJHXoPAY9r7dwsW6I3M2uK6AbihxXsl9Of ft4YvevlKgqcy88+vwSB4FRPTJOu44PYr4aJGTUPHaNTbRoVMg3reQRBwgGdCZ+br/Lv wDDsi1HKavN0DvRyJfVg3DZsmNkH0u0ufuPMbNSMbr9LAxdZPqK4n/N4EwQbsJWiaMjf EnZptlyrz2rGfuMEB7JugVZk7pgxCYUrw7/SiXa6PaMhNNxBDv9CwCL84Tl4ZKwC4MPa 2avp7Zi19v/kSL6CNKQcfZb4+8DNARsXgEESs2fQu7WsW/jjA04EaLug51m8EN64XcnU 9/kA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=N1l1QKVGGDbXP0di1G0VIGKum5xer/UcpFdy3CIC9+A=; b=IHcmaNZmvPt5fmbk9nLMlGVNOCzp1QbWN4IDAVk4k2Ym4Gfqm2vngDaQ8yTzCFZ2Sp pQtvYuj/qzWKFnvgaIlNV/pvDWTlIgcoTXROC5/7/EwuJAeWyWs684FX/7wtpPT/PoIg ADXK18PZVQ6pBdEGOtH0MiAZVq+jhlYi6OH7uNZ5XeotKzARwWHPJF4eUFLZx9mUWR7i q5f6bxKmw0Uam8Q/GVDVNxrZXIj5hgJca6Zjq/tuKNArMauwbsI65KAM1uZoIJEvrNiE x/Qxjv4Rf+6fVR4G1KsLXATd0rPnveCK4wymvGyZ8TE8uOQG+2SwpX41aHzl6GwGciiU 6pcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=EPBBBT9t; 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 dm10-20020a170907948a00b007c144e9f270si17700996ejc.708.2023.01.11.10.57.40; Wed, 11 Jan 2023 10:57:40 -0800 (PST) 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=EPBBBT9t; 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 C1FF068BD16; Wed, 11 Jan 2023 20:57:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ACFDC68BCDA for ; Wed, 11 Jan 2023 20:57:15 +0200 (EET) Received: by mail-lf1-f53.google.com with SMTP id j17so24988201lfr.3 for ; Wed, 11 Jan 2023 10:57:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=DPN0Mb7+Cdavf4rA+xkmoQkauHClVf3wffjeIGp8u94=; b=EPBBBT9tKq15JrpC66XOXusOq/EDYGfLssjblZi+VnXPPUFurPMoo9eb55pnnk63sD biIvJbMclOcRK8rgrUfmeNcgPTf8UlZs+/u6hI4i7qZ4AdCg5L6crmQVzmAk6pZBi7fd uPVrMiKY9WZULVQNhs9WgMzbgw5nq8/x08pvLEFyKR4bzD0LtTv/mL9h8xH378jwIsVI CvwZXlH2R+DJYK0mJDSM+UKNqSorTiIBtu/mix3ZsKHPHg/5YXqIKRxTUB1y/q9/MchD Qgg7h2WcC82IbJF5BzRc2Hc/K3kX+ZEgqXS+f1yEfzAP8UFG+gxeno5p9mr3SeTEMdG4 981g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DPN0Mb7+Cdavf4rA+xkmoQkauHClVf3wffjeIGp8u94=; b=BLDpuEqK5XUrY5LbKgXRkUNLImJS+L6zsEAhHFJp1wcN0ZptjDAMhPv+k8P4xIdQXl u3/rbCYEryvNXlDRAsq0lGB0efEoQg4MhDDKIdIO7L8mrj51uRZcI0eV4tnYulnnJAcd 7ohshwCwOpn7gOKWfPvyoodbUrzD4cBqDSQaKrn4U4+PysM3aLFCXUMXngA5sGqHvfyD 0Btdf0qoT+b99w9rZ3FRfCU+BKjUibf1YHEooM40kf/nP7bfookCQC47iWMXb4Ia2quO gaDAJFbRa1wQKTysAeOTwq1GoNuvJoPQEino9PNxiF26AoelZ8AtJSdf2Yy5wceDHd0t VAIw== X-Gm-Message-State: AFqh2kpCfrCEWMjbhrXgvynX0A2ybTLuWt9ED7i1yR9/y6H18nqoKxEL IY7wT+f5N3uJvx/98qgHQIJI3Du7mQ0= X-Received: by 2002:a05:6512:10c3:b0:4b6:e64c:aec6 with SMTP id k3-20020a05651210c300b004b6e64caec6mr25108553lfg.63.1673463435019; Wed, 11 Jan 2023 10:57:15 -0800 (PST) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id j5-20020a05651231c500b004b5480edf67sm2842017lfe.36.2023.01.11.10.57.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 10:57:14 -0800 (PST) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 11 Jan 2023 20:57:06 +0200 Message-Id: <20230111185707.22132-3-jeebjp@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230111185707.22132-1-jeebjp@gmail.com> References: <20230110211949.8195-1-jeebjp@gmail.com> <20230111185707.22132-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/4] ffprobe: expose AVAmbientViewingEnvironment side data in AVFrames 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: GJ0hRV3GSvB8 --- fftools/ffprobe.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index c18aee9846..b9310a2d25 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -33,6 +33,7 @@ #include "libavformat/version.h" #include "libavcodec/avcodec.h" #include "libavcodec/version.h" +#include "libavutil/ambient_viewing_environment.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/bprint.h" @@ -2268,6 +2269,17 @@ static void print_dynamic_hdr_vivid(WriterContext *w, const AVDynamicHDRVivid *m } } +static void print_ambient_viewing_environment(WriterContext *w, + const AVAmbientViewingEnvironment *env) +{ + if (!env) + return; + + print_q("ambient_illuminance", env->ambient_illuminance, '/'); + print_q("ambient_light_x", env->ambient_light_x, '/'); + print_q("ambient_light_y", env->ambient_light_y, '/'); +} + static void print_pkt_side_data(WriterContext *w, AVCodecParameters *par, const AVPacketSideData *side_data, @@ -2704,6 +2716,9 @@ static void show_frame(WriterContext *w, AVFrame *frame, AVStream *stream, } else if (sd->type == AV_FRAME_DATA_DYNAMIC_HDR_VIVID) { AVDynamicHDRVivid *metadata = (AVDynamicHDRVivid *)sd->data; print_dynamic_hdr_vivid(w, metadata); + } else if (sd->type == AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT) { + print_ambient_viewing_environment( + w, (const AVAmbientViewingEnvironment *)sd->data); } writer_print_section_footer(w); }