From patchwork Sat Mar 23 13:04:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 47369 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c889:b0:1a3:b6bb:3029 with SMTP id hb9csp206985pzb; Sat, 23 Mar 2024 06:06:54 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVvoRBIFKO7r8YsS4G5cbM3ze0pNGBszfXqmqk16NWeVnizOfPNT57xu4WfsC/TyEHVc1eTHcTKUocpSBjgup9n4Zbj2chcYmOUgA== X-Google-Smtp-Source: AGHT+IF2v26VP6xosFQ9CcYj3hurhNTKw4p2+fs6AWXQ+O8v15xFtw8XoKa970yNp2xtMmcRpjnW X-Received: by 2002:a2e:4c12:0:b0:2d4:3d86:54e5 with SMTP id z18-20020a2e4c12000000b002d43d8654e5mr1471955lja.12.1711199213665; Sat, 23 Mar 2024 06:06:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711199213; cv=none; d=google.com; s=arc-20160816; b=n9GoB3X7LzgFf4vMz5FVT+fboYuWdDk1sSJFj63eaHcKarUueZ8ur+XCUxTT36xq3t L/7K4fKGwzBRW8iMv4h6X0VveANc511QETVwthx1K9ZxmxMel3fzGp9lVQMuz8QnuY5d 7X58tdHLir4TMVQ5u5bMNy+u1BgoChu6Ux+2SU3YfErfxjOORfpGnMLlaF9fpxfrDRQI EquwJAyuD8TfAY4mAltDKK1xdSigQNSHP5zE6hAFlxddq+pDrQq4N8ELnjzVjJJHH6YZ shH8pQpvfBC5fPlp3IRdQxf6gEou/8efO/U2bBIlaqc5hyyrKrcuO2avYP/ugIuWhKb2 2kYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=7q3K49s+wZbuTJdyo3ibnxw3tPXfP9gtR0jqPb80jIE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Bk3anGVvxRJqgbDmnCJcussUHC0NJidunmp7crD8BaPwJSX7gGCtqZr11HftrDB5K6 sFGdosy0rcddvyR2PGSBJOrBhe/TsFscTrNKl5KlbdyyitgBNBUgwykQrbBZDwo/hmYI vbc8CFzLzw/ZGD5XtVoydo2IgIn9V/2nyNglIR9goqFmKXYG8rYDzs66uYYErtZ0+13M ZT+bFSNoTIWvhDnkFmC5InIaSi4op2oXcks6yjFgYwL5AI0NRepdm63zc3zGYXukLMw9 aQbWa2gUZwVuxNb/KXa0imKbMqUAL01iq+7ro5Py1MLLD9Io0uqn8RHpGSRgHjTVU8Xp G2pg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=e2NNNo5q; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p23-20020a50cd97000000b00568c5eb31besi834598edi.676.2024.03.23.06.06.53; Sat, 23 Mar 2024 06:06:53 -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=@khirnov.net header.s=mail header.b=e2NNNo5q; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 79AAA68D52E; Sat, 23 Mar 2024 15:06:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9526D68D439 for ; Sat, 23 Mar 2024 15:06:19 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=e2NNNo5q; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 499DA4D46 for ; Sat, 23 Mar 2024 14:06:19 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id IjoYpBA-Y3xE for ; Sat, 23 Mar 2024 14:06:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1711199176; bh=n9uyeMMEu+79bR8q4MN21Qw74oCzyPGpWQTcID158xo=; h=From:To:Subject:Date:From; b=e2NNNo5qxjK8BsJA8bNvgeklvxLvz8QbWynxFGD3fDDcsLE5SDxmcHYn73sPv/Bd0 DDg4nOkZrdMm+R8u4GUl8G9Y2Ru9A7VmDFmCZmqsrZrbxh5reTKl6S0lWQ2+JzByL7 0ykvAgNZSaX12Ehhm3NAVnLes/sBhwPCLsmcAQ1xskLptHZ8N/YcFUEXORoudUrtCW VwIgI20mXYrnTOx+w3sIEl7OeMDTZE7VQSQUonPC6HuZDhPAwKgd1G5NtPkayanXyW cFkob5Ws01mWK4bROVv8891tOl8tZOhz/nST/usBSFRYpEK9/J1IJWjgZsRGrX2J3U wGNepBD4WNTSw== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 8D0934D44 for ; Sat, 23 Mar 2024 14:06:16 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 6332B3A0357 for ; Sat, 23 Mar 2024 14:06:16 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Mar 2024 14:04:06 +0100 Message-ID: <20240323130409.20925-1-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: FwtZiMFl6HnI 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, \