From patchwork Sun Mar 27 23:25:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 35005 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6d9d:b0:79:214c:b845 with SMTP id gl29csp4097565pzb; Sun, 27 Mar 2022 16:25:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwWCdPFJNy8XZNQbMyUspAm6KmNjEYzZoqN0jQm2kLQYEMyNe3b6sOCG2Kr0oLa1YSOXf0u X-Received: by 2002:a17:907:c2a:b0:6e0:e1d3:2ab with SMTP id ga42-20020a1709070c2a00b006e0e1d302abmr8523236ejc.706.1648423531443; Sun, 27 Mar 2022 16:25:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648423531; cv=none; d=google.com; s=arc-20160816; b=iXh4qVcvfDgSk8U5L5PeKW6t0Hh365inTX6pd2l5ehZug8jly7Q4aqdnDwR3oU6IVj gSqExmaiik9Y/5KmzVwoHDGUrpKzXpwLEB6UdhJwY6Q6esAiVv4R8fQRb93FCvmx6bfA gISOQA6NYuvWiN0RlzUZlwpi7iKGygkvUicQ1x7fsIkcWhoR5rey/QiPRgJ2eR3lRbbk 9rEftJaYI8CGaQQHxZ6eGo0ezlFs6gy7m76Y3zzjEIY8QkMeWL1Cc5qK9iZdfAbxPJLL 8XePXzjNUHzDNWWTtEUdzyw4EU2Cy4zMoTZy9Ab2pbfp81pZRR5pM4RKTpDqz6gcUIpE porg== 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:message-id:date:to:from:dkim-signature :delivered-to; bh=DOhd43yvNE3MKVYiPD/6uCCDuPgNKABJNsZLF4I1XAo=; b=Febh3aOU0EO8Tv/M6nmLq53i9KBjlfidhjuVE6TwXUYompYabDMrApWuK/oFY8zTXH M52VfWRA87fpsDLKgyKaWQmnE0CWcsKE6VLl+aBeudQ9MDDcJdCE/DDk9PKkwr1d4uHh TYk4wGC5PCfHoNa8ExQ8OAiX0NGneDVM2bvOEnVl5RQmNUe5gNWk+DXw8/veXIoVgEmV FlNMSO39jJ9G/oNOjK4sOYB7hYO9H7hEYTcVBRTX2ctujjvBGeBioFnEY5r3yuURTCQ4 iLVPbvpZyyUQT5B+DEuCGQDYZn/c2VMqlGvYwgoQ8F8dZqTqpDdGwsDZE5CMMAmEXmMf uGqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ltQQoL9g; 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 f9-20020a170906084900b006df76385c11si10795703ejd.177.2022.03.27.16.25.30; Sun, 27 Mar 2022 16:25:31 -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=ltQQoL9g; 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 3AF8C68B279; Mon, 28 Mar 2022 02:25:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 28B0F68A8FD for ; Mon, 28 Mar 2022 02:25:20 +0300 (EEST) Received: by mail-pj1-f43.google.com with SMTP id v4so12419694pjh.2 for ; Sun, 27 Mar 2022 16:25:20 -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; bh=ih9vS+qxEGP1W8EZENUhZZmTDchz5zaOABBz4YKC0j4=; b=ltQQoL9g6xQjt0oH6i5XoCiO/Sbujs1gseF5LWnQsKuQM4ZpWB/AGdNyAYWqjr339G WccF1DiXa1dcgVkIv7ID3M2n1ZXn/YSp/Syld8l5iY5Z+MYXvHsLqgiKb0NvQs/K8u2U WEDix86eOnEY5/Dlvb4e6mvndkBt5ZE8Shme+s2vz4Vn8ZURP9/Rv8gQLUCRGcQiR+mG acSEDc44+TFVMAswZsbpqy5XVldEcm7Qx2ARx7+espgGGqVms2qyMRsn4nutrYThHumq q9f7+9sAuChMsvoDq3xBE/lwYDoL9bYTIUcPIC6iIe0/eo7OFJjwyHHrIjeYXJEtLlGx eddQ== 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; bh=ih9vS+qxEGP1W8EZENUhZZmTDchz5zaOABBz4YKC0j4=; b=Ruct7UnXpFzUmQoXLIouPucBk+JW6LeMsQTudygenUrIVuZhwnv1ovZ515xRmF7lWF zqafaDdrnMQ8UeK8uRRLQKSvQCmM/DjlG+2vP8z5S06FbG3/ick6lcN/eCmUcnMKZix8 /LhakNxC0rNK9cLAFXnFOgU45IH5nzyZny912b1OcE5nIiA54BrR0+l/Mpd5D5GdRDmw onL2+u1d+MqUwd/BatimCCrRsH+UBX5yN7s8op6qs6UJLfBUdWjI/djdzqKd8nSIyuVl gXMibJDDkiDyep2n+F7ePg5jmgT9Aiih0s7ZBQANz42d4QqEs/AVBXcPHUahLDyAwyKx lQgg== X-Gm-Message-State: AOAM531DP8/0LGng/G0uDDXYIaVF9Wt2IOEbvL4BWm8VrxMV1pJ518s3 6g+tREYX6n1680wMXyhz3fregQpnPP8dvg== X-Received: by 2002:a17:902:ecc6:b0:154:2a81:c810 with SMTP id a6-20020a170902ecc600b001542a81c810mr23054854plh.7.1648423517770; Sun, 27 Mar 2022 16:25:17 -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.16 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Mar 2022 16:25:17 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Mar 2022 07:25:10 +0800 Message-Id: <1648423513-21261-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH 1/4] avutil: add ambient viewing environment metadata side data 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: Zh9vQ5h5rE1g From: Limin Wang Signed-off-by: Limin Wang --- libavutil/Makefile | 2 + libavutil/ambient_viewing_env_metadata.c | 47 +++++++++++++++++++++ libavutil/ambient_viewing_env_metadata.h | 72 ++++++++++++++++++++++++++++++++ libavutil/frame.c | 1 + libavutil/frame.h | 6 +++ 5 files changed, 128 insertions(+) create mode 100644 libavutil/ambient_viewing_env_metadata.c create mode 100644 libavutil/ambient_viewing_env_metadata.h diff --git a/libavutil/Makefile b/libavutil/Makefile index 81df3b0..e388d33 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -26,6 +26,7 @@ HEADERS = adler32.h \ display.h \ dovi_meta.h \ downmix_info.h \ + ambient_viewing_env_metadata.h \ encryption_info.h \ error.h \ eval.h \ @@ -119,6 +120,7 @@ OBJS = adler32.o \ display.o \ dovi_meta.o \ downmix_info.o \ + ambient_viewing_env_metadata.o \ encryption_info.o \ error.o \ eval.o \ diff --git a/libavutil/ambient_viewing_env_metadata.c b/libavutil/ambient_viewing_env_metadata.c new file mode 100644 index 0000000..7006b64 --- /dev/null +++ b/libavutil/ambient_viewing_env_metadata.c @@ -0,0 +1,47 @@ +/** + * Copyright (c) 2022 Limin Wang + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include +#include +#include "ambient_viewing_env_metadata.h" +#include "mem.h" + +AVAmbientViewingEnvMetadata *av_ambient_viewing_env_metadata_alloc(size_t *size) +{ + AVAmbientViewingEnvMetadata *metadata = av_mallocz(sizeof(*metadata)); + + if (size) + *size = sizeof(*metadata); + + return metadata; +} + +AVAmbientViewingEnvMetadata *av_ambient_viewing_env_metadata_create_side_data(AVFrame *frame) +{ + AVFrameSideData *side_data = av_frame_new_side_data(frame, + AV_FRAME_DATA_AMBIENT_VIEWING_ENV, + sizeof(AVAmbientViewingEnvMetadata)); + if (!side_data) + return NULL; + + memset(side_data->data, 0, sizeof(AVAmbientViewingEnvMetadata)); + + return (AVAmbientViewingEnvMetadata *)side_data->data; +} diff --git a/libavutil/ambient_viewing_env_metadata.h b/libavutil/ambient_viewing_env_metadata.h new file mode 100644 index 0000000..b0fbcd0 --- /dev/null +++ b/libavutil/ambient_viewing_env_metadata.h @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2022 Limin Wang + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_AMBIENT_VIEWING_ENV_METADATA_H +#define AVUTIL_AMBIENT_VIEWING_ENV_METADATA_H + +#include "frame.h" + + +/** + * The characteristics of the nominal ambient viewing environment for + * the display of the associated video content. + * To be used as payload of a AVFrameSideData the appropriate type. + * + * @note The struct should be allocated with av_ambient_viewing_env_metadata_alloc() + * and its size is not a part of the public ABI. + */ +typedef struct AVAmbientViewingEnvMetadata { + /** + * specifies the environmental illuminance of the ambient viewing + * environment in units of 0.0001 lux. + * ambient_illuminance shall not be equal to 0. + */ + uint32_t ambient_illuminance; + /** + * specify the normalized x and y chromaticity coordinates, respectively, + * of the environmental ambient light in the nominal viewing environment, + * according to the CIE 1931 definition of x and y as specified in ISO + * 11664-1 (see also ISO 11664-3 and CIE 15), in normalized increments of + * 0.00002. The values of ambient_light_x and ambient_light_y shall be in + * the range of 0 to 50 000 + */ + uint16_t ambient_light_x; + uint16_t ambient_light_y; +} AVAmbientViewingEnvMetadata; + +/** + * Allocate an AVAmbientViewingEnvMetadata structure and set its fields to + * default values. The resulting struct can be freed using av_freep(). + * + * @return An AVAmbientViewingEnvMetadata filled with default values or NULL + * on failure. + */ +AVAmbientViewingEnvMetadata *av_ambient_viewing_env_metadata_alloc(size_t *size); + +/** + * Allocate a complete AVAmbientViewingEnvMetadata and add it to the frame. + * + * @param frame The frame which side data is added to. + * + * @return The AVAmbientViewingEnvMetadata structure to be filled by caller. + */ +AVAmbientViewingEnvMetadata *av_ambient_viewing_env_metadata_create_side_data(AVFrame *frame); + +#endif /* AVUTIL_AMBIENT_VIEWING_ENV_METADATA_H */ diff --git a/libavutil/frame.c b/libavutil/frame.c index fbb869f..8882da2 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -815,6 +815,7 @@ const char *av_frame_side_data_name(enum AVFrameSideDataType type) case AV_FRAME_DATA_DETECTION_BBOXES: return "Bounding boxes for object detection and classification"; case AV_FRAME_DATA_DOVI_RPU_BUFFER: return "Dolby Vision RPU Data"; case AV_FRAME_DATA_DOVI_METADATA: return "Dolby Vision Metadata"; + case AV_FRAME_DATA_AMBIENT_VIEWING_ENV: return "Ambient Viewing Environment"; } return NULL; } diff --git a/libavutil/frame.h b/libavutil/frame.h index 33fac20..f7b1d4e 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -209,6 +209,12 @@ enum AVFrameSideDataType { * volume transform - CUVA 005.1-2021. */ AV_FRAME_DATA_DYNAMIC_HDR_VIVID, + + /** + * ambient viewing environment for a video frame, as described by + * the AVAmbientViewingEnvMetadata. + */ + AV_FRAME_DATA_AMBIENT_VIEWING_ENV, }; enum AVActiveFormatDescription { From patchwork Sun Mar 27 23:25: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: 35006 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6d9d:b0:79:214c:b845 with SMTP id gl29csp4097628pzb; Sun, 27 Mar 2022 16:25:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzR39wLZuow7oIRijXCcXBk81L+jYG8/djovmxQFj5VmO2u5c4IDr3HjYrKxn49D1JNh7A0 X-Received: by 2002:a17:906:a08b:b0:6cf:65bc:e7de with SMTP id q11-20020a170906a08b00b006cf65bce7demr24614880ejy.220.1648423540582; Sun, 27 Mar 2022 16:25:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648423540; cv=none; d=google.com; s=arc-20160816; b=B8gSQJJcHjKg4MLcyEC01+nEQ1DOXJmf22h26iHXRmYHo6KvFT9Z0eWZNweLs7q3CX XMAnCY1b/CTrJItCCHKZNKdxsqDuWb/NRlA+7GkPXtjw1aF1rL8lOt0hLY9PoP/ig/Uy n6WKP3w+Xh3UgmvjQsMF/3TQV10x6WnhFFmD7xosIkqL1iawJSOGN4D2lmaSZaf9a/n8 bAx6r0W5DZDpp/QNBI0C3CJHYbzJwAI8dOLfcgqOFsLKS5ldHZE+j4JfiA40YPRR7HRN A/KjvVwcORbaMXThwd5Dv9zlSV+ku4FnDge/s3VXeCP5bUFfB9gP3Xvdc8h2oXN2ObGx cEqQ== 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=4nAl+cB6JywCtWd0VBgNPb2WVDha+a5Lqin4xtwc4uk=; b=utPy4RdRZXVTPOAoVDm55dKPaNsNN7dFVDWU4/WUn4Z6M3mr9U1YlN4s1Yo8E5bvqG B02HVwqO489JPyWNVLkzlOf+F08ccvCz7xJQKNnK6UuS2dbLFUbbTXvAddO+knFIxaT/ 6P4i05l5Ob+4vpSI/nQi9hngGUoGsoHE0imbCgJHpznq1c+As7eXQFMLzgeotz675B3Z ni+NSzsV9MKU+xDHtMwI5DSYxvQ9ICShA6nCoR/vYTamhXIQzhd2FVrC3CSHx6mZ0Vl/ bQ6SP2zxHCI+AizswnMW+Ks6mNgcCJ7qFOBEbzR+tAJwRmoVdkRjGMU5O+rRXRfzYlna IvwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=f+EPEHqv; 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 g24-20020a50d0d8000000b00418c2b5bf4esi11716773edf.560.2022.03.27.16.25.40; Sun, 27 Mar 2022 16:25:40 -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=f+EPEHqv; 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 55BFD68B285; Mon, 28 Mar 2022 02:25:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B556D68A8FD for ; Mon, 28 Mar 2022 02:25:20 +0300 (EEST) Received: by mail-pj1-f46.google.com with SMTP id b8so12399443pjb.4 for ; Sun, 27 Mar 2022 16:25:20 -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=Cimipq3qkCMF97B38lflgU7fpwXfJCYo0peNA001AYQ=; b=f+EPEHqvDuTJDg413GBJzMXUAHLbdbqWS54r3Gzbr4y8r0uFW2AmfV52HWSwmB7xzR vdHO3IOsEVaVIE+vVS1O7/1fv9YqsTLoQptt+BC6XXCqHps7vKVd1/5Q0wFOGk6AdDJg 7lPcRdVOZglzKnquXfbUUC1sX2JRzpOQMkZPZx+T/qAqbW0QNGQzfY0PLuXv5cuJpLz+ DY50KCoE9mxrLmST9rNsKDyxfj+L2RR4zLL2Op6pFmCESrHuk2qmH2hiZQMwBbhoAv4t Jgtis+Odll1ICPVPQZdFOta7jywNObiSBl6lg/8pHNHAcfKvriUTnOBbQzj2WIAKcaZz BaZg== 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=Cimipq3qkCMF97B38lflgU7fpwXfJCYo0peNA001AYQ=; b=xRkep+3PwF46N3vUFglQVqoOtQ7D2p97TOWAMeSpOPjZ3R6etQV7A2o4JzEaFQRmSY DrXK5VwLjiGKh6Yrcqy9uK3dVrKfktQQzI2gA/N4CwmMuG2DXP4Y4eTHSUBjOEyeWUMB 2YtneyhCP26RHCTjKJKG7V5DZvkLYpGsbG/whhY3bGTD0uGPqG3rUcH5QAw4Bh4kQPy0 7hl1k57xnaH5pOVJ95KwtneGITSdUvhPs24QshG8d8CnLOBFKSEuD489L/w0c4g7qDPf h25VsiqYGhUo5jCMxFuKtRZtELEeVpCltT7dF9lOl+bku7fBaQHOL9Vmr+vQCy2kIfAy jenQ== X-Gm-Message-State: AOAM533KwY42JZQjsI6M5nGkOOMN/FQ85iYlY1+ROYbdAOJMr7BjyJtL L0DZY57V3AS15pU1K1uICcOZ+YHaKjMX/g== X-Received: by 2002:a17:902:7615:b0:156:1859:2d00 with SMTP id k21-20020a170902761500b0015618592d00mr731174pll.126.1648423518947; Sun, 27 Mar 2022 16:25:18 -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.18 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Mar 2022 16:25:18 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Mar 2022 07:25:11 +0800 Message-Id: <1648423513-21261-2-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 2/4] avcodec: add support for hevc ambient viewing environment SEI message 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: L0x81bM88bHU From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/hevc_sei.c | 19 +++++++++++++++++++ libavcodec/hevc_sei.h | 8 ++++++++ libavcodec/hevcdec.c | 11 +++++++++++ tests/ref/fate/hevc-dv-rpu | 6 ++++++ 4 files changed, 44 insertions(+) diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c index ec3036f..d94df4e 100644 --- a/libavcodec/hevc_sei.c +++ b/libavcodec/hevc_sei.c @@ -497,6 +497,23 @@ static int decode_film_grain_characteristics(HEVCSEIFilmGrainCharacteristics *h, return 0; } +static int decode_ambient_viewing_env(HEVCSEIAmbientViewingEnvironment *s, GetBitContext *gb, int size) +{ + if (size < 8) + return AVERROR_INVALIDDATA; + + s->ambient_illuminance = get_bits(gb, 32); + s->ambient_light_x = get_bits(gb, 16); + s->ambient_light_y = get_bits(gb, 16); + size -= 8; + + s->present = 1; + + skip_bits_long(gb, 8 * size); + return 0; +} + + static int decode_nal_sei_prefix(GetBitContext *gb, void *logctx, HEVCSEI *s, const HEVCParamSets *ps, int type, int size) { @@ -525,6 +542,8 @@ static int decode_nal_sei_prefix(GetBitContext *gb, void *logctx, HEVCSEI *s, return decode_nal_sei_timecode(&s->timecode, gb); case SEI_TYPE_FILM_GRAIN_CHARACTERISTICS: return decode_film_grain_characteristics(&s->film_grain_characteristics, gb); + case SEI_TYPE_AMBIENT_VIEWING_ENVIRONMENT: + return decode_ambient_viewing_env(&s->ambient_viewing_env, gb, size); default: av_log(logctx, AV_LOG_DEBUG, "Skipped PREFIX SEI %d\n", type); skip_bits_long(gb, 8 * size); diff --git a/libavcodec/hevc_sei.h b/libavcodec/hevc_sei.h index f198402..c7623f5 100644 --- a/libavcodec/hevc_sei.h +++ b/libavcodec/hevc_sei.h @@ -134,6 +134,13 @@ typedef struct HEVCSEIFilmGrainCharacteristics { int persistence_flag; } HEVCSEIFilmGrainCharacteristics; +typedef struct HEVCSEIAmbientViewingEnvironment { + int present; + uint32_t ambient_illuminance; + uint16_t ambient_light_x; + uint16_t ambient_light_y; +} HEVCSEIAmbientViewingEnvironment; + typedef struct HEVCSEI { HEVCSEIPictureHash picture_hash; HEVCSEIFramePacking frame_packing; @@ -149,6 +156,7 @@ typedef struct HEVCSEI { HEVCSEIAlternativeTransfer alternative_transfer; HEVCSEITimeCode timecode; HEVCSEIFilmGrainCharacteristics film_grain_characteristics; + HEVCSEIAmbientViewingEnvironment ambient_viewing_env; } HEVCSEI; struct HEVCParamSets; diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 09c07ac..9be366e 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -36,6 +36,7 @@ #include "libavutil/pixdesc.h" #include "libavutil/stereo3d.h" #include "libavutil/timecode.h" +#include "libavutil/ambient_viewing_env_metadata.h" #include "bswapdsp.h" #include "bytestream.h" @@ -2998,6 +2999,15 @@ static int set_side_data(HEVCContext *s) } } + if (s->sei.ambient_viewing_env.present > 0) { + AVAmbientViewingEnvMetadata *metadata = av_ambient_viewing_env_metadata_create_side_data(out); + if (!metadata) + return AVERROR(ENOMEM); + metadata->ambient_illuminance = s->sei.ambient_viewing_env.ambient_illuminance; + metadata->ambient_light_x = s->sei.ambient_viewing_env.ambient_light_x; + metadata->ambient_light_y = s->sei.ambient_viewing_env.ambient_light_y; + } + return 0; } @@ -3800,6 +3810,7 @@ static int hevc_update_thread_context(AVCodecContext *dst, s->sei.mastering_display = s0->sei.mastering_display; s->sei.content_light = s0->sei.content_light; s->sei.alternative_transfer = s0->sei.alternative_transfer; + s->sei.ambient_viewing_env = s0->sei.ambient_viewing_env; ret = export_stream_params_from_sei(s); if (ret < 0) diff --git a/tests/ref/fate/hevc-dv-rpu b/tests/ref/fate/hevc-dv-rpu index 1980ab1..6879f71 100644 --- a/tests/ref/fate/hevc-dv-rpu +++ b/tests/ref/fate/hevc-dv-rpu @@ -117,6 +117,9 @@ source_min_pq=0 source_max_pq=3079 source_diagonal=42 [/SIDE_DATA] +[SIDE_DATA] +side_data_type=Ambient Viewing Environment +[/SIDE_DATA] [/FRAME] [FRAME] [SIDE_DATA] @@ -234,4 +237,7 @@ source_min_pq=0 source_max_pq=3079 source_diagonal=42 [/SIDE_DATA] +[SIDE_DATA] +side_data_type=Ambient Viewing Environment +[/SIDE_DATA] [/FRAME] 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); 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]