From patchwork Wed Mar 27 19:10:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 47547 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp842843pzb; Wed, 27 Mar 2024 12:11:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVgkHVmTKJcjoZqxm/Pq3yKrMeMGzhpp4UeJghSbAxSPllDAMeR7ziwuCycDGD1yQKgNFsrq7wuHoIi06003VEdd0eUp2XTeVQySg== X-Google-Smtp-Source: AGHT+IG/8dbtRR/i6WKLlM319hOfhYHGYPue83hZt+2F+XdtLCTutqj4b89SjVmrJWq5LJ4I7nxB X-Received: by 2002:a17:906:b112:b0:a47:1fe8:9825 with SMTP id u18-20020a170906b11200b00a471fe89825mr280287ejy.32.1711566673491; Wed, 27 Mar 2024 12:11:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711566673; cv=none; d=google.com; s=arc-20160816; b=C7NJkVk616pXD+sXDLvUcVEmWB6zQqsOGFusE5k6pCB2vYmV2YDf/CRdmRwUQwJp8J Rmq22W0HftaMvIKCZRurrLt1/pzagR9TE/9EsPFeQtOcu42yLwV7pmu+QHn2M54pVMGX l8+wMbbX4xXk4YGxrUgVbMS9ue6i+mCsCpbhvYC8KvE3CiuHH9a7DWFXQNgKM1AN5VT7 gjQyog+bkpAjRkF4tXLNwUhFbom1Qbq+bzbPFZlsnI5oIcRbG1RD+LCtBVXy48mMJWDi AcwnlwlBa5E7olD1tNxqEpc2kcUWO0+f5cQ/gKXWTeXtlG+JYEw/S7nHrMBlPV3vwS+6 kE7w== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=CWfXUnBkn9umJ08FWMSGEo39rmfGK1RkJ8ejZa7SB0o=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=lAXvuDo6lVHy27KIaxre+A0wwOxOaFHqucN1/hUuPxKN+RSgOcnYGU/CTOHGPfF+78 BezG7vugrtkFXCec/jMWeO+vvlcdVB9emlUJy4oNVET2taZ4/4jJekTQg0ohNJ0Tx0BW vK/VhMiHqExfnuOigKhOfn/vOPOcCp3WKOjgvHEoUmg7mSuUmtjeOMru7Ruq0furUG58 QndWDF4ckBW0DYF6BhjXdOMVW6pZndqIMdR5LYdtNlnk50N+VhdRrY4K+QqmZriJ9qhP vAi23Ha5ZkxRLRCk8VN0b59sw1W5c+EToLGuHtW+ihbivAjTf8YM4JNe2JkJNmuiJdCz jrjg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=io9Zm9S6; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m3-20020a170906720300b00a46b9fdb7a4si4939924ejk.296.2024.03.27.12.11.13; Wed, 27 Mar 2024 12:11:13 -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=@gmail.com header.s=20230601 header.b=io9Zm9S6; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 266C368D69F; Wed, 27 Mar 2024 21:11:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2038B68D45E for ; Wed, 27 Mar 2024 21:11:04 +0200 (EET) Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-1dddbe47ac1so8675385ad.1 for ; Wed, 27 Mar 2024 12:11:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711566661; x=1712171461; 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=wLPSvQDRrew/DuhyUqnGO47c652VfmvuZtoWnm58gzc=; b=io9Zm9S6xeqNRGuL+ldYMiiXG0yjbVvPYoxntpZBQ+S5fNR611pZ1OAu5AbIGzq580 zpAEHCLLH3paj+0dQbFh+iMC0AfUm+0I3cc3pDwyXskKoqNPk85rEJpcAjqK1RBjv+k5 tZTskBiQfPdTkw0j2ePDAm2fjlqD8VuopgGte9YdmILHX46dRUw6Mw6dr7O1YP9oYphA 8I8GyzP7c7eAxPKgDtOhlm45UFzvDFUI55eoCg4PRfYmO6tp06s9yDqDHOrHKhiH9qEq dG4eJXRDA5Tu/xVTIMYabWzZilkb3QwF0/N4McNb4F7Wm4wRHlBxNRV3ubLrpv6povNG 2hDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711566661; x=1712171461; 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=wLPSvQDRrew/DuhyUqnGO47c652VfmvuZtoWnm58gzc=; b=od/4tTiItIIXVKZ/xl4BjZDrLs5/opze0dlRRjcwjfHb//WujM0GsWI3nMHt/epECb ZplmjIHMbKZ1bLYCIydAfWEtb+9PJ/UK7Xo3dsasyTWJaGwHUV4imMi0lIrsZz7M1rmr l6nnUre6vHJHC652zC5RmWGWusixxAtPiI/KWWyswpA4CswPCvBzNuz71SbqWme4b9El s5zIVAnxS/UrxFF5LrnbzN6fJ1Gxlvyn9aqLVf51SEI+SZk1RmtagQa3VPQZENgQtHVu roQrvuuULh+xksig3iKMrkYnUGNch3yrUTP7LGFrcBTztrj0jCBRTA3zsuWsMJ6+BazI 1DOw== X-Gm-Message-State: AOJu0Ywjs6MTAp0fc+oMK9GBq7XTYv9vceqH42aSKx/gAfXRaTYF+UqF khFK6yxzNB8gnNtWfgjn8yUchMXt26DwYa4LtYjSAeh/fEJGMYodUOjQmjtv X-Received: by 2002:a17:902:7686:b0:1de:f571:837c with SMTP id m6-20020a170902768600b001def571837cmr181676pll.28.1711566660420; Wed, 27 Mar 2024 12:11:00 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id a10-20020a170902900a00b001dca3a65200sm9421318plp.228.2024.03.27.12.10.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Mar 2024 12:10:59 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Mar 2024 16:10:43 -0300 Message-ID: <20240327191043.5006-1-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <171152675176.7287.1643281874746299286@lain.khirnov.net> References: <171152675176.7287.1643281874746299286@lain.khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/6 v3] avutil/frame: add a flag to allow overwritting existing entries 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: ItUy7kVxTfln Signed-off-by: James Almer --- libavutil/frame.c | 59 +++++++++++++++++++++++++++++++++++++++++++---- libavutil/frame.h | 27 +++++++++++++++------- 2 files changed, 74 insertions(+), 12 deletions(-) diff --git a/libavutil/frame.c b/libavutil/frame.c index ef1613c344..2e40018b83 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -799,12 +799,34 @@ AVFrameSideData *av_frame_side_data_new(AVFrameSideData ***sd, int *nb_sd, enum AVFrameSideDataType type, size_t size, unsigned int flags) { - AVBufferRef *buf = av_buffer_alloc(size); + const AVSideDataDescriptor *desc = av_frame_side_data_desc(type); + AVBufferRef *buf; AVFrameSideData *ret = NULL; if (flags & AV_FRAME_SIDE_DATA_FLAG_UNIQUE) remove_side_data(sd, nb_sd, type); + if (!desc || !(desc->props & AV_SIDE_DATA_PROP_MULTI)) { + for (int i = 0; i < *nb_sd; i++) { + AVFrameSideData *entry = ((*sd)[i]); + if (entry->type != type) + continue; + if (!(flags & AV_FRAME_SIDE_DATA_FLAG_REPLACE)) + return NULL; + + buf = av_buffer_alloc(size); + if (!buf) + return NULL; + + av_buffer_unref(&entry->buf); + av_dict_free(&entry->metadata); + entry->buf = buf; + entry->data = buf->data; + entry->size = buf->size; + return 0; + } + } + buf = av_buffer_alloc(size); ret = add_side_data_from_buf(sd, nb_sd, type, buf); if (!ret) av_buffer_unref(&buf); @@ -815,6 +837,7 @@ AVFrameSideData *av_frame_side_data_new(AVFrameSideData ***sd, int *nb_sd, int av_frame_side_data_clone(AVFrameSideData ***sd, int *nb_sd, const AVFrameSideData *src, unsigned int flags) { + const AVSideDataDescriptor *desc; AVBufferRef *buf = NULL; AVFrameSideData *sd_dst = NULL; int ret = AVERROR_BUG; @@ -822,13 +845,41 @@ int av_frame_side_data_clone(AVFrameSideData ***sd, int *nb_sd, if (!sd || !src || !nb_sd || (*nb_sd && !*sd)) return AVERROR(EINVAL); + desc = av_frame_side_data_desc(src->type); + if (flags & AV_FRAME_SIDE_DATA_FLAG_UNIQUE) + remove_side_data(sd, nb_sd, src->type); + if (!desc || !(desc->props & AV_SIDE_DATA_PROP_MULTI)) { + for (int i = 0; i < *nb_sd; i++) { + AVFrameSideData *entry = ((*sd)[i]); + AVDictionary *dict = NULL; + + if (entry->type != src->type) + continue; + if (!(flags & AV_FRAME_SIDE_DATA_FLAG_REPLACE)) + return AVERROR(EEXIST); + + ret = av_dict_copy(&dict, src->metadata, 0); + if (ret < 0) + return ret; + + ret = av_buffer_replace(&entry->buf, src->buf); + if (ret < 0) { + av_dict_free(&dict); + return ret; + } + + av_dict_free(&entry->metadata); + entry->metadata = dict; + entry->data = src->data; + entry->size = src->size; + return 0; + } + } + buf = av_buffer_ref(src->buf); if (!buf) return AVERROR(ENOMEM); - if (flags & AV_FRAME_SIDE_DATA_FLAG_UNIQUE) - remove_side_data(sd, nb_sd, src->type); - sd_dst = add_side_data_from_buf(sd, nb_sd, src->type, buf); if (!sd_dst) { av_buffer_unref(&buf); diff --git a/libavutil/frame.h b/libavutil/frame.h index 3b6d746a16..2ea129888e 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -1040,7 +1040,14 @@ const AVSideDataDescriptor *av_frame_side_data_desc(enum AVFrameSideDataType typ */ void av_frame_side_data_free(AVFrameSideData ***sd, int *nb_sd); +/** + * Remove existing entries before adding new ones. + */ #define AV_FRAME_SIDE_DATA_FLAG_UNIQUE (1 << 0) +/** + * Don't add a new entry if another of the same type exists. + */ +#define AV_FRAME_SIDE_DATA_FLAG_REPLACE (1 << 1) /** * Add new side data entry to an array. @@ -1053,10 +1060,12 @@ void av_frame_side_data_free(AVFrameSideData ***sd, int *nb_sd); * @param size size of the side data * @param flags Some combination of AV_FRAME_SIDE_DATA_FLAG_* flags, or 0. * - * @return newly added side data on success, NULL on error. In case of - * AV_FRAME_SIDE_DATA_FLAG_UNIQUE being set, entries of matching - * AVFrameSideDataType will be removed before the addition is - * attempted. + * @return newly added side data on success, NULL on error. + * @note In case of AV_FRAME_SIDE_DATA_FLAG_UNIQUE being set, entries of + * matching AVFrameSideDataType will be removed before the addition + * is attempted. + * @note In case of AV_FRAME_SIDE_DATA_FLAG_REPLACE being set, if an + * entry of the same type already exists, it will be replaced instead. */ AVFrameSideData *av_frame_side_data_new(AVFrameSideData ***sd, int *nb_sd, enum AVFrameSideDataType type, @@ -1074,10 +1083,12 @@ AVFrameSideData *av_frame_side_data_new(AVFrameSideData ***sd, int *nb_sd, * for the buffer. * @param flags Some combination of AV_FRAME_SIDE_DATA_FLAG_* flags, or 0. * - * @return negative error code on failure, >=0 on success. In case of - * AV_FRAME_SIDE_DATA_FLAG_UNIQUE being set, entries of matching - * AVFrameSideDataType will be removed before the addition is - * attempted. + * @return negative error code on failure, >=0 on success. + * @note In case of AV_FRAME_SIDE_DATA_FLAG_UNIQUE being set, entries of + * matching AVFrameSideDataType will be removed before the addition + * is attempted. + * @note In case of AV_FRAME_SIDE_DATA_FLAG_REPLACE being set, if an + * entry of the same type already exists, it will be replaced instead. */ int av_frame_side_data_clone(AVFrameSideData ***sd, int *nb_sd, const AVFrameSideData *src, unsigned int flags);