generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move *malloc() out of tree.c, that way the code can be used with

Browse Source 
flat arrays which have lower overhead than millions of mallocd() elements.

Originally committed as revision 11399 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2008-01-04 17:52:16 +00:00
parent f1917274cc
commit 6e8b982bcc
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavutil/tree.c
View File

@@ -28,6 +28,8 @@ typedef struct AVTreeNode{
int state;
}AVTreeNode;
const int av_tree_node_size = sizeof(AVTreeNode);
void *av_tree_find(const AVTreeNode *t, void *key, int (*cmp)(void *key, const void *b), void *next[2]){
if(t){
unsigned int v= cmp(t->elem, key);
@@ -45,14 +47,14 @@ void *av_tree_find(const AVTreeNode *t, void *key, int (*cmp)(void *key, const v
return NULL;
}
void *av_tree_insert(AVTreeNode **tp, void *key, int (*cmp)(void *key, const void *b)){
void *av_tree_insert(AVTreeNode **tp, void *key, int (*cmp)(void *key, const void *b), AVTreeNode **next){
AVTreeNode *t= *tp;
if(t){
unsigned int v= cmp(t->elem, key);
if(v){
int i= v>>31;
AVTreeNode **child= &t->child[i];
void *ret= av_tree_insert(child, key, cmp);
void *ret= av_tree_insert(child, key, cmp, next);
if(!ret){
t->state -= ((int)v>>31)|1;
if(!(t->state&1)){
@@ -83,7 +85,7 @@ void *av_tree_insert(AVTreeNode **tp, void *key, int (*cmp)(void *key, const voi
return t->elem;
}
}else{
*tp= av_mallocz(sizeof(AVTreeNode));
*tp= *next; *next= NULL;
(*tp)->elem= key;
return NULL;
}