From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 68D9F42905 for ; Tue, 5 Apr 2022 23:11:41 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B260D68B072; Wed, 6 Apr 2022 02:11:38 +0300 (EEST) Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 11906680264 for ; Wed, 6 Apr 2022 02:11:32 +0300 (EEST) Received: by mail-pg1-f169.google.com with SMTP id 66so639889pga.12 for ; Tue, 05 Apr 2022 16:11:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=AfEz1clywsXf2IXR5kqsfoIHROgnjvljO7w81RQ0jgM=; b=FCUkKzMQBEKLImhMXiU/aFZvNAA2mMDGNYlaA963/hC6oHo3lALquJjerK1gJMQ8rT HduVWC1RVBublydCgIdwokgAOexGwbW2ahcyCO84dzjTrx1rRSATBmhcCl7cLG5OzWRr AlEbe8GbBMk8NuqVlMHbfF4FzzC7Xif5uPKDEY0FY88cZoW/3d4zwa6JMKmn3JKn3rFW jsmRqXCkExhM+MTHdgwGoVmNrpNhZs3CJumspdtfOIlSO/f/1jgIm9oxht1pkJ6oIuj6 7v9+RWHU9r0SpqI7lg15JvSwPbxCFLC/p0JKbFPnJmySSt+j+ojDE7ctTCYw4JXjf+37 N4Kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:subject:message-id:mail-followup-to :references:mime-version:content-disposition:in-reply-to; bh=AfEz1clywsXf2IXR5kqsfoIHROgnjvljO7w81RQ0jgM=; b=sMq2j27YMj0XjGWCdMo3JAVYst35v9kVAyCRAzHHX3aFN8CTEfDDDRE7wAHIa/C9c5 58fhRMGectzUBE8D880iXYPdnAwswBTw76YTfuoRGkjYKfkmGxCqHcunqe89i/cz3qIS N8TXGh5eROx9wVT+EsqRkvix7E2nSZJVhhHMhEV4Cp5ictyGbFdh/zi1+4oTj2nacBn2 XCfGMG1sR0fPCDY5AuT2LxNixL0tv2kRIjrooDEzGg8FkGBt9zcGX4Q/KXgOON9WmH7E XH/hfHbYIU41v0WxhgfgxfD/hJEQqgc5eZWMHEKcTIXavN7wI7/6jCuizkBvxLBgxHEr dGKA== X-Gm-Message-State: AOAM5312ZfSOTS0NgScuG4unuAUjb3Kh9MZo0TSfbjN23gpylO3jrJqw vXRzBSqSDWpVaMTDOgEVF56yDCqwhlyoHw== X-Google-Smtp-Source: ABdhPJzDKlPwY+DycoAK4B2D8IHtLznNGCF15gz3bfNfpM5IRlrLI2xYlmK0IDuNvMj6kUXiuxwmRA== X-Received: by 2002:a05:6a00:174a:b0:4fd:ac35:6731 with SMTP id j10-20020a056a00174a00b004fdac356731mr5851328pfc.71.1649200289600; Tue, 05 Apr 2022 16:11:29 -0700 (PDT) Received: from gmail.com ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id bv8-20020a056a00414800b004fafb37f293sm15469806pfb.209.2022.04.05.16.11.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Apr 2022 16:11:29 -0700 (PDT) Date: Wed, 6 Apr 2022 07:11:26 +0800 From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Message-ID: <20220405231126.GA15614@gmail.com> Mail-Followup-To: ffmpeg-devel@ffmpeg.org References: <1648423513-21261-1-git-send-email-lance.lmwang@gmail.com> <1649166427-9667-1-git-send-email-lance.lmwang@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Subject: Re: [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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Tue, Apr 05, 2022 at 05:32:12PM +0200, Andreas Rheinhardt wrote: > lance.lmwang@gmail.com: > > 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); > > All this boilerplate code for the various side-data--types makes me > wonder whether they should not be replaced by something like > void *av_frame_side_data_alloc(enum AVFrameSideDataType, size_t *size) > and a corresponding av_frame_create_side_data(AVFrame *frame, enum > AVFrameSideDataType). It's good idea to have them? please add them anyway, I'll pending the patch until it's ready to use. > These functions would return an error in case it doesn't make sense to > create a side data this way (because there is no struct associated to > this side data type or because the size of this struct depends upon > other parameters, too). > > > + > > #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 > > Micro needs to be reset when minor is bumped. OK, forgot to reset it. > > > > > #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". -- Thanks, Limin Wang _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".