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 ESMTPS id 43C324ACCA for ; Thu, 20 Feb 2025 17:26:06 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A3C4868C58A; Thu, 20 Feb 2025 19:25:40 +0200 (EET) Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2E85C68C255 for ; Thu, 20 Feb 2025 19:25:32 +0200 (EET) Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-2fc33aef343so2506249a91.1 for ; Thu, 20 Feb 2025 09:25:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740072329; x=1740677129; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=R8y+a3x+zQRlKATgAud3aEj7Z2ueJ+auHb11ABqjgQk=; b=kgGjdh3TgR9Vn8DMkA25UngIo2uPLyQBlOTDLW7Q+UX7N1wOcGVIiOJbKNYCam88jx 7zykc3jwQ8aZJ6BS708kGT+EtT63KguFvBbWtK5Dq/Kzwh3I6t5Kz7sKYl/nZAlQER46 Ad6TsxBlniyOkVkqUmF96IZFXAcD3BKR0ja9nh/lPDCSyYLEhStc8zoWFLVRV2kwOqqz d7G02bFl40C3LThUvde6oaDovmd4v0hY4kd/qn7VvKA5L1ILQTQwK0qdoy6sTNIJ1Umx f5EpvAxwjJB0L1/5Kcg8EJZVKBJ5Pi6kc3cmyOmB2BvR7e/HtfO6f9xiI+dKYA0RNI2o tNxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740072329; x=1740677129; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=R8y+a3x+zQRlKATgAud3aEj7Z2ueJ+auHb11ABqjgQk=; b=DSLuNOUGUTPf8rGHPZ+y9gstmvHViHE1JN+Jvd0QFnS0s3AgrTaI5PteZWdbmATC4u PB0qoHQIbPLqfYJ0kkENp+bas0zGs528EOIxA/9Wpp/mn7vwbY+LnD0dZZRXSVoKqaKp pDVoHftmj3sA4l53BernzyIez0Kb5Q0f0OeVbBtPaGojj4iFWhLCn6lszd2VrfuUcJkd csvEhCcoBd9sNJHkqIEE3iuN+lxFFC8e5q8xrPLVKy57cvJ+BWvOhBEixYZLEAnSmh4g hhUDbTeA0Lo8QNFJt+FH2ITClFj6PwHFRNDY1AhZyCkmyMvNnpogewk92UULbxlOCF2K BSiA== X-Gm-Message-State: AOJu0YybvQmEHSf9q9kcgbPGn+ZsrpEmx1oucYPHb6yEnWcWqbW/JVr6 9LHiYrYMZEcm11Wvi3Qthh42+4anBnxfKa5PNt6rjiECVIyI+h4d4inMzX0J X-Gm-Gg: ASbGncvxPiBqQjEcUvE0rWafh0HbyF9UK2+bAKthiPZ1uHmp9cvvzMjCn1JTrYij73R 6PrdP9fb/3syIStHmCdc1v0iI6ilXk1ixpzVkKQCB4ta/GqLVso4l2nMslspZYiXtQZtpNNA0hH npyMKr4L5ecipidFjJumvb0u+tCylmZN+1zHVObKeJ2lW653l+UbmBryBG2bZg/VEmPfudOhdBi TD5Mlfm7f92kqKDbI1+HURMuNXIfbTo6yLKqznuL0GYZ2B47PaPKn6fS7BTdQYWKrIk3ixkptlT K3hLOsrtU3fG2E2sD5zyer3Sx+Gepg== X-Google-Smtp-Source: AGHT+IFNCZQrKhGz+6cH1eUvDJ7AEMXN7laW1U0WL0cfxshHhUIdaHv+KXye6LmGQpsn6sQ2hWLjLw== X-Received: by 2002:a17:90a:d2cb:b0:2ee:48bf:7dc9 with SMTP id 98e67ed59e1d1-2fcb5a39e8bmr14322788a91.15.1740072327967; Thu, 20 Feb 2025 09:25:27 -0800 (PST) Received: from localhost.localdomain ([2800:2121:b040:c:84e:2829:1051:10a6]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2fcb0c5357csm4336202a91.27.2025.02.20.09.25.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2025 09:25:27 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Feb 2025 14:24:45 -0300 Message-ID: <20250220172454.2952-2-jamrial@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250220172454.2952-1-jamrial@gmail.com> References: <20250220172454.2952-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/11] avutil/side_data: allow the addition of internal fields to AVSideDataDescriptor 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: Will be useful in the following commits to add fields that don't need to be exposed. Signed-off-by: James Almer --- libavutil/side_data.c | 70 +++++++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 33 deletions(-) diff --git a/libavutil/side_data.c b/libavutil/side_data.c index 17965f2d3c..8c57fd838a 100644 --- a/libavutil/side_data.c +++ b/libavutil/side_data.c @@ -24,44 +24,48 @@ #include "mem.h" #include "side_data.h" -static const AVSideDataDescriptor sd_props[] = { - [AV_FRAME_DATA_PANSCAN] = { "AVPanScan", AV_SIDE_DATA_PROP_SIZE_DEPENDENT }, - [AV_FRAME_DATA_A53_CC] = { "ATSC A53 Part 4 Closed Captions" }, - [AV_FRAME_DATA_MATRIXENCODING] = { "AVMatrixEncoding", AV_SIDE_DATA_PROP_CHANNEL_DEPENDENT }, - [AV_FRAME_DATA_DOWNMIX_INFO] = { "Metadata relevant to a downmix procedure", AV_SIDE_DATA_PROP_CHANNEL_DEPENDENT }, - [AV_FRAME_DATA_AFD] = { "Active format description" }, - [AV_FRAME_DATA_MOTION_VECTORS] = { "Motion vectors", AV_SIDE_DATA_PROP_SIZE_DEPENDENT }, - [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_SIDE_DATA_PROP_COLOR_DEPENDENT }, - [AV_FRAME_DATA_DYNAMIC_HDR_VIVID] = { "HDR Dynamic Metadata CUVA 005.1 2021 (Vivid)", AV_SIDE_DATA_PROP_COLOR_DEPENDENT }, - [AV_FRAME_DATA_REGIONS_OF_INTEREST] = { "Regions Of Interest", AV_SIDE_DATA_PROP_SIZE_DEPENDENT }, - [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_SIDE_DATA_PROP_SIZE_DEPENDENT }, - [AV_FRAME_DATA_DOVI_RPU_BUFFER] = { "Dolby Vision RPU Data", AV_SIDE_DATA_PROP_COLOR_DEPENDENT }, - [AV_FRAME_DATA_DOVI_METADATA] = { "Dolby Vision Metadata", AV_SIDE_DATA_PROP_COLOR_DEPENDENT }, - [AV_FRAME_DATA_LCEVC] = { "LCEVC NAL data", AV_SIDE_DATA_PROP_SIZE_DEPENDENT }, - [AV_FRAME_DATA_VIEW_ID] = { "View ID" }, - [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_SIDE_DATA_PROP_COLOR_DEPENDENT }, - [AV_FRAME_DATA_CONTENT_LIGHT_LEVEL] = { "Content light level metadata", AV_SIDE_DATA_PROP_GLOBAL | AV_SIDE_DATA_PROP_COLOR_DEPENDENT }, - [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_SIDE_DATA_PROP_SIZE_DEPENDENT }, - [AV_FRAME_DATA_ICC_PROFILE] = { "ICC profile", AV_SIDE_DATA_PROP_GLOBAL | AV_SIDE_DATA_PROP_COLOR_DEPENDENT }, - [AV_FRAME_DATA_SEI_UNREGISTERED] = { "H.26[45] User Data Unregistered SEI message", AV_SIDE_DATA_PROP_MULTI }, - [AV_FRAME_DATA_VIDEO_HINT] = { "Encoding video hint", AV_SIDE_DATA_PROP_SIZE_DEPENDENT }, +typedef struct FFSideDataDescriptor { + AVSideDataDescriptor p; +} FFSideDataDescriptor; + +static const FFSideDataDescriptor sd_props[] = { + [AV_FRAME_DATA_PANSCAN] = { .p = { "AVPanScan", AV_SIDE_DATA_PROP_SIZE_DEPENDENT } }, + [AV_FRAME_DATA_A53_CC] = { .p = { "ATSC A53 Part 4 Closed Captions" } }, + [AV_FRAME_DATA_MATRIXENCODING] = { .p = { "AVMatrixEncoding", AV_SIDE_DATA_PROP_CHANNEL_DEPENDENT } }, + [AV_FRAME_DATA_DOWNMIX_INFO] = { .p = { "Metadata relevant to a downmix procedure", AV_SIDE_DATA_PROP_CHANNEL_DEPENDENT } }, + [AV_FRAME_DATA_AFD] = { .p = { "Active format description" } }, + [AV_FRAME_DATA_MOTION_VECTORS] = { .p = { "Motion vectors", AV_SIDE_DATA_PROP_SIZE_DEPENDENT } }, + [AV_FRAME_DATA_SKIP_SAMPLES] = { .p = { "Skip samples" } }, + [AV_FRAME_DATA_GOP_TIMECODE] = { .p = { "GOP timecode" } }, + [AV_FRAME_DATA_S12M_TIMECODE] = { .p = { "SMPTE 12-1 timecode" } }, + [AV_FRAME_DATA_DYNAMIC_HDR_PLUS] = { .p = { "HDR Dynamic Metadata SMPTE2094-40 (HDR10+)", AV_SIDE_DATA_PROP_COLOR_DEPENDENT } }, + [AV_FRAME_DATA_DYNAMIC_HDR_VIVID] = { .p = { "HDR Dynamic Metadata CUVA 005.1 2021 (Vivid)", AV_SIDE_DATA_PROP_COLOR_DEPENDENT } }, + [AV_FRAME_DATA_REGIONS_OF_INTEREST] = { .p = { "Regions Of Interest", AV_SIDE_DATA_PROP_SIZE_DEPENDENT } }, + [AV_FRAME_DATA_VIDEO_ENC_PARAMS] = { .p = { "Video encoding parameters" } }, + [AV_FRAME_DATA_FILM_GRAIN_PARAMS] = { .p = { "Film grain parameters" } }, + [AV_FRAME_DATA_DETECTION_BBOXES] = { .p = { "Bounding boxes for object detection and classification", AV_SIDE_DATA_PROP_SIZE_DEPENDENT } }, + [AV_FRAME_DATA_DOVI_RPU_BUFFER] = { .p = { "Dolby Vision RPU Data", AV_SIDE_DATA_PROP_COLOR_DEPENDENT } }, + [AV_FRAME_DATA_DOVI_METADATA] = { .p = { "Dolby Vision Metadata", AV_SIDE_DATA_PROP_COLOR_DEPENDENT } }, + [AV_FRAME_DATA_LCEVC] = { .p = { "LCEVC NAL data", AV_SIDE_DATA_PROP_SIZE_DEPENDENT } }, + [AV_FRAME_DATA_VIEW_ID] = { .p = { "View ID" } }, + [AV_FRAME_DATA_STEREO3D] = { .p = { "Stereo 3D", AV_SIDE_DATA_PROP_GLOBAL } }, + [AV_FRAME_DATA_REPLAYGAIN] = { .p = { "AVReplayGain", AV_SIDE_DATA_PROP_GLOBAL } }, + [AV_FRAME_DATA_DISPLAYMATRIX] = { .p = { "3x3 displaymatrix", AV_SIDE_DATA_PROP_GLOBAL } }, + [AV_FRAME_DATA_AUDIO_SERVICE_TYPE] = { .p = { "Audio service type", AV_SIDE_DATA_PROP_GLOBAL } }, + [AV_FRAME_DATA_MASTERING_DISPLAY_METADATA] = { .p = { "Mastering display metadata", AV_SIDE_DATA_PROP_GLOBAL | AV_SIDE_DATA_PROP_COLOR_DEPENDENT } }, + [AV_FRAME_DATA_CONTENT_LIGHT_LEVEL] = { .p = { "Content light level metadata", AV_SIDE_DATA_PROP_GLOBAL | AV_SIDE_DATA_PROP_COLOR_DEPENDENT } }, + [AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT] = { .p = { "Ambient viewing environment", AV_SIDE_DATA_PROP_GLOBAL } }, + [AV_FRAME_DATA_SPHERICAL] = { .p = { "Spherical Mapping", AV_SIDE_DATA_PROP_GLOBAL | AV_SIDE_DATA_PROP_SIZE_DEPENDENT } }, + [AV_FRAME_DATA_ICC_PROFILE] = { .p = { "ICC profile", AV_SIDE_DATA_PROP_GLOBAL | AV_SIDE_DATA_PROP_COLOR_DEPENDENT } }, + [AV_FRAME_DATA_SEI_UNREGISTERED] = { .p = { "H.26[45] User Data Unregistered SEI message", AV_SIDE_DATA_PROP_MULTI } }, + [AV_FRAME_DATA_VIDEO_HINT] = { .p = { "Encoding video hint", AV_SIDE_DATA_PROP_SIZE_DEPENDENT } }, }; 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]; + if (t < FF_ARRAY_ELEMS(sd_props) && sd_props[t].p.name) + return &sd_props[t].p; return NULL; } -- 2.48.1 _______________________________________________ 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".