From patchwork Tue Jan 10 21:19:48 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: 39957 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp4271175pzb; Tue, 10 Jan 2023 13:20:25 -0800 (PST) X-Google-Smtp-Source: AMrXdXszyOTJbQCzlfg+goHCbij+ybVq5uDwOmYcsOznhDjDFm/mQ08TaHvCduf+djyW6FyAxAa6 X-Received: by 2002:a17:906:39a:b0:7c1:1444:da41 with SMTP id b26-20020a170906039a00b007c11444da41mr64055528eja.40.1673385625568; Tue, 10 Jan 2023 13:20:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673385625; cv=none; d=google.com; s=arc-20160816; b=AxMwz/VtE62i+Ssgu8bLVpeZUzv7qwZrgbwn3qyx2VLQPNTXMEQs3WmggL65wylQZu FWjnBrIsKU1Ah7uUgdYNNknBW+MQGZOQ3nhAbVLMU7lQP0A+iWEKV9+MrP0ICHgXigVf WqDcgx5x/0Pi/swoXTkDpr4mtWOgSv+F5isrPaLb3/ch8MUeCyTTofcN19X9ubn/WE3b OpmzP5goGDHJyjYDzjPMsjHSptjjNTqBSfLPruMUvmc5Fx9x5rPICwRUpfGoiKrPYd2/ 9V243+p8tTBSrHTIMV8lgKnL/RXeQBLv5fSOGR1V/+LA5r2D0IouCH4T18RWATCWhyd2 35Xw== 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=by4XjmnRtlftFWUnpZYwFtrvWCdsQ8bAfebh2FEEQHU=; b=axPq+i4SvNa62NW1XP5Q3hqdy+zRvFV/CplblCCeDxDN1PKfm0W3NEGeFqSDOP02iu TPO0aiQLE0Bm4yqaKjMi2OcCqmMCTwHuon/hgfGYvF47TmMOanLzLpn7z29n3+rhw5A6 crxl3sqRBlfd1dxBwBnrWAoK0iDc/wNLcb3i8723mLZIyRgFAWUIkp2hqeXy5kgXWhwj PCnYq9T70p1dhUbRAwBVQaHedu0pJuYr1vAbvuCF4XrTWIl27U51YmvdrEMUGqxByl/O TYGZp11/sX4AVvcJxHZDD8uVzMOZ/c2EKZjebPWYq0gKZORMg+9adnPUswM0nTNaeJ0z tv+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=kv8uJa2t; 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 qb28-20020a1709077e9c00b007c080a3f372si11838199ejc.363.2023.01.10.13.20.25; Tue, 10 Jan 2023 13:20:25 -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=kv8uJa2t; 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 B92B568BD58; Tue, 10 Jan 2023 23:20:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8426968BD19 for ; Tue, 10 Jan 2023 23:19:58 +0200 (EET) Received: by mail-lj1-f181.google.com with SMTP id x37so13962236ljq.1 for ; Tue, 10 Jan 2023 13:19:58 -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=e02djb+h4C8g5QFK6mrUfJJj7CZTei5zZd03xdBOGU4=; b=kv8uJa2tgyxIowpflZcmChhdcMfYtOMRj3e5TzUbsseGM+vzzpRjwJFEYMcXxOI9p3 2d2Wtieh6W7TCDmDWfcJ9EdoG2a2YaBjMlssnnB2xEoHYJSDZ2KyNG7HUwv65lYxjnw9 b6L8wTBmhxkJD1yhB94PRqTvu3VOtp9uHdXaoYGS6qfz6dt7Cor6SyNpf7AhsdjLSd5J VmmcOZc6mtvdSdiGNXTpFA35Dlz2/euottnLJq37lOkgmVPPLo0wk/1mML6vGBI8KzXu jFh/ir35tdLpdgy8LO/9WoxaIMFiY+l22+NxDSZvrpULMKdrCRCchyF6iLjOrmuUGoo1 Xo+A== 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=e02djb+h4C8g5QFK6mrUfJJj7CZTei5zZd03xdBOGU4=; b=FW5WtV+xusTvPLMHNDP3CiSz38AmcbnzXtdk4lCDifbEd0zNkvLCwm7wwYVzvjEZCO nEDBSRNuCbJuQy9mah3shuzHmQvsOb6uvpO2JK89OVRlFzfzhaCsFrifuoe2do9ZjPTb LgoVTXAvLPKfJi3Fm7jKO9i16hQvtbaEhkFxeDTa1Rp2Y2uI4g3xFEr/4lWQpk434Sb+ 1+snY54MFSzRFDzbos88UIko7/CFEKxDdlvfGmE1N4fujewJ5h37TbdsHde1gxbvssr6 X4ky40a7AKHI8+FlWSZkRHa3m5+jn3WqHqwNH5vTGDIL20Qrq9wWjHlsrJ+PQuAHOZOU +LUg== X-Gm-Message-State: AFqh2koJrU8NID3Q5uo5iAcgADpiAnLAjgz5GvjDjjl6kFC6AMlmF+sQ pQu5/L2jmJVbnsVpbJ1as/uX7xBC2lU= X-Received: by 2002:a05:651c:1a1e:b0:277:22d1:ca92 with SMTP id by30-20020a05651c1a1e00b0027722d1ca92mr25919836ljb.32.1673385597907; Tue, 10 Jan 2023 13:19:57 -0800 (PST) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id r4-20020a2e8e24000000b00283ad9caa59sm1142240ljk.140.2023.01.10.13.19.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 13:19:57 -0800 (PST) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Jan 2023 23:19:48 +0200 Message-Id: <20230110211949.8195-3-jeebjp@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230110211949.8195-1-jeebjp@gmail.com> References: <20230110211949.8195-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: +py4KAUyvoE4 --- fftools/ffprobe.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index d2f126d9d6..15c61e1c7c 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); }