Skip to content

F
ffmpeg.wasm-core
Commit dd3d0f46 authored by Ronald S. Bultje's avatar Ronald S. Bultje Committed by Clément Bœsch
Browse files
Options

vp9: fix mvref finding to adhere to bug in libvpx. 

Fixes a particular youtube video that I unfortunately can't share.
parent f5bffd3a
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 2 deletions
libavcodec/vp9.c
View file @ dd3d0f46
......@@ -984,7 +984,10 @@ static void find_ref_mvs(VP9Context *s,
if (mv->ref[0] != ref && mv->ref[0] >= 0) {
RETURN_SCALE_MV(mv->mv[0], s->signbias[mv->ref[0]] != s->signbias[ref]);
}
if (mv->ref[1] != ref && mv->ref[1] >= 0) {
if (mv->ref[1] != ref && mv->ref[1] >= 0 &&
// BUG - libvpx has this condition regardless of whether
// we used the first ref MV and pre-scaling
AV_RN32A(&mv->mv[0]) != AV_RN32A(&mv->mv[1])) {
RETURN_SCALE_MV(mv->mv[1], s->signbias[mv->ref[1]] != s->signbias[ref]);
}
}
......@@ -997,7 +1000,10 @@ static void find_ref_mvs(VP9Context *s,
if (mv->ref[0] != ref && mv->ref[0] >= 0) {
RETURN_SCALE_MV(mv->mv[0], s->signbias[mv->ref[0]] != s->signbias[ref]);
}
if (mv->ref[1] != ref && mv->ref[1] >= 0) {
if (mv->ref[1] != ref && mv->ref[1] >= 0 &&
// BUG - libvpx has this condition regardless of whether
// we used the first ref MV and pre-scaling
AV_RN32A(&mv->mv[0]) != AV_RN32A(&mv->mv[1])) {
RETURN_SCALE_MV(mv->mv[1], s->signbias[mv->ref[1]] != s->signbias[ref]);
}
}
......
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