hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-27 19:24:06 +00:00
Code Issues Actions Projects Releases Wiki Activity

Fixed cu type definition and reconstruction function calling

Browse source 
reconstruction could have been called when no search was done
This commit is contained in:
Marko Viitanen 2014-02-26 17:50:09 +02:00
parent 879c355d9d
commit 8ae453551d
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/search.c
View file

@ -545,6 +545,7 @@ static int search_cu(encoder_control *encoder, int x, int y, int depth, lcu_t wo
int mode_cost = search_cu_inter(encoder, x, y, depth, work_tree[depth]); int mode_cost = search_cu_inter(encoder, x, y, depth, work_tree[depth]);
if (mode_cost < cost) { if (mode_cost < cost) {
cost = mode_cost; cost = mode_cost;
cur_cu->type = CU_INTER;
} }
} }
@ -554,15 +555,17 @@ static int search_cu(encoder_control *encoder, int x, int y, int depth, lcu_t wo
int mode_cost = search_cu_intra(encoder, x, y, depth, &work_tree[depth]); int mode_cost = search_cu_intra(encoder, x, y, depth, &work_tree[depth]);
if (mode_cost < cost) { if (mode_cost < cost) {
cost = mode_cost; cost = mode_cost;
cur_cu->type = CU_INTRA;
} }
} }
// Reconstruct best mode
if (cur_cu->type == CU_INTRA) {
intra_recon_lcu(encoder, x, y, depth,&work_tree[depth],encoder->in.cur_pic->width,encoder->in.cur_pic->height);
} else if (cur_cu->type == CU_INTER) {
// TODO
}
} }
// Reconstruct best mode
if(cur_cu->type == CU_INTRA) {
intra_recon_lcu(encoder, x, y, depth,&work_tree[depth],encoder->in.cur_pic->width,encoder->in.cur_pic->height);
} else {
// TODO
}
// Recursively split all the way to max search depth. // Recursively split all the way to max search depth.
if (depth < MAX_INTRA_SEARCH_DEPTH || depth < MAX_INTER_SEARCH_DEPTH) { if (depth < MAX_INTRA_SEARCH_DEPTH || depth < MAX_INTER_SEARCH_DEPTH) {