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 ESMTP id 6A64B476CA for ; Mon, 18 Mar 2024 21:32:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EBBC468D3BD; Mon, 18 Mar 2024 23:32:03 +0200 (EET) Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 47C7C68D382 for ; Mon, 18 Mar 2024 23:31:53 +0200 (EET) Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-513ccc70a6dso8341514e87.1 for ; Mon, 18 Mar 2024 14:31:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710797512; x=1711402312; 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=vlScNQax89JrFM2wpwTaW/uU3QatmkF58nQr0QxgEU4=; b=ITcWEB2oWAbQL7L0x1OzHd3AGtaedqs5ZncBWPpnT5JDIOEUlMx7Qq9C2YsYjImVFN FQvvugujYX7ZrM2UGkMivKGToGpUdd4UzfP4djr3fmdd9DZ3CAXyTRpEmgYMZB40NFzJ upogJheClICpD2Wghyz6tTJz/sBo14H1b62ZhWCyeSAGPM6ve7Bs28hh/D/aFWRmKgUr Rb0GLsTgKIMP2/QCu0Q6Di83AcZvjYqTJc4wp9BHrc/UC7hJg0Ds+ntP9H7Fw+rbbeqS ffpVE+lCZocQzC+lj3UVli8WahhJ39ojqg9GGlSuFHFv21xcNxMLFqniHI+6pw3yJHut +dWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710797512; x=1711402312; 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=vlScNQax89JrFM2wpwTaW/uU3QatmkF58nQr0QxgEU4=; b=Dg9jQ21zuE5q8wlLoBHQP22+CKOzqrYedMDRPr8KaJQwygZyq+oY/r/Q9/SBOt/qpX 2NZ2YYT7M9o+G/xYvFjD+uiyhtRAyXew2jolISTK/scuH/gy1T0AEBny/5F0zzeSA5dp 1xkSHqzZSGyWQjthqc1+otnmW2ah4D357/qutPzWibShBol0XHD97lED0qHmpZvksqtx by1rwXTeb+SK6Wuxl45A4zwjICn9y+0E1ujQM1i+futR8w9q9IvzS2v6H6Eb53NAWzk6 qptHwqBVUXGyUCFSR+Uw6jCuKLiGCLON275qA+OS8V5rjK+AMAH9PyMoxIgHro1hhCTj lnqA== X-Gm-Message-State: AOJu0YyyZBplEsLA2cOQKLLsaV+1iYCoRckXuIdTgyiwWLIGZrg2ub8m iAcwa/Y6TEHIFvEARTzpDQUOuiO/GSJXf58aHJclhpWpTEnc2+tPynmDaN0S X-Google-Smtp-Source: AGHT+IEbihmdmLIpAFKGKTtzGJqdyL8R0h8pQNB/4FX0xkahRyfQoUe3J92WpqSiMGTE1CeSoIrcCQ== X-Received: by 2002:a19:5f5a:0:b0:513:bf8a:bd2e with SMTP id a26-20020a195f5a000000b00513bf8abd2emr6413987lfj.17.1710797512395; Mon, 18 Mar 2024 14:31:52 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id c13-20020a056512324d00b00514b5462dc7sm186929lfr.56.2024.03.18.14.31.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 14:31:52 -0700 (PDT) From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Mar 2024 23:31:29 +0200 Message-ID: <20240318213141.1376789-7-jeebjp@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240318213141.1376789-1-jeebjp@gmail.com> References: <20240318213141.1376789-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v10 06/14] avutil/frame: add helper for adding existing side data to array 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: --- libavutil/frame.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++ libavutil/frame.h | 20 +++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/libavutil/frame.c b/libavutil/frame.c index e4c2fa4f6a..9d3eae4bae 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -98,6 +98,23 @@ static void remove_side_data(AVFrameSideData ***sd, int *nb_side_data, } } +static void remove_side_data_by_entry(AVFrameSideData ***sd, int *nb_sd, + const AVFrameSideData *target) +{ + for (int i = *nb_sd - 1; i >= 0; i--) { + AVFrameSideData *entry = ((*sd)[i]); + if (entry != target) + continue; + + free_side_data(&entry); + + ((*sd)[i]) = ((*sd)[*nb_sd - 1]); + (*nb_sd)--; + + return; + } +} + AVFrame *av_frame_alloc(void) { AVFrame *frame = av_malloc(sizeof(*frame)); @@ -764,6 +781,38 @@ AVFrameSideData *av_frame_side_data_new(AVFrameSideData ***sd, int *nb_sd, return ret; } +int av_frame_side_data_clone(AVFrameSideData ***sd, int *nb_sd, + const AVFrameSideData *src, unsigned int flags) +{ + AVBufferRef *buf = NULL; + AVFrameSideData *sd_dst = NULL; + int ret = AVERROR_BUG; + + if (!sd || !src || !nb_sd || (*nb_sd && !*sd)) + return AVERROR(EINVAL); + + 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); + return AVERROR(ENOMEM); + } + + ret = av_dict_copy(&sd_dst->metadata, src->metadata, 0); + if (ret < 0) { + remove_side_data_by_entry(sd, nb_sd, sd_dst); + return ret; + } + + return 0; +} + AVFrameSideData *av_frame_get_side_data(const AVFrame *frame, enum AVFrameSideDataType type) { diff --git a/libavutil/frame.h b/libavutil/frame.h index 5d68d1e7af..ce93421d60 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -1021,6 +1021,26 @@ AVFrameSideData *av_frame_side_data_new(AVFrameSideData ***sd, int *nb_sd, enum AVFrameSideDataType type, size_t size, unsigned int flags); +/** + * Add a new side data entry to an array based on existing side data, taking + * a reference towards the contained AVBufferRef. + * + * @param sd pointer to array of side data to which to add another entry, + * or to NULL in order to start a new array. + * @param nb_sd pointer to an integer containing the number of entries in + * the array. + * @param src side data to be cloned, with a new reference utilized + * 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. + */ +int av_frame_side_data_clone(AVFrameSideData ***sd, int *nb_sd, + const AVFrameSideData *src, unsigned int flags); + /** * @} */ -- 2.44.0 _______________________________________________ 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".