From patchwork Mon Mar 28 12:41:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 35013 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp205106pzb; Mon, 28 Mar 2022 05:41:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyV0Yh2LmRzLXbmpvdfEssg8LzAR6mjtUhrcfo5mvUJfulPqwyGjg5Y0K2XKpG3iMDvsS5j X-Received: by 2002:a05:6402:1909:b0:418:d876:3119 with SMTP id e9-20020a056402190900b00418d8763119mr16296016edz.266.1648471290222; Mon, 28 Mar 2022 05:41:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648471290; cv=none; d=google.com; s=arc-20160816; b=AbaNc23ZaTsU+feOf9WQBwrVuUn4CkJgj1T1Zg/xLAqm6Hj+YsqX+gClEBA6BnbDju Zo1Z5nMwvnqpfh4kmSRaH5xpKtQMwh06f4lRjuyFz+8pfE8UjHtvkqbS2VyV/NlsBgq8 zQ9KTuVNIp6rWW4nX6Pgdu9WjhQy2XzSeaB+7ExyVMaihEzVkCdP0lfMAwt1bMLCDEG2 oicinm+vXQK/lI6I/O7OBT3f7FZy2R2K+zi4eXLPtgMHYk2g3ogG4KfhI1WS9jbyPKpK JDxeG20+g5L6k+M8M2VhMTkwKwNfTaFWzNxvCJ+j23UOH0IopW33YaWNNlkkEWUf8Oaa dljg== 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=EasCMxOyBzEp5YTD3OHrXXErXh20Levfyv86L0t12AY=; b=xDe+QsUW6mBvIY7+DI47plwnQj6+Bi5EyWbsIsPlAuoePsMXPsn6x62ur3KvT3pelB DMI1H6RASC67Ddw502fVNNZMzoIvgTxZ5FGLbWmHoS+nqjgGaijhGM02eW8ZjfnrSltQ FvvuSINeWWjW0dVFb2+zekJP98cIoqK/DX9rZqpV+Kb2Hqkzp1nPKWt8jPjYHZnYUAEf E4q2aGKZxHThDr+n/WuszeNFrRRvo8K3A+YqkGfWVs3cng064yRoq9Vs/hEyz+6wzofw FVylGK/Z5bJsf5EbiVey/VrRxi97+31ZR9M2QSpAjbQHpxL90k4CONswqR/pdYeCut3V +lXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=TpcvuUvz; 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 h9-20020a1709060f4900b006df76385cc3si14330134ejj.355.2022.03.28.05.41.29; Mon, 28 Mar 2022 05:41:30 -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=TpcvuUvz; 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 E24FA68B1AD; Mon, 28 Mar 2022 15:41:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6259768A2F6 for ; Mon, 28 Mar 2022 15:41:18 +0300 (EEST) Received: by mail-pg1-f181.google.com with SMTP id c2so12142907pga.10 for ; Mon, 28 Mar 2022 05:41:18 -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=s6qSFiICEJ6bYNgmIja0oXLc79RCZ5tTq6JMBwwfBss=; b=TpcvuUvzG1UGT3PB4Gkfd+fLZUmGNJ1Tol+hqNN0rCd68Giw4SScG5u4zUnLBaHpYa yS1d7jgnjzLIVfR5ulEj3EUMjdnJO09o2/6znNGjHXpUssa0ZdO6uCZISQr+VfZHc1Ue 5J37A8oGQtKaSo3FsJ2nbO7exvXhSUcDgYtOuRYW8mibw1k+RVpx2uUqqKey+3rq1vOs Zkd7FUHOvAwKSjdCRS0bQGzUi/YCFJiH0j+djdcHabrDVfvozCJkikhaCyn2KgcLqOrY +6PlWp5SJKZC42E6a42dVWcnRV08UU5jkDXr81gTxKBO3saqUK7U3icUULbXpw2iqq0N hcXw== 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=s6qSFiICEJ6bYNgmIja0oXLc79RCZ5tTq6JMBwwfBss=; b=py9maLU1PiDxW9zBQMtYWiZvRm5rVivbbsvE900D9UsG7IRvQAAVUdNeGobTFneRHh C8ghP3YBHjUPTaIIqLefppWVrXLNpu9XR3o7kvSZV78JsoBpIzP+X1mFnr0wczpr8PPs mRSopQHJQC04Pqo2YIFDhk/+xP4ZTVm083QJoeG7KUzlUbS8jIzm3qYee77XNcHD6AoL 1ysyyJEaYw2pWfR9HB/KDoqaXoPLc9bh9DfPYNeB6s6qwbZtLwM0oEilEC7KogsXnEEM EltyTqnnG5gYBXOTT7+nLG6Q4wtwttiGejjCKRCfmYM28C4ndhbPjfPSRmf1BvOYggrg O2aw== X-Gm-Message-State: AOAM532DQufBe7nrKM1dRDaCz4tOQCfx+rscUstWgqC3A8CbE8Tradxs avFVD8GLtVvj1fNyZss25MpE9aHlu2yLbg== X-Received: by 2002:a63:3e8d:0:b0:398:5222:3a3 with SMTP id l135-20020a633e8d000000b00398522203a3mr3413191pga.561.1648471276098; Mon, 28 Mar 2022 05:41:16 -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.14 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Mar 2022 05:41:15 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Mar 2022 20:41:08 +0800 Message-Id: <1648471271-22016-1-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 v2 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: nOwzk33B558I From: Limin Wang Signed-off-by: Limin Wang --- libavutil/frame.c | 1 + libavutil/frame.h | 6 +++++ libavutil/mastering_display_metadata.c | 23 +++++++++++++++++ libavutil/mastering_display_metadata.h | 45 ++++++++++++++++++++++++++++++++++ 4 files changed, 75 insertions(+) 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 { diff --git a/libavutil/mastering_display_metadata.c b/libavutil/mastering_display_metadata.c index 6069347..ba1c80f 100644 --- a/libavutil/mastering_display_metadata.c +++ b/libavutil/mastering_display_metadata.c @@ -64,3 +64,26 @@ AVContentLightMetadata *av_content_light_metadata_create_side_data(AVFrame *fram return (AVContentLightMetadata *)side_data->data; } + +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/mastering_display_metadata.h b/libavutil/mastering_display_metadata.h index c23b07c..d7598c1 100644 --- a/libavutil/mastering_display_metadata.h +++ b/libavutil/mastering_display_metadata.h @@ -125,4 +125,49 @@ AVContentLightMetadata *av_content_light_metadata_alloc(size_t *size); */ AVContentLightMetadata *av_content_light_metadata_create_side_data(AVFrame *frame); +/** + * 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 50000 + */ + 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_MASTERING_DISPLAY_METADATA_H */