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 5EC32405DF for ; Mon, 28 Mar 2022 01:29:08 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3122168B29B; Mon, 28 Mar 2022 04:29:06 +0300 (EEST) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D25368B008 for ; Mon, 28 Mar 2022 04:29:00 +0300 (EEST) Received: by mail-pj1-f54.google.com with SMTP id mp6-20020a17090b190600b001c6841b8a52so17251086pjb.5 for ; Sun, 27 Mar 2022 18:29:00 -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=h3JK3UwKPRWK8wLFl8E6tvOSQqL0Th1mdGmv6IBCu94=; b=hBaDDHd5sb54j17Kh5jujiszBqVvGQ1q9KDoIGZg7GP/MpU67kmZ2C7LFmU8aiD2NS lUXJVMZkin4WJP7agJCszoc8gy5vPXKsgaOwbGwkL8rlK8lGdYm1zptkZCnWaum9Y0l9 tJk7FLu6QSLUn72b8QbKkPrlgy4gnLXQC9XweXSzHtPYH6aLpP09GURJ8AnREfGQb/y4 evQtHomiDlZr4Vpc5WuX14KIgRuRMnSx3KLKiTQjQyrhDxqZqtH3SMfKPtfysqmwrPZk QLb24Qh1j5NYZYkNha9zDgLnqHdqtQFD+2un66foLt+2AKcHMY8g1ePe5dYzFXQy6NV6 OGpQ== 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=h3JK3UwKPRWK8wLFl8E6tvOSQqL0Th1mdGmv6IBCu94=; b=IYzTrOlJr950FvxgV3aWwwOQKatXysmGrLyOO299dWpktylCkPlXGFX4SH9MuKEWee QndDx+6/hESWjAOXC+mXRGfrdF5F7CttON8NeEjeUn0D/zOMxHr13SpejQ3MfDXAND5R DKUmCI0+bWawoI7eDRyK0HPMq82mtRoQEVyL2Uz1V6cOa7wMncKdLLUQATQdG+8WMnBa Y5T+QMDG5tIbrOTUEkX/zupPccBUG33S/07rR5avalwk5LVrs5hbLJqcU9Ik6DP6Ga3s z5ebk+7LARrmg/txHh5WlLb8uMTqScfC+WLLEMjBBgVHqwBMj7iAHzm7aScEpkftS1Ii 8bMw== X-Gm-Message-State: AOAM5306k3qD6l7I5kUqoteeXpZ+z8ZuxmJhNRsolbZdPNcp1avGFE4j T3+TonSTgrFtBFlaqGs8byMugL/wtoKyUA== X-Google-Smtp-Source: ABdhPJxXvA8aS4GUATg1oZx9n9vpWjDomRFK3Gpwm/KyEddSY2s3lobhm8GpiBSUIRYV6xTirEmKNg== X-Received: by 2002:a17:903:186:b0:154:3606:7a73 with SMTP id z6-20020a170903018600b0015436067a73mr24149513plg.89.1648430938261; Sun, 27 Mar 2022 18:28:58 -0700 (PDT) Received: from gmail.com ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id lw4-20020a17090b180400b001c7327d09c3sm20466501pjb.53.2022.03.27.18.28.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Mar 2022 18:28:57 -0700 (PDT) Date: Mon, 28 Mar 2022 09:28:54 +0800 From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Message-ID: <20220328012854.GA22407@gmail.com> Mail-Followup-To: ffmpeg-devel@ffmpeg.org References: <1648423513-21261-1-git-send-email-lance.lmwang@gmail.com> <69260dcc-5881-a3c5-c438-83919710d9f2@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <69260dcc-5881-a3c5-c438-83919710d9f2@gmail.com> Subject: Re: [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 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 Sun, Mar 27, 2022 at 08:30:30PM -0300, James Almer wrote: > > > On 3/27/2022 8:25 PM, lance.lmwang@gmail.com wrote: > > 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; > > We don't need a new header for this. Just add it to > mastering_display_metadata.h. The other structs there are based on other > entries from the same spec (H.274) and have similar purposes. OK, will move to there as suggestion. > > > + > > +/** > > + * 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 { > _______________________________________________ > 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".