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 E97044CC9B for ; Sat, 25 Jan 2025 20:23:45 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 17A2168B9EE; Sat, 25 Jan 2025 22:22:21 +0200 (EET) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1C6C768B8D7 for ; Sat, 25 Jan 2025 22:22:09 +0200 (EET) Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2166360285dso55037525ad.1 for ; Sat, 25 Jan 2025 12:22:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737836527; x=1738441327; 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=qKEiXZN+do1X8BFrMIt75AHKWVPmnQZ2eK8a2p/pUKI=; b=ko0FuvgHqGepGZEPliom8BsrNdkhjBqfARFAbNFr9qeK8iRta+yo3yFM2SHm51sqmk 8ZhnGzMZBosDEPOVFysrFBdqTHhpawyRMh/SZRfeijXpQZh7k1Ya2Nnt27DRGXfzWAL6 SBlCM0zQnmfZLLVf3h7cbhbbqvlSUQ7rXyNrAps9gmKCUgMmMAULZrglx+KiMXYy4Nsh t9qHht6Gpt2yF2PiyxRudRaINDlOmse0WqS4pUO+rEcLVDxw2P5r+z0cbKN/lJ9YEsV1 rqNHoiU3g2L1tTZF7hiDX2EI5PH68Si86K8QeTqkCq5vLl6ZlBe4qACPKqP8w3G1EEfU nwKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737836527; x=1738441327; 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=qKEiXZN+do1X8BFrMIt75AHKWVPmnQZ2eK8a2p/pUKI=; b=Jxl93jd9RcE4LIoJrOlu+TaIcaxE5hEpWg0iDqwdoJUvhTXqWEtvl0GNkSKWWq2kSS CD93kyWS5uzcniOvKb8MrOGX83vXJJrH/8u2sBwgmlv34hlCe83m6lnfQFQgXn3fIKoT 3C1t64/ZCPLVE6uMewwuhWIwqSfmNnM/XiIOIZNhG5Vt/062c0UyEEQKcAG4aJIGBiGP xaShq0/Gg8rygTkhPTgCcNWTcBVbjF2YYeFrDQ4nsBHxtuZcQaE2DgJzFB0Kv3nRh9KJ Y2IqwAfrdiEFAAt/bL2Fik5DXKB6roh/7MwxProi9HkHvQzRUoQIfxx1R6bKY1R8FkCd X3hg== X-Gm-Message-State: AOJu0YxW4HVtOdhq7Jss+3Fi7SftwafAfTHnQVbD8cDCLG/ih1v6iTGE Rarjj1oZahc9bxiJWmBiztHZS2gxElVa8BeC0fXV7gXweUrJ85BGLdA08Q== X-Gm-Gg: ASbGncuOYeHUQus6K3IWss2UMBa+8tSQ9za7wmMTFH9xgrbqAekNeLXitzf8Fo5VQCK 4eRYwi8TaUKEirCct5OqjTEq8yMqk2dRX6sNj321of+r64dq5TSPl0skevAkjp9sIxAye+7Nprq qIJfnFSIPFKqfLqflTHqSf5DtYQ5XJqOaG4mYiPGynZ9z7gc7Qq7fVWi7CQVVcnRZ3SadLd4w90 l7+plidFPeIHseKZpdWqNJQivc9takLZhk5MfttY7RFlq/r0KqntIDiIXmC2Ceh8kQtlf5LOVdg MHtW+oFnowqapZ1KjotSNA== X-Google-Smtp-Source: AGHT+IHJ/iIXSW/B92dd2rH1qZ/6MUQY+K5g1+j71E2E7FRZtxkW8/czCEVO552cmLEOPPoOo0tXxQ== X-Received: by 2002:a17:903:32cb:b0:215:54a1:8584 with SMTP id d9443c01a7336-21c35503ae9mr534442395ad.17.1737836526952; Sat, 25 Jan 2025 12:22:06 -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.22.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Jan 2025 12:22:06 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Jan 2025 17:21:35 -0300 Message-ID: <20250125202143.12126-7-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 07/14] avutil/frame: add support for RefStruct as backing for 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: With this, complex structs can be used as side data entries. Signed-off-by: James Almer --- libavutil/frame.c | 7 +- libavutil/side_data.c | 209 +++++++++++++++++++++++++++++++++++++++++- libavutil/side_data.h | 3 + 3 files changed, 210 insertions(+), 9 deletions(-) diff --git a/libavutil/frame.c b/libavutil/frame.c index 70a3b59123..05138a4919 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -281,13 +281,12 @@ FF_ENABLE_DEPRECATION_WARNINGS && (src->width != dst->width || src->height != dst->height)) continue; if (force_copy) { - sd_dst = av_frame_new_side_data(dst, sd_src->type, - sd_src->size); + sd_dst = ff_frame_side_data_copy(&dst->side_data, &dst->nb_side_data, + sd_src); if (!sd_dst) { av_frame_side_data_free(&dst->side_data, &dst->nb_side_data); return AVERROR(ENOMEM); } - memcpy(sd_dst->data, sd_src->data, sd_src->size); } else { AVBufferRef *ref = av_buffer_ref(sd_src->buf); sd_dst = av_frame_new_side_data_from_buf(dst, sd_src->type, ref); @@ -296,8 +295,8 @@ FF_ENABLE_DEPRECATION_WARNINGS av_frame_side_data_free(&dst->side_data, &dst->nb_side_data); return AVERROR(ENOMEM); } + av_dict_copy(&sd_dst->metadata, sd_src->metadata, 0); } - av_dict_copy(&sd_dst->metadata, sd_src->metadata, 0); } ret = av_buffer_replace(&dst->opaque_ref, src->opaque_ref); diff --git a/libavutil/side_data.c b/libavutil/side_data.c index 671dcecb82..597228baf1 100644 --- a/libavutil/side_data.c +++ b/libavutil/side_data.c @@ -43,12 +43,22 @@ typedef struct FFFrameSideData { #if FF_API_SIDE_DATA_BUF == 0 AVBufferRef *buf; #endif + void *refstruct; } FFFrameSideData; +enum FFSideDataProps { + FF_SIDE_DATA_PROP_REFSTRUCT = (1 << 0), +}; + typedef struct FFSideDataDescriptor { AVSideDataDescriptor p; + + unsigned props; + void (*init)(void *obj); + int (*copy)(void *dst, const void *src); + void (*uninit)(AVRefStructOpaque opaque, void *obj); size_t size; } FFSideDataDescriptor; @@ -141,6 +151,7 @@ FF_ENABLE_DEPRECATION_WARNINGS #else av_buffer_unref(&sdp->buf); #endif + av_refstruct_unref(&sdp->refstruct); av_dict_free(&sd->metadata); av_freep(ptr_sd); } @@ -208,6 +219,8 @@ static AVFrameSideData *add_side_data_from_buf_ext(AVFrameSideData ***sd, AVBufferRef *buf, uint8_t *data, size_t size) { + const AVSideDataDescriptor *desc = av_frame_side_data_desc(type); + const FFSideDataDescriptor *dp = dp_from_desc(desc); FFFrameSideData *sdp; AVFrameSideData *ret, **tmp; @@ -215,6 +228,9 @@ static AVFrameSideData *add_side_data_from_buf_ext(AVFrameSideData ***sd, if ((unsigned)*nb_sd >= FFMIN(INT_MAX, SIZE_MAX)) return NULL; + if (dp && (dp->props & FF_SIDE_DATA_PROP_REFSTRUCT)) + return NULL; + tmp = av_realloc_array(*sd, sizeof(**sd), *nb_sd + 1); if (!tmp) return NULL; @@ -255,9 +271,15 @@ AVFrameSideData *ff_frame_side_data_add_from_buf(AVFrameSideData ***sd, static AVFrameSideData *replace_side_data_from_buf(AVFrameSideData *dst, AVBufferRef *buf, int flags) { + const AVSideDataDescriptor *desc = av_frame_side_data_desc(dst->type); + const FFSideDataDescriptor *dp = dp_from_desc(desc); + if (!(flags & AV_FRAME_SIDE_DATA_FLAG_REPLACE)) return NULL; + if (dp && (dp->props & FF_SIDE_DATA_PROP_REFSTRUCT)) + return NULL; + av_dict_free(&dst->metadata); #if FF_API_SIDE_DATA_BUF FF_DISABLE_DEPRECATION_WARNINGS @@ -323,6 +345,64 @@ AVFrameSideData *av_frame_side_data_add(AVFrameSideData ***sd, int *nb_sd, return sd_dst; } +static AVFrameSideData *add_side_data_from_refstruct(AVFrameSideData ***sd, + int *nb_sd, + enum AVFrameSideDataType type, + void *obj, size_t size) +{ + const AVSideDataDescriptor *desc = av_frame_side_data_desc(type); + const FFSideDataDescriptor *dp = dp_from_desc(desc); + FFFrameSideData *sdp; + AVFrameSideData *ret, **tmp; + + // *nb_sd + 1 needs to fit into an int and a size_t. + if ((unsigned)*nb_sd >= FFMIN(INT_MAX, SIZE_MAX)) + return NULL; + + if (dp && (dp->props & FF_SIDE_DATA_PROP_REFSTRUCT)) + return NULL; + + tmp = av_realloc_array(*sd, sizeof(**sd), *nb_sd + 1); + if (!tmp) + return NULL; + *sd = tmp; + + sdp = av_mallocz(sizeof(*sdp)); + if (!sdp) + return NULL; + + sdp->refstruct = obj; + ret = &sdp->p; + ret->data = obj; + ret->size = size; + ret->type = type; + + (*sd)[(*nb_sd)++] = ret; + + return ret; +} + +static AVFrameSideData *replace_side_data_from_refstruct(AVFrameSideData *sd, + void *obj, size_t size, int flags) +{ + FFFrameSideData *sdp = sdp_from_sd(sd); + + if (!(flags & AV_FRAME_SIDE_DATA_FLAG_REPLACE)) + return NULL; + + av_dict_free(&sd->metadata); +#if FF_API_SIDE_DATA_BUF +FF_DISABLE_DEPRECATION_WARNINGS + av_buffer_unref(&sd->buf); +FF_ENABLE_DEPRECATION_WARNINGS +#endif + av_refstruct_unref(&sdp->refstruct); + sdp->refstruct = obj; + sd->data = obj; + sd->size = size; + return sd; +} + AVFrameSideData *av_frame_side_data_new_struct(AVFrameSideData ***sd, int *nb_sd, enum AVFrameSideDataType type, unsigned int flags) @@ -330,36 +410,110 @@ AVFrameSideData *av_frame_side_data_new_struct(AVFrameSideData ***sd, int *nb_sd const AVSideDataDescriptor *desc = av_frame_side_data_desc(type); const FFSideDataDescriptor *dp = dp_from_desc(desc); AVFrameSideData *ret; + void *obj; if (!desc || !(desc->props & AV_SIDE_DATA_PROP_STRUCT)) return NULL; av_assert0(dp->size); + + if (!(dp->props & FF_SIDE_DATA_PROP_REFSTRUCT)) { ret = av_frame_side_data_new(sd, nb_sd, type, dp->size, flags); if (ret && dp->init) dp->init(ret->data); return ret; + } + + if (!(obj = av_refstruct_alloc_ext(dp->size, 0, NULL, dp->uninit))) + return NULL; + if (flags & AV_FRAME_SIDE_DATA_FLAG_UNIQUE) + av_frame_side_data_remove(sd, nb_sd, type); + if ((!desc || !(desc->props & AV_SIDE_DATA_PROP_MULTI)) && + (ret = (AVFrameSideData *)av_frame_side_data_get(*sd, *nb_sd, type))) { + ret = replace_side_data_from_refstruct(ret, obj, dp->size, flags); + if (!ret) + av_refstruct_unref(&obj); + return ret; + } + + ret = add_side_data_from_refstruct(sd, nb_sd, type, obj, dp->size); + if (!ret) + av_refstruct_unref(&obj); + + return ret; +} + +AVFrameSideData *ff_frame_side_data_copy(AVFrameSideData ***sd, int *nb_sd, + const AVFrameSideData *src) +{ + const AVSideDataDescriptor *desc; + const FFSideDataDescriptor *dp; + const FFFrameSideData *srcp = csdp_from_sd(src); + AVBufferRef *buf = NULL; + AVFrameSideData *sd_dst = NULL; + void *obj = NULL; + int ret = AVERROR_BUG; + + if (!sd || !src || !nb_sd || (*nb_sd && !*sd)) + return NULL; + + desc = av_frame_side_data_desc(src->type); + dp = dp_from_desc(desc); + + if (dp && (dp->props & FF_SIDE_DATA_PROP_REFSTRUCT)) { + obj = av_refstruct_alloc_ext(dp->size, 0, NULL, dp->uninit); + if (!obj || dp->copy(obj, srcp->refstruct) < 0) { + av_refstruct_unref(&obj); + return NULL; + } + sd_dst = add_side_data_from_refstruct(sd, nb_sd, src->type, obj, + dp->size); + } else { + buf = av_buffer_alloc(src->size); + if (!buf) + return NULL; + memcpy(buf->data, src->data, src->size); + sd_dst = ff_frame_side_data_add_from_buf(sd, nb_sd, src->type, buf); + } + if (!sd_dst) { + av_buffer_unref(&buf); + av_refstruct_unref(&obj); + return NULL; + } + + ret = av_dict_copy(&sd_dst->metadata, src->metadata, 0); + if (ret < 0) { + remove_side_data_by_entry(sd, nb_sd, sd_dst); + return NULL; + } + + return sd_dst; } int av_frame_side_data_clone(AVFrameSideData ***sd, int *nb_sd, const AVFrameSideData *src, unsigned int flags) { const AVSideDataDescriptor *desc; + const FFSideDataDescriptor *dp; const FFFrameSideData *srcp = csdp_from_sd(src); AVBufferRef *buf = NULL; AVFrameSideData *sd_dst = NULL; + void *obj = NULL; int ret = AVERROR_BUG; if (!sd || !src || !nb_sd || (*nb_sd && !*sd)) return AVERROR(EINVAL); desc = av_frame_side_data_desc(src->type); + dp = dp_from_desc(desc); if (flags & AV_FRAME_SIDE_DATA_FLAG_UNIQUE) av_frame_side_data_remove(sd, nb_sd, src->type); if ((!desc || !(desc->props & AV_SIDE_DATA_PROP_MULTI)) && (sd_dst = (AVFrameSideData *)av_frame_side_data_get(*sd, *nb_sd, src->type))) { FFFrameSideData *dstp = sdp_from_sd(sd_dst); AVDictionary *dict = NULL; + uint8_t *data; + size_t size; if (!(flags & AV_FRAME_SIDE_DATA_FLAG_REPLACE)) return AVERROR(EEXIST); @@ -368,6 +522,11 @@ int av_frame_side_data_clone(AVFrameSideData ***sd, int *nb_sd, if (ret < 0) return ret; + if (dp && (dp->props & FF_SIDE_DATA_PROP_REFSTRUCT)) { + av_refstruct_replace(&dstp->refstruct, srcp->refstruct); + data = dstp->refstruct; + size = dp->size; + } else { #if FF_API_SIDE_DATA_BUF FF_DISABLE_DEPRECATION_WARNINGS ret = av_buffer_replace(&sd_dst->buf, src->buf); @@ -375,6 +534,9 @@ FF_ENABLE_DEPRECATION_WARNINGS #else ret = av_buffer_replace(&dstp->buf, srcp->buf); #endif + data = src->data; + size = src->size; + } if (ret < 0) { av_dict_free(&dict); return ret; @@ -382,11 +544,16 @@ FF_ENABLE_DEPRECATION_WARNINGS av_dict_free(&sd_dst->metadata); sd_dst->metadata = dict; - sd_dst->data = src->data; - sd_dst->size = src->size; + sd_dst->data = data; + sd_dst->size = size; return 0; } + if (dp && (dp->props & FF_SIDE_DATA_PROP_REFSTRUCT)) { + obj = av_refstruct_ref(srcp->refstruct); + sd_dst = add_side_data_from_refstruct(sd, nb_sd, src->type, obj, + dp->size); + } else { #if FF_API_SIDE_DATA_BUF FF_DISABLE_DEPRECATION_WARNINGS buf = av_buffer_ref(src->buf); @@ -399,8 +566,10 @@ FF_ENABLE_DEPRECATION_WARNINGS sd_dst = add_side_data_from_buf_ext(sd, nb_sd, src->type, buf, src->data, src->size); + } if (!sd_dst) { av_buffer_unref(&buf); + av_refstruct_unref(&obj); return AVERROR(ENOMEM); } @@ -426,20 +595,46 @@ const AVFrameSideData *av_frame_side_data_get_c(const AVFrameSideData * const *s int av_frame_side_data_is_writable(const AVFrameSideData *sd) { + const AVSideDataDescriptor *desc = av_frame_side_data_desc(sd->type); + const FFSideDataDescriptor *dp = dp_from_desc(desc); + const FFFrameSideData *sdp = csdp_from_sd(sd); + + if (dp && (dp->props & FF_SIDE_DATA_PROP_REFSTRUCT)) { + return av_refstruct_exclusive(sdp->refstruct); + } else { #if FF_API_SIDE_DATA_BUF FF_DISABLE_DEPRECATION_WARNINGS return !!av_buffer_is_writable(sd->buf); #else - const FFFrameSideData *sdp = csdp_from_sd(sd); return !!av_buffer_is_writable(sdp->buf); #endif + } } int av_frame_side_data_make_writable(AVFrameSideData *sd) { + const AVSideDataDescriptor *desc = av_frame_side_data_desc(sd->type); + const FFSideDataDescriptor *dp = dp_from_desc(desc); FFFrameSideData *sdp = sdp_from_sd(sd); AVBufferRef *buf = NULL; - + void *obj = NULL; + uint8_t *data; + + if (dp && (dp->props & FF_SIDE_DATA_PROP_REFSTRUCT)) { + void *obj; + int ret; + if (av_refstruct_exclusive(sdp->refstruct)) + return 0; + obj = av_refstruct_alloc_ext(dp->size, 0, NULL, dp->uninit); + if (!obj) + return AVERROR(ENOMEM); + ret = dp->copy(obj, sdp->refstruct); + if (ret < 0) { + av_refstruct_unref(&obj); + return ret; + } + data = obj; + } else { #if FF_API_SIDE_DATA_BUF FF_DISABLE_DEPRECATION_WARNINGS if (av_buffer_is_writable(sd->buf)) @@ -455,6 +650,8 @@ FF_ENABLE_DEPRECATION_WARNINGS if (sd->size) memcpy(buf->data, sd->data, sd->size); + data = buf->data; + } #if FF_API_SIDE_DATA_BUF FF_DISABLE_DEPRECATION_WARNINGS av_buffer_unref(&sd->buf); @@ -464,7 +661,9 @@ FF_ENABLE_DEPRECATION_WARNINGS av_buffer_unref(&sdp->buf); sdp->buf = buf; #endif - sd->data = buf->data; + av_refstruct_unref(&sdp->refstruct); + sdp->refstruct = obj; + sd->data = data; return 0; } diff --git a/libavutil/side_data.h b/libavutil/side_data.h index 5d25833882..5a3aeccab0 100644 --- a/libavutil/side_data.h +++ b/libavutil/side_data.h @@ -27,6 +27,9 @@ AVFrameSideData *ff_frame_side_data_add_from_buf(AVFrameSideData ***sd, enum AVFrameSideDataType type, AVBufferRef *buf); +AVFrameSideData *ff_frame_side_data_copy(AVFrameSideData ***sd, int *nb_sd, + const AVFrameSideData *src); + void ff_mdm_get_defaults(void *obj); void ff_ave_get_defaults(void *obj); void ff_spherical_get_defaults(void *obj); -- 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".