[FFmpeg-cvslog] vp9: improve signbias check.

[Ronald S. Bultje]

ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Fri May 15 21:14:08 2015 -0400| [68c1e9131654576fb3abc13da742c115303a3b54] | committer: Ronald S. Bultje

vp9: improve signbias check.

Otherwise it will still scale motion vectors, which leads to corrupted
prediction.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=68c1e9131654576fb3abc13da742c115303a3b54
---

 libavcodec/vp9.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
index 9540f3d..42c1ec9 100644
--- a/libavcodec/vp9.c
+++ b/libavcodec/vp9.c
@@ -614,11 +614,11 @@ static int decode_frame_header(AVCodecContext *ctx,
         } else {
             s->refreshrefmask = get_bits(&s->gb, 8);
             s->refidx[0]      = get_bits(&s->gb, 3);
-            s->signbias[0]    = get_bits1(&s->gb);
+            s->signbias[0]    = get_bits1(&s->gb) && !s->errorres;
             s->refidx[1]      = get_bits(&s->gb, 3);
-            s->signbias[1]    = get_bits1(&s->gb);
+            s->signbias[1]    = get_bits1(&s->gb) && !s->errorres;
             s->refidx[2]      = get_bits(&s->gb, 3);
-            s->signbias[2]    = get_bits1(&s->gb);
+            s->signbias[2]    = get_bits1(&s->gb) && !s->errorres;
             if (!s->refs[s->refidx[0]].f->data[0] ||
                 !s->refs[s->refidx[1]].f->data[0] ||
                 !s->refs[s->refidx[2]].f->data[0]) {
@@ -648,8 +648,7 @@ static int decode_frame_header(AVCodecContext *ctx,
             s->highprecisionmvs = get_bits1(&s->gb);
             s->filtermode = get_bits1(&s->gb) ? FILTER_SWITCHABLE :
                                                 get_bits(&s->gb, 2);
-            s->allowcompinter = !s->errorres &&
-                                (s->signbias[0] != s->signbias[1] ||
+            s->allowcompinter = (s->signbias[0] != s->signbias[1] ||
                                  s->signbias[0] != s->signbias[2]);
             if (s->allowcompinter) {
                 if (s->signbias[0] == s->signbias[1]) {