From patchwork Tue Apr 5 13:47:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 35212 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp308741pzb; Tue, 5 Apr 2022 06:47:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwRja7wWntGbM9rjgOF/3XEbkeXmMnaVLNWwArpj98I9Y3W5aZX+mv/qDZW2ilNt/j8QVzG X-Received: by 2002:a17:907:60cc:b0:6e0:dab3:ca76 with SMTP id hv12-20020a17090760cc00b006e0dab3ca76mr3697674ejc.154.1649166469909; Tue, 05 Apr 2022 06:47:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649166469; cv=none; d=google.com; s=arc-20160816; b=wh6SRrqiwZ1iVCIg3VSm8UE6LMkScTHjScKbUut0VrBbNYpwQoIWmFKk8qefHy2VwR ubWjEFh00n474cw5QkhXUAs80oSQH5D8vkGeiEIG6OSMti2B629XiCyDaqigeytHblZt 06tYtKficlpSlXr++8VGwR8z2gJHJCF6/71qzj+LXc0IZlUUfvL86ClgjhiB7264BzvE C8vYM72gYV+vZSQ4GQitw1nnqqXSirCLANJ6i+Vsn3JZfw6ztgj7paZzKnL+SnsQwUCb baEk0Z9PHraLT7wAdYAdRajd7R1kFX7MkRsCD9WwIrMNH+EdReNaYrhzjAcMzhY2WPS1 5YwQ== 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=vvouDv8ZhyFLOghaIYjmt6aSbHhTgvP205Z4+1mRCew=; b=xWC5cjnQcKOFiqjvzM5F94TMScgEiZ/jT7o+fw2UnwaEz/sjf92r6QCV/GLn3Q81N5 LEQ1LoG6lt9aJNQpgkaD8BbbOIpJAIy0Nzc1hiIHh5tVaL2lMW/z6dZCdimIgYVe1g1v JI7o9ffgO/ypE0rrET9DIbMNCyyceIP4QQD4QgTROSZrOJ7CuLtQRSUIW1NptodUGzsl jdXqlBLcp+4tiSZlFHnuyjlqkzE1ZRQVumRrNwaBxEW6dcPieqrS7aD4uKkx7QHfNrM1 2xfwpmmg+N9Sr/NYRCBmHVR0NWg9tOaxPIQnO+PLWsnSVBv+30LN3B7uNyiR7vpoVxN8 7Pew== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=lLGafMrI; 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 r14-20020a05640251ce00b0041962abfa3fsi9983113edd.387.2022.04.05.06.47.26; Tue, 05 Apr 2022 06:47: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=lLGafMrI; 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 C190268AFC2; Tue, 5 Apr 2022 16:47:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 92EF368B0AD for ; Tue, 5 Apr 2022 16:47:15 +0300 (EEST) Received: by mail-pl1-f175.google.com with SMTP id n8so3963653plh.1 for ; Tue, 05 Apr 2022 06:47:15 -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=X6MdceYpqMAWHBFQrzH+gjuWu7dXcwnIzlGB7P2eFb8=; b=lLGafMrI91mczdPMgWJQ9eCgm91H4uNr7PWN+EYSMAHQQo8cUQHJJ0FW6yifCxIDUD wa2ZilLp+9R0SKty5u0iEUFOWIQuAReG7ULVSE9rSSfHyxkGCJWubYV0rOYJBWeivVb+ C9dzWflFBIoRw+3j2E02qVcDyT5cWH7yfiMxfVHifDzlCmx3yA0ByKBKe5XSZW6eXbkg hyp699lEBJ2zFad3b6bEv6SzsBZj3cTALyQTNc7MmqhmfskxsSt+AieO14M+sGAbAg20 hgbPa418A3P4bciuByuED85ADiHvgErt7te6qRQDJULBBoPig91s9T3LuOz5L/CiM4oD /ZXA== 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=X6MdceYpqMAWHBFQrzH+gjuWu7dXcwnIzlGB7P2eFb8=; b=OYSKfjqxg5WtzJh8Z4+ZuNv0qdl5Izershcx4CF9DC/7iT4ohfk2Dx14I8/hvMtre+ B+ovcckaEIESM4rq08sSOuP24Fit7IoybApOnNFeWyBb9tpTVZdpoN1JeWIwG2cpdT9K 4KIwSY9JSremDzsO2dnpdUQnL+s9JKkgv3jhTWgOFBY5p/d5KtbEsiN0/5dczDZNEYe0 Y3CsXO6rgsyI0t+Z9dDUhO4p5kc1aiLyHSRAuLHEP33HQmwakOM/Dw/i7cKfywv5z5QU ewflGJDTzGOw7uXpSypolnpsUdOZJOtQ82QheKlzcFDviBREKpv+gUuR+u3RzdxbVOGb pxFA== X-Gm-Message-State: AOAM531dq4MlB2Nr3A0NMtXZA85OhWB/EDuvC7S31BENPWZu3r663Fn5 PHKIy1jVjMYnjYNJfOfoGanpaAdE5yWhKg== X-Received: by 2002:a17:90b:4b43:b0:1c9:85b0:2db8 with SMTP id mi3-20020a17090b4b4300b001c985b02db8mr4189848pjb.23.1649166433583; Tue, 05 Apr 2022 06:47:13 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id c18-20020a056a000ad200b004f0f9696578sm17112705pfl.141.2022.04.05.06.47.12 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Apr 2022 06:47:13 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Apr 2022 21:47:03 +0800 Message-Id: <1649166427-9667-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 v3 1/5] 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: beKP9EqqcjXj 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 ++++++++++++++++++++++++++++++++++ libavutil/version.h | 2 +- 5 files changed, 76 insertions(+), 1 deletion(-) 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..92413c9 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 AVAmbientViewingEnv + */ + AV_FRAME_DATA_AMBIENT_VIEWING_ENV, }; enum AVActiveFormatDescription { diff --git a/libavutil/mastering_display_metadata.c b/libavutil/mastering_display_metadata.c index 6069347..f094eab 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; } + +AVAmbientViewingEnv *av_ambient_viewing_env_alloc(size_t *size) +{ + AVAmbientViewingEnv *metadata = av_mallocz(sizeof(*metadata)); + + if (size) + *size = sizeof(*metadata); + + return metadata; +} + +AVAmbientViewingEnv *av_ambient_viewing_env_create_side_data(AVFrame *frame) +{ + AVFrameSideData *side_data = av_frame_new_side_data(frame, + AV_FRAME_DATA_AMBIENT_VIEWING_ENV, + sizeof(AVAmbientViewingEnv)); + if (!side_data) + return NULL; + + memset(side_data->data, 0, sizeof(AVAmbientViewingEnv)); + + return (AVAmbientViewingEnv *)side_data->data; +} diff --git a/libavutil/mastering_display_metadata.h b/libavutil/mastering_display_metadata.h index c23b07c..c1ba659 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_alloc() + * and its size is not a part of the public ABI. + */ +typedef struct AVAmbientViewingEnv { + /** + * 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; +} AVAmbientViewingEnv; + +/** + * Allocate an AVAmbientViewingEnv structure and set its fields to + * default values. The resulting struct can be freed using av_freep(). + * + * @return An AVAmbientViewingEnv filled with default values or NULL + * on failure. + */ +AVAmbientViewingEnv *av_ambient_viewing_env_alloc(size_t *size); + +/** + * Allocate a complete AVAmbientViewingEnv and add it to the frame. + * + * @param frame The frame which side data is added to. + * + * @return The AVAmbientViewingEnv structure to be filled by caller. + */ +AVAmbientViewingEnv *av_ambient_viewing_env_create_side_data(AVFrame *frame); + #endif /* AVUTIL_MASTERING_DISPLAY_METADATA_H */ diff --git a/libavutil/version.h b/libavutil/version.h index 6735c20..998202f 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 57 -#define LIBAVUTIL_VERSION_MINOR 24 +#define LIBAVUTIL_VERSION_MINOR 25 #define LIBAVUTIL_VERSION_MICRO 101 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \