Skip to content

F
ffmpeg.wasm-core
Commit 10db1a9b authored by Diego Biurrun's avatar Diego Biurrun
Browse files
Options

avutil/tree: K&R formatting cosmetics

parent c47037c7
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 38 deletions
libavutil/tree.c
View file @ 10db1a9b
...@@ -43,7 +43,8 @@ void *av_tree_find(const AVTreeNode *t, void *key, ...@@ -43,7 +43,8 @@ void *av_tree_find(const AVTreeNode *t, void *key,
if (t) { if (t) {
unsigned int v = cmp(key, t->elem); unsigned int v = cmp(key, t->elem);
if (v) { if (v) {
if (next) next[v >> 31] = t->elem; if (next)
next[v >> 31] = t->elem;
return av_tree_find(t->child[(v >> 31) ^ 1], key, cmp, next); return av_tree_find(t->child[(v >> 31) ^ 1], key, cmp, next);
} else { } else {
if (next) { if (next) {
...@@ -71,56 +72,60 @@ void *av_tree_insert(AVTreeNode **tp, void *key, ...@@ -71,56 +72,60 @@ void *av_tree_insert(AVTreeNode **tp, void *key,
void *next_elem[2]; void *next_elem[2];
av_tree_find(t->child[i], key, cmp, next_elem); av_tree_find(t->child[i], key, cmp, next_elem);
key = t->elem = next_elem[i]; key = t->elem = next_elem[i];
v = -i; v = -i;
} else { } else {
*next = t; *next = t;
*tp = NULL; *tp = NULL;
return NULL; return NULL;
} }
} }
ret = av_tree_insert(&t->child[v >> 31], key, cmp, next); ret = av_tree_insert(&t->child[v >> 31], key, cmp, next);
if (!ret) { if (!ret) {
int i = (v >> 31) ^ !!*next; int i = (v >> 31) ^ !!*next;
AVTreeNode **child = &t->child[i]; AVTreeNode **child = &t->child[i];
t->state += 2 * i - 1; t->state += 2 * i - 1;
if (!(t->state & 1)) { if (!(t->state & 1)) {
if (t->state) { if (t->state) {
/* The following code is equivalent to /* The following code is equivalent to
if((*child)->state*2 == -t->state) * if ((*child)->state * 2 == -t->state)
rotate(child, i^1); * rotate(child, i ^ 1);
rotate(tp, i); * rotate(tp, i);
*
with rotate(): * with rotate():
static void rotate(AVTreeNode **tp, int i) { * static void rotate(AVTreeNode **tp, int i)
AVTreeNode *t= *tp; * {
* AVTreeNode *t= *tp;
*tp= t->child[i]; *
t->child[i]= t->child[i]->child[i^1]; * *tp = t->child[i];
(*tp)->child[i^1]= t; * t->child[i] = t->child[i]->child[i ^ 1];
i= 4*t->state + 2*(*tp)->state + 12; * (*tp)->child[i ^ 1] = t;
t ->state= ((0x614586 >> i) & 3)-1; * i = 4 * t->state + 2 * (*tp)->state + 12;
(*tp)->state= ((*tp)->state>>1) + ((0x400EEA >> i) & 3)-1; * t->state = ((0x614586 >> i) & 3) - 1;
} * (*tp)->state = ((0x400EEA >> i) & 3) - 1 +
but such a rotate function is both bigger and slower * ((*tp)->state >> 1);
*/ * }
if (( *child )->state * 2 == -t->state) { * but such a rotate function is both bigger and slower
*/
if ((*child)->state * 2 == -t->state) {
*tp = (*child)->child[i ^ 1]; *tp = (*child)->child[i ^ 1];
(*child)->child[i ^ 1] = (*tp)->child[i]; (*child)->child[i ^ 1] = (*tp)->child[i];
(*tp)->child[i] = *child; (*tp)->child[i] = *child;
*child = ( *tp )->child[i ^ 1]; *child = (*tp)->child[i ^ 1];
(*tp)->child[i ^ 1] = t; (*tp)->child[i ^ 1] = t;
(*tp)->child[0]->state = -((*tp)->state > 0); (*tp)->child[0]->state = -((*tp)->state > 0);
(*tp)->child[1]->state = (*tp)->state < 0; (*tp)->child[1]->state = (*tp)->state < 0;
(*tp)->state = 0; (*tp)->state = 0;
} else { } else {
*tp = *child; *tp = *child;
*child = (*child)->child[i ^ 1]; *child = (*child)->child[i ^ 1];
(*tp)->child[i ^ 1] = t; (*tp)->child[i ^ 1] = t;
if ((*tp)->state) t->state = 0; if ((*tp)->state)
else t->state >>= 1; t->state = 0;
(*tp)->state = -t->state; else
t->state >>= 1;
(*tp)->state = -t->state;
} }
} }
} }
...@@ -174,11 +179,11 @@ static int check(AVTreeNode *t) ...@@ -174,11 +179,11 @@ static int check(AVTreeNode *t)
int left = check(t->child[0]); int left = check(t->child[0]);
int right = check(t->child[1]); int right = check(t->child[1]);
if (left>999 || right>999) if (left > 999 || right > 999)
return 1000; return 1000;
if (right - left != t->state) if (right - left != t->state)
return 1000; return 1000;
if (t->state>1 || t->state<-1) if (t->state > 1 || t->state < -1)
return 1000; return 1000;
return FFMAX(left, right) + 1; return FFMAX(left, right) + 1;
} }
...@@ -188,7 +193,8 @@ static int check(AVTreeNode *t) ...@@ -188,7 +193,8 @@ static int check(AVTreeNode *t)
static void print(AVTreeNode *t, int depth) static void print(AVTreeNode *t, int depth)
{ {
int i; int i;
for (i = 0; i < depth * 4; i++) av_log(NULL, AV_LOG_ERROR, " "); for (i = 0; i < depth * 4; i++)
av_log(NULL, AV_LOG_ERROR, " ");
if (t) { if (t) {
av_log(NULL, AV_LOG_ERROR, "Node %p %2d %p\n", t, t->state, t->elem); av_log(NULL, AV_LOG_ERROR, "Node %p %2d %p\n", t, t->state, t->elem);
print(t->child[0], depth + 1); print(t->child[0], depth + 1);
...@@ -202,7 +208,7 @@ static int cmp(void *a, const void *b) ...@@ -202,7 +208,7 @@ static int cmp(void *a, const void *b)
return (uint8_t *) a - (const uint8_t *) b; return (uint8_t *) a - (const uint8_t *) b;
} }
int main (void) int main(void)
{ {
int i; int i;
void *k; void *k;
...@@ -215,20 +221,20 @@ int main (void) ...@@ -215,20 +221,20 @@ int main (void)
int j = av_lfg_get(&prng) % 86294; int j = av_lfg_get(&prng) % 86294;
if (check(root) > 999) { if (check(root) > 999) {
av_log(NULL, AV_LOG_ERROR, "FATAL error %d\n", i); av_log(NULL, AV_LOG_ERROR, "FATAL error %d\n", i);
print(root, 0); print(root, 0);
return -1; return -1;
} }
av_log(NULL, AV_LOG_ERROR, "inserting %4d\n", j); av_log(NULL, AV_LOG_ERROR, "inserting %4d\n", j);
if (!node) if (!node)
node = av_tree_node_alloc(); node = av_tree_node_alloc();
av_tree_insert(&root, (void *) (j + 1), cmp, &node); av_tree_insert(&root, (void *)(j + 1), cmp, &node);
j = av_lfg_get(&prng) % 86294; j = av_lfg_get(&prng) % 86294;
{ {
AVTreeNode *node2 = NULL; AVTreeNode *node2 = NULL;
av_log(NULL, AV_LOG_ERROR, "removing %4d\n", j); av_log(NULL, AV_LOG_ERROR, "removing %4d\n", j);
av_tree_insert(&root, (void *) (j + 1), cmp, &node2); av_tree_insert(&root, (void *)(j + 1), cmp, &node2);
k = av_tree_find(root, (void *) (j + 1), cmp, NULL); k = av_tree_find(root, (void *)(j + 1), cmp, NULL);
if (k) if (k)
av_log(NULL, AV_LOG_ERROR, "removal failure %d\n", i); av_log(NULL, AV_LOG_ERROR, "removal failure %d\n", i);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment