diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-05-20 09:47:09 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-06-07 11:15:42 +0000 |
| commit | 189d4fd8fad9e3c776873be51938cd31a42b6177 (patch) | |
| tree | 6497caeff5e383937996768766ab3bb2081a40b2 /chromium/third_party/dav1d/libdav1d/src/refmvs.c | |
| parent | 8bc75099d364490b22f43a7ce366b366c08f4164 (diff) | |
| download | qtwebengine-chromium-189d4fd8fad9e3c776873be51938cd31a42b6177.tar.gz | |
BASELINE: Update Chromium to 90.0.4430.221
Change-Id: Iff4d9d18d2fcf1a576f3b1f453010f744a232920
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/dav1d/libdav1d/src/refmvs.c')
| -rw-r--r-- | chromium/third_party/dav1d/libdav1d/src/refmvs.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/chromium/third_party/dav1d/libdav1d/src/refmvs.c b/chromium/third_party/dav1d/libdav1d/src/refmvs.c index 1e113b4eacf..09f18dbe413 100644 --- a/chromium/third_party/dav1d/libdav1d/src/refmvs.c +++ b/chromium/third_party/dav1d/libdav1d/src/refmvs.c @@ -51,12 +51,13 @@ static void add_spatial_candidate(refmvs_candidate *const mvstack, int *const cn const mv cand_mv = ((b->mf & 1) && gmv[0].n != INVALID_MV) ? gmv[0] : b->mv.mv[n]; + *have_refmv_match = 1; + *have_newmv_match |= b->mf >> 1; + const int last = *cnt; for (int m = 0; m < last; m++) if (mvstack[m].mv.mv[0].n == cand_mv.n) { mvstack[m].weight += weight; - *have_refmv_match = 1; - *have_newmv_match |= b->mf >> 1; return; } @@ -65,8 +66,6 @@ static void add_spatial_candidate(refmvs_candidate *const mvstack, int *const cn mvstack[last].weight = weight; *cnt = last + 1; } - *have_refmv_match = 1; - *have_newmv_match |= b->mf >> 1; return; } } @@ -76,12 +75,13 @@ static void add_spatial_candidate(refmvs_candidate *const mvstack, int *const cn [1] = ((b->mf & 1) && gmv[1].n != INVALID_MV) ? gmv[1] : b->mv.mv[1], }}; + *have_refmv_match = 1; + *have_newmv_match |= b->mf >> 1; + const int last = *cnt; for (int n = 0; n < last; n++) if (mvstack[n].mv.n == cand_mv.n) { mvstack[n].weight += weight; - *have_refmv_match = 1; - *have_newmv_match |= b->mf >> 1; return; } @@ -90,8 +90,6 @@ static void add_spatial_candidate(refmvs_candidate *const mvstack, int *const cn mvstack[last].weight = weight; *cnt = last + 1; } - *have_refmv_match = 1; - *have_newmv_match |= b->mf >> 1; } } |