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

Fixed merge candidate usage by skipping weighted prediction candidate

Browse source
This commit is contained in:
Marko Viitanen 2015-03-23 15:17:41 +02:00
parent 7952f892fc
commit 2d8552d0d6
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/search.c
View file

@ -469,7 +469,8 @@ static unsigned tz_search(const encoder_state_t * const state, unsigned depth,
// both mv_cand vectors and (0, 0).
for (i = 0; i < num_cand; ++i)
{
mv.x = merge_cand[i].mv[merge_cand[i].dir-1][0] >> 2;
if (merge_cand[i].dir == 3) continue;
mv.x = merge_cand[i].mv[merge_cand[i].dir - 1][0] >> 2;
mv.y = merge_cand[i].mv[merge_cand[i].dir - 1][1] >> 2;
PERFORMANCE_MEASURE_START(_DEBUG_PERF_SEARCH_PIXELS);
@ -620,6 +621,7 @@ static unsigned hexagon_search(const encoder_state_t * const state, unsigned dep
// Select starting point from among merge candidates. These should include
// both mv_cand vectors and (0, 0).
for (i = 0; i < num_cand; ++i) {
if (merge_cand[i].dir == 3) continue;
mv.x = merge_cand[i].mv[merge_cand[i].dir - 1][0] >> 2;
mv.y = merge_cand[i].mv[merge_cand[i].dir - 1][1] >> 2;