hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-30 12:44:07 +00:00
Code Issues Actions Projects Releases Wiki Activity

Fixed intra block selection (always selected 64x64 which was not in search)

Browse source
This commit is contained in:
Marko Viitanen 2013-10-08 12:13:52 +03:00
parent 13bbd2fb37
commit 351817d008
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/search.c
View file

@ -444,11 +444,12 @@ uint32_t search_best_mode(encoder_control *encoder,
cost += search_best_mode(encoder, x_ctb + change, y_ctb + change, depth + 1); cost += search_best_mode(encoder, x_ctb + change, y_ctb + change, depth + 1);
// We split if the cost is better (0 cost -> not checked) // We split if the cost is better (0 cost -> not checked)
if (cost != 0 if ( (encoder->in.cur_pic->slicetype == SLICE_I && depth < MIN_INTRA_SEARCH_DEPTH) ||
(cost != 0
&& (best_intra_cost != 0 && cost + lambdaCost < best_intra_cost) && (best_intra_cost != 0 && cost + lambdaCost < best_intra_cost)
&& (best_inter_cost != 0 && (best_inter_cost != 0
&& cost + lambdaCost < best_inter_cost && cost + lambdaCost < best_inter_cost
&& encoder->in.cur_pic->slicetype != SLICE_I)) && encoder->in.cur_pic->slicetype != SLICE_I)))
{ {
// Set split to 1 // Set split to 1
best_cost = cost + lambdaCost; best_cost = cost + lambdaCost;