commit bec4fbe4be93dfd109cbf976cb1b1c3163646578
author Sarah Parker <sarahparker@google.com> Mon Aug 15 19:11:19 2016 -0700
committer Sarah Parker <sarahparker@google.com> Tue Aug 16 15:06:31 2016 -0700
tree 14857da59d6f2954ec8d31944bbd3545e1ce8efa
parent 253c001f8f43d65865f1c7b0a38f796fab4e194d

Switch order of gm parameters for affine model

This was originally subtracting 1 from the wrong element in the
parameter set.

Change-Id: I790aafc505f7a8fe7bb00d7d6c62549487a0980f

vp10/decoder/decodeframe.c

diff --git a/vp10/decoder/decodeframe.c b/vp10/decoder/decodeframe.c
index f2f8ebb..4c2054a 100644
--- a/vp10/decoder/decodeframe.c
+++ b/vp10/decoder/decodeframe.c
@@ -3387,11 +3387,11 @@
     case GLOBAL_AFFINE:
       params->motion_params.wmmat[4] =
           (vp10_read_primitive_symmetric(r, GM_ABS_ALPHA_BITS) *
-           GM_ALPHA_DECODE_FACTOR) +
-          (1 << WARPEDMODEL_PREC_BITS);
+           GM_ALPHA_DECODE_FACTOR);
       params->motion_params.wmmat[5] =
           vp10_read_primitive_symmetric(r, GM_ABS_ALPHA_BITS) *
-          GM_ALPHA_DECODE_FACTOR;
+          GM_ALPHA_DECODE_FACTOR +
+          (1 << WARPEDMODEL_PREC_BITS);
     // fallthrough intended
     case GLOBAL_ROTZOOM:
       params->motion_params.wmmat[2] =

vp10/encoder/bitstream.c

diff --git a/vp10/encoder/bitstream.c b/vp10/encoder/bitstream.c
index d5bf02c..81d8991 100644
--- a/vp10/encoder/bitstream.c
+++ b/vp10/encoder/bitstream.c
@@ -3155,11 +3155,11 @@
     case GLOBAL_ZERO: break;
     case GLOBAL_AFFINE:
       vp10_write_primitive_symmetric(
-          w, (params->motion_params.wmmat[4] * GM_ALPHA_ENCODE_FACTOR) -
-                 (1 << GM_ALPHA_PREC_BITS),
+          w, params->motion_params.wmmat[4] * GM_ALPHA_ENCODE_FACTOR,
           GM_ABS_ALPHA_BITS);
       vp10_write_primitive_symmetric(
-          w, params->motion_params.wmmat[5] * GM_ALPHA_ENCODE_FACTOR,
+          w, (params->motion_params.wmmat[5] * GM_ALPHA_ENCODE_FACTOR) -
+                 (1 << GM_ALPHA_PREC_BITS),
           GM_ABS_ALPHA_BITS);
     // fallthrough intended
     case GLOBAL_ROTZOOM: