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 685E24A350 for ; Tue, 26 Mar 2024 21:38:42 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 01C4868D680; Tue, 26 Mar 2024 23:38:40 +0200 (EET) Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 93FB368D670 for ; Tue, 26 Mar 2024 23:38:33 +0200 (EET) Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-29e0229d6b5so4619102a91.3 for ; Tue, 26 Mar 2024 14:38:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711489110; x=1712093910; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=rUjDoOrBJ0kijRm+WGVZoyb0OQVmpxOWFENi9mSRw5w=; b=k4GFI3r7fup1/lZICJEuSwz51zGS0Uvsnd++iVwD25mhrUpw+VWZuOQPxv2x36zO9e yDYezXTWrHbnoCElXqfraLREnF/vzkiXRqtYAIIlivxKOOohZEZi1ckOHGETxVQCPXPi N2r1elPnrw3vGn5HXiJnfSNk0b8+h0cbfb7bOsiAea4qXJxYL/LXtbUglPj/xnLjEu8w 1drquSiD+XAtiXylSw/mAQ4UpxlFVzV3VH6Ih9MLy1z4EWj4AzAZanHMTzyvIQ0LcZSd tajOLDvv8YiZ+tdV8Fm0fUJfYU5Xvc1dQAQaU+LBj0pZYYen9mOw3HqGwZyN0ZRwBL61 NW5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711489110; x=1712093910; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=rUjDoOrBJ0kijRm+WGVZoyb0OQVmpxOWFENi9mSRw5w=; b=IKtyzl6f8vFrjzOb985TXKPP13OAUdFSKn5iNAz8AOJVjzD/ey42aQdX+ur4UUofO3 TqQtGkk9SfhHoziXcaYAnm7If92gJOyxIyqdJ+oiOecXcdHLNublnBrl9eEI1rw5qkW0 fqp2Naape3G3s4rtNYMixiouRq94zPiuG+645g6HOnrZhT/ph7sdhPlSy+VBFwEss5pH jyVfIIODWEYBsPuFbXg4OWUVyjvQBFwL/A5pGO+OWBSS235spqhnZHYc8c5bnDkm1Ipo Czw5yMsqWTgLL61hMdBIz0IxzbC6ensb6yiYvB6Kkye3/pVKJ/3Vut/cee0iZOscH5VL olig== X-Gm-Message-State: AOJu0YywUtmy4rHsSJzlmTgYCrsIYW1uvBcdgxo7cI/3aLQHGmc2xmZt sMrinCH0qnMevjwZcvB9r4JbgIAw8XUDjzhIXaw5gnT68+rtcyTO2I9mm1bO X-Google-Smtp-Source: AGHT+IGr0mdF6mqG83MCvae39+0TLoSP1v9iy7Qj5Z+Dv+kPTGMNXYWEGXNsYSKoV0h7HLG1AkI1Kg== X-Received: by 2002:a17:90a:1002:b0:29d:d93a:d6e5 with SMTP id b2-20020a17090a100200b0029dd93ad6e5mr2359932pja.16.1711489109950; Tue, 26 Mar 2024 14:38:29 -0700 (PDT) Received: from [192.168.0.15] ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id i11-20020a17090332cb00b001dd578121d4sm7304869plr.204.2024.03.26.14.38.28 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 26 Mar 2024 14:38:29 -0700 (PDT) Message-ID: <3cd84c73-b9dd-4ad5-ba6a-d1f22f3b7ce5@gmail.com> Date: Tue, 26 Mar 2024 18:38:28 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240323130409.20925-1-anton@khirnov.net> Content-Language: en-US From: James Almer In-Reply-To: <20240323130409.20925-1-anton@khirnov.net> Subject: Re: [FFmpeg-devel] [PATCH 1/4] lavu/frame: add side data descriptors 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 3/23/2024 10:04 AM, Anton Khirnov wrote: > They allow exporting extended information about side data types. > --- > doc/APIchanges | 4 +++ > libavutil/frame.c | 70 ++++++++++++++++++++++++++------------------- > libavutil/frame.h | 27 +++++++++++++++++ > libavutil/version.h | 2 +- > 4 files changed, 72 insertions(+), 31 deletions(-) > > diff --git a/doc/APIchanges b/doc/APIchanges > index a025f1df14..8794380e11 100644 > --- a/doc/APIchanges > +++ b/doc/APIchanges > @@ -2,6 +2,10 @@ The last version increases of all libraries were on 2024-03-07 > > API changes, most recent first: > > +2024-03-xx - xxxxxxxxxx - lavu 59.4.100 - frame.h > + Add AVSideDataDescriptor, enum AVSideDataProps, and > + av_frame_side_data_desc(). > + > 2024-03-xx - xxxxxxxxxx - lavc 61.2.100 - avcodec.h > Add AVCodecContext.[nb_]decoded_side_data. > > diff --git a/libavutil/frame.c b/libavutil/frame.c > index 89db687d9c..cb9af6326d 100644 > --- a/libavutil/frame.c > +++ b/libavutil/frame.c > @@ -28,6 +28,36 @@ > #include "samplefmt.h" > #include "hwcontext.h" > > +static const AVSideDataDescriptor sd_props[] = { > + [AV_FRAME_DATA_PANSCAN] = { "AVPanScan" }, > + [AV_FRAME_DATA_A53_CC] = { "ATSC A53 Part 4 Closed Captions" }, > + [AV_FRAME_DATA_MATRIXENCODING] = { "AVMatrixEncoding" }, > + [AV_FRAME_DATA_DOWNMIX_INFO] = { "Metadata relevant to a downmix procedure" }, > + [AV_FRAME_DATA_AFD] = { "Active format description" }, > + [AV_FRAME_DATA_MOTION_VECTORS] = { "Motion vectors" }, > + [AV_FRAME_DATA_SKIP_SAMPLES] = { "Skip samples" }, > + [AV_FRAME_DATA_GOP_TIMECODE] = { "GOP timecode" }, > + [AV_FRAME_DATA_S12M_TIMECODE] = { "SMPTE 12-1 timecode" }, > + [AV_FRAME_DATA_DYNAMIC_HDR_PLUS] = { "HDR Dynamic Metadata SMPTE2094-40 (HDR10+)" }, > + [AV_FRAME_DATA_DYNAMIC_HDR_VIVID] = { "HDR Dynamic Metadata CUVA 005.1 2021 (Vivid)" }, > + [AV_FRAME_DATA_REGIONS_OF_INTEREST] = { "Regions Of Interest" }, > + [AV_FRAME_DATA_VIDEO_ENC_PARAMS] = { "Video encoding parameters" }, > + [AV_FRAME_DATA_FILM_GRAIN_PARAMS] = { "Film grain parameters" }, > + [AV_FRAME_DATA_DETECTION_BBOXES] = { "Bounding boxes for object detection and classification" }, > + [AV_FRAME_DATA_DOVI_RPU_BUFFER] = { "Dolby Vision RPU Data" }, > + [AV_FRAME_DATA_DOVI_METADATA] = { "Dolby Vision Metadata" }, > + [AV_FRAME_DATA_STEREO3D] = { "Stereo 3D", AV_SIDE_DATA_PROP_GLOBAL }, > + [AV_FRAME_DATA_REPLAYGAIN] = { "AVReplayGain", AV_SIDE_DATA_PROP_GLOBAL }, > + [AV_FRAME_DATA_DISPLAYMATRIX] = { "3x3 displaymatrix", AV_SIDE_DATA_PROP_GLOBAL }, > + [AV_FRAME_DATA_AUDIO_SERVICE_TYPE] = { "Audio service type", AV_SIDE_DATA_PROP_GLOBAL }, > + [AV_FRAME_DATA_MASTERING_DISPLAY_METADATA] = { "Mastering display metadata", AV_SIDE_DATA_PROP_GLOBAL }, > + [AV_FRAME_DATA_CONTENT_LIGHT_LEVEL] = { "Content light level metadata", AV_SIDE_DATA_PROP_GLOBAL }, > + [AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT] = { "Ambient viewing environment", AV_SIDE_DATA_PROP_GLOBAL }, > + [AV_FRAME_DATA_SPHERICAL] = { "Spherical Mapping", AV_SIDE_DATA_PROP_GLOBAL }, > + [AV_FRAME_DATA_ICC_PROFILE] = { "ICC profile", AV_SIDE_DATA_PROP_GLOBAL }, > + [AV_FRAME_DATA_SEI_UNREGISTERED] = { "H.26[45] User Data Unregistered SEI message", AV_SIDE_DATA_PROP_MULTI }, > +}; > + > static void get_frame_defaults(AVFrame *frame) > { > memset(frame, 0, sizeof(*frame)); > @@ -895,38 +925,18 @@ void av_frame_remove_side_data(AVFrame *frame, enum AVFrameSideDataType type) > remove_side_data(&frame->side_data, &frame->nb_side_data, type); > } > > +const AVSideDataDescriptor *av_frame_side_data_desc(enum AVFrameSideDataType type) > +{ > + unsigned t = type; > + if (t < FF_ARRAY_ELEMS(sd_props) && sd_props[t].name) > + return &sd_props[t]; > + return NULL; > +} > + > const char *av_frame_side_data_name(enum AVFrameSideDataType type) > { > - switch(type) { > - case AV_FRAME_DATA_PANSCAN: return "AVPanScan"; > - case AV_FRAME_DATA_A53_CC: return "ATSC A53 Part 4 Closed Captions"; > - case AV_FRAME_DATA_STEREO3D: return "Stereo 3D"; > - case AV_FRAME_DATA_MATRIXENCODING: return "AVMatrixEncoding"; > - case AV_FRAME_DATA_DOWNMIX_INFO: return "Metadata relevant to a downmix procedure"; > - case AV_FRAME_DATA_REPLAYGAIN: return "AVReplayGain"; > - case AV_FRAME_DATA_DISPLAYMATRIX: return "3x3 displaymatrix"; > - case AV_FRAME_DATA_AFD: return "Active format description"; > - case AV_FRAME_DATA_MOTION_VECTORS: return "Motion vectors"; > - case AV_FRAME_DATA_SKIP_SAMPLES: return "Skip samples"; > - case AV_FRAME_DATA_AUDIO_SERVICE_TYPE: return "Audio service type"; > - case AV_FRAME_DATA_MASTERING_DISPLAY_METADATA: return "Mastering display metadata"; > - case AV_FRAME_DATA_CONTENT_LIGHT_LEVEL: return "Content light level metadata"; > - case AV_FRAME_DATA_GOP_TIMECODE: return "GOP timecode"; > - case AV_FRAME_DATA_S12M_TIMECODE: return "SMPTE 12-1 timecode"; > - case AV_FRAME_DATA_SPHERICAL: return "Spherical Mapping"; > - case AV_FRAME_DATA_ICC_PROFILE: return "ICC profile"; > - case AV_FRAME_DATA_DYNAMIC_HDR_PLUS: return "HDR Dynamic Metadata SMPTE2094-40 (HDR10+)"; > - case AV_FRAME_DATA_DYNAMIC_HDR_VIVID: return "HDR Dynamic Metadata CUVA 005.1 2021 (Vivid)"; > - case AV_FRAME_DATA_REGIONS_OF_INTEREST: return "Regions Of Interest"; > - case AV_FRAME_DATA_VIDEO_ENC_PARAMS: return "Video encoding parameters"; > - case AV_FRAME_DATA_SEI_UNREGISTERED: return "H.26[45] User Data Unregistered SEI message"; > - case AV_FRAME_DATA_FILM_GRAIN_PARAMS: return "Film grain parameters"; > - 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_ENVIRONMENT: return "Ambient viewing environment"; > - } > - return NULL; > + const AVSideDataDescriptor *desc = av_frame_side_data_desc(type); > + return desc ? desc->name : NULL; > } > > static int calc_cropping_offsets(size_t offsets[4], const AVFrame *frame, > diff --git a/libavutil/frame.h b/libavutil/frame.h > index a7fc909ad8..aa614c3dc6 100644 > --- a/libavutil/frame.h > +++ b/libavutil/frame.h > @@ -251,6 +251,27 @@ typedef struct AVFrameSideData { > AVBufferRef *buf; > } AVFrameSideData; > > +enum AVSideDataProps { > + AV_SIDE_DATA_PROP_GLOBAL = (1 << 0), > + AV_SIDE_DATA_PROP_MULTI = (1 << 1), > +}; > + > +/** > + * This struct describes the properties of a side data type. Its instance > + * corresponding to a given type can be obtained from av_frame_side_data_desc(). > + */ > +typedef struct AVSideDataDescriptor { > + /** > + * Human-readable side data description. > + */ > + const char *name; > + > + /** > + * Side data property flags, a combination of AVSideDataProps values. > + */ > + unsigned props; > +} AVSideDataDescriptor; > + > /** > * Structure describing a single Region Of Interest. > * > @@ -988,6 +1009,12 @@ int av_frame_apply_cropping(AVFrame *frame, int flags); > */ > const char *av_frame_side_data_name(enum AVFrameSideDataType type); > > +/** > + * @return side data descriptor corresponding to a given side data type, NULL > + * when not available. > + */ > +const AVSideDataDescriptor *av_frame_side_data_desc(enum AVFrameSideDataType type); > + > /** > * Free all side data entries and their contents, then zeroes out the > * values which the pointers are pointing to. > diff --git a/libavutil/version.h b/libavutil/version.h > index 5027b025be..882003f719 100644 > --- a/libavutil/version.h > +++ b/libavutil/version.h > @@ -79,7 +79,7 @@ > */ > > #define LIBAVUTIL_VERSION_MAJOR 59 > -#define LIBAVUTIL_VERSION_MINOR 3 > +#define LIBAVUTIL_VERSION_MINOR 4 > #define LIBAVUTIL_VERSION_MICRO 100 > > #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ Should be ok. _______________________________________________ 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".