From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id D3DB84CDA9
for <ffmpegdev@gitmailbox.com>; Mon, 14 Apr 2025 11:05:38 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C7F0C687BEB;
Mon, 14 Apr 2025 14:05:24 +0300 (EEST)
Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net
[217.70.183.198])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6158F687BC5
for <ffmpeg-devel@ffmpeg.org>; Mon, 14 Apr 2025 14:05:18 +0300 (EEST)
Received: by mail.gandi.net (Postfix) with ESMTPSA id A662443974
for <ffmpeg-devel@ffmpeg.org>; Mon, 14 Apr 2025 11:05:17 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc;
s=gm1; t=1744628717;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=PLKjF2I4HqsUdz4enENFs35jBLbSVx9MvlKEZX4593Q=;
b=FLTll99e+LQre1ukroUpZFc8qsLSqafVsLjJSmBltzd92cywpNIteXpLLKc6pJ9ghyxBZP
/NsXkQeZ5/BZSOpxcsJB3sZkaPX4/qoiTQOIpW3k1VKH+tWcFw4GtnABsS69R/PKJQahEc
Pew45Puu6EAACfaZgRtBq4sfqSkXByFzQvCeyUbGPyhh0LHURZjbV2+P37n9G5D4bc0Y9Q
jsdHRsgxlwO0QVf18dNB03Ekf6D8Ty8XlDqsRxCFzgxm5lmePrwtuARxvLryGlNxQa53cS
QDzTt//mQsft7dwwJaVGJb4eJVP4BAm7RENW7zpRXkBNvlH/vDhcn6x/xCBsbg==
From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Date: Mon, 14 Apr 2025 13:05:14 +0200
Message-ID: <20250414110515.893360-2-michael@niedermayer.cc>
X-Mailer: git-send-email 2.49.0
In-Reply-To: <20250414110515.893360-1-michael@niedermayer.cc>
References: <20250414110515.893360-1-michael@niedermayer.cc>
MIME-Version: 1.0
X-GND-State: clean
X-GND-Score: -70
X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvvddtfeelucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuifetpfffkfdpucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenfghrlhcuvffnffculdeftddmnecujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefoihgthhgrvghlucfpihgvuggvrhhmrgihvghruceomhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtqeenucggtffrrghtthgvrhhnpedvgfefudeijeetieejkefgfffhtdeludeuffdvfeelieevjeetvedufeetfeejfeenucfkphepgedurdeiiedrieejrdduudefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepgedurdeiiedrieejrdduudefpdhhvghloheplhhotggrlhhhohhsthdpmhgrihhlfhhrohhmpehmihgthhgrvghlsehnihgvuggvrhhmrgihvghrrdgttgdpnhgspghrtghpthhtohepuddprhgtphhtthhopehffhhmphgvghdquggvvhgvlhesfhhfmhhpvghgrdhorhhg
X-GND-Sasl: michael@niedermayer.cc
Subject: [FFmpeg-devel] [PATCH 2/3] avutil/tree: Add av_tree_move
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20250414110515.893360-2-michael@niedermayer.cc/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
This will allow storing a tree in a flat array and reallocating it
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
libavutil/tree.c | 15 +++++++++++++++
libavutil/tree.h | 11 +++++++++++
2 files changed, 26 insertions(+)
diff --git a/libavutil/tree.c b/libavutil/tree.c
index a084ecab08c..4aaaa4f7af3 100644
--- a/libavutil/tree.c
+++ b/libavutil/tree.c
@@ -189,3 +189,18 @@ void av_tree_enumerate(AVTreeNode *t, void *opaque,
av_tree_enumerate(t->child[1], opaque, cmp, enu);
}
}
+
+void av_tree_move(struct AVTreeNode *t, struct AVTreeNode *old, void *elem, void *old_elem)
+{
+ if (t->child[0]) {
+ av_tree_move(t->child[0] - old + t, t->child[0], elem, old_elem);
+ t->child[0] = t->child[0] - old + t;
+ }
+ if (t->child[1]) {
+ av_tree_move(t->child[1] - old + t, t->child[1], elem, old_elem);
+ t->child[1] = t->child[1] - old + t;
+ }
+
+ if (t->elem && elem != old_elem)
+ t->elem = (uint8_t*)t->elem - (uint8_t*)old_elem + (uint8_t*)elem;
+}
diff --git a/libavutil/tree.h b/libavutil/tree.h
index 6bafd47e593..10895e39578 100644
--- a/libavutil/tree.h
+++ b/libavutil/tree.h
@@ -136,6 +136,17 @@ void av_tree_enumerate(struct AVTreeNode *t, void *opaque,
int (*cmp)(void *opaque, void *elem),
int (*enu)(void *opaque, void *elem));
+/**
+ * Updates the tree in case the tree has been moved.
+ * This is needed for example when all tree nodes are in an array that is reallocated
+ *
+ * @param root the root of the tree to update
+ * @param old the old root on which internal pointers are still based
+ * @param elem the array that contains all elements after the move
+ * @param old the old element array
+ */
+void av_tree_move(struct AVTreeNode *root, struct AVTreeNode *old, void *elem, void *old_elem);
+
/**
* @}
*/
--
2.49.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".