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 D7DA24CC72 for ; Sat, 25 Jan 2025 20:22:24 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 40D2C68B886; Sat, 25 Jan 2025 22:22:09 +0200 (EET) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D725D68ADF9 for ; Sat, 25 Jan 2025 22:22:01 +0200 (EET) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-21670dce0a7so66341185ad.1 for ; Sat, 25 Jan 2025 12:22:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737836520; x=1738441320; 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=NF6nYo6PmdHspoYaUIJy2S+N0nkXl/E+tRZY14NRgX0=; b=CEA4trXHm3dO/b1g+BJpUJDwRk2hpCnQl5ZRSFnQ5vG1UJ9JK++Q1IjNQQxgGZ2dC9 HPLk1y3U20VfklUcF/unpjS9FwkSXBqLVM7MleSpSg+kyGHN/HnuWxUw/FtsQ3eMTa9c 5KbnbpIuXkjtTbjMCj1sDzOYyZEGd+tNH0SaQK7AURV1h1JVKB39sBxNQGIp63qJmWbK CXJlzdQolQP2n8nnfD1XdAniplgEYr7MZhOry379kmggqvo7uCUdjVe0j/wa32iqRKjU d8/M0VEnFooPcevliWCD4RctiC9sQTfwpnRFWTkvd97v3jMIrRlqgjFUpDsZVamTGCpP UHvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737836520; x=1738441320; 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=NF6nYo6PmdHspoYaUIJy2S+N0nkXl/E+tRZY14NRgX0=; b=bUTrdQSCJcQjnaGX9bOKMqcVuACaDkXZcCBVPOw8KIz0ZAztSZ8h+ewM4iNrcfPZM0 cVfGCzbQ8Og355DYASeuMZ5pikjsyb10Xro9D7bLLCSa7m5Tc0WznXDDZ1cHac2tSiX8 gzaLPOd0TBvPKK/BQsbccRbPHuqVzof4yTXZhuzTVPLAHHo+v7EAS01pLc18/rOLUk+B 2Nk6hypXmKHmzO17liz7HuyKVJk1DL6UnjYJnfrtEXitDBEkZFC8+ALzogqIOUng7Y72 beJ95IrMFvEoIfealnXAyfDl5KKoqVULgdpnbM1VefUhit54by62+EmyNvLGsYSWWyQV f9pw== X-Gm-Message-State: AOJu0YwsgL6hTmz187GNRoUXIIoyxJCiFGiN/Ki2vtcdMam95Ktwa9Ik R5vCkkr4RdBvazsVdbjxSccJUmAk7Wi3qyrPXRqQp7xkyshTnFTy7Wtd5g== X-Gm-Gg: ASbGnctvo08ZKchtvh+RF+XGLvopw3OBT36h7W82GGEnhaWIyQEnmfYXWPJIz/VCmAa S8UaIZDQV0J607KjWvomqhlAbH6pGPF1SvJpMQPpUUuxUcQy/2LPVwPLqJ3Og4NQ0ftR2LqeqcM HyzbVVgJ/1ebhC8mVjvTcz1GoaAJ+KAzmtfDypf6tK3L3bLY2fPqPz6hn58wJwZqsyfzC8uhE9b KCmb1Uv/Y4ynuGfoUPyVk8ySTOfAnMU9r/69/ASUmL1AmutnV4TrTq188+qG7K7Q2NviDslhHya Icxu4w2kklNAUx4lSTgpzA== X-Google-Smtp-Source: AGHT+IHdUvu6FQZ/auh8oyGIeOpFT6VMiSikUHxTCmJ0c8LLLcNJVk3n5MuGjHi9LFQgl4GF80roRg== X-Received: by 2002:a17:903:186:b0:216:42fd:79d2 with SMTP id d9443c01a7336-21c35609484mr552935145ad.49.1737836519698; Sat, 25 Jan 2025 12:21:59 -0800 (PST) Received: from localhost.localdomain ([2800:2121:b040:c:f188:b333:21cc:e83f]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21da3ea396asm36155335ad.91.2025.01.25.12.21.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Jan 2025 12:21:58 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Jan 2025 17:21:30 -0300 Message-ID: <20250125202143.12126-2-jamrial@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250125202143.12126-1-jamrial@gmail.com> References: <20250125202143.12126-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/14] avutil/frame: 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 b071971c9d..5770be0639 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_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_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_FRAME_DATA_DOWNMIX_INFO] = { .p = { "Metadata relevant to a downmix procedure" } }, + [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".