From bec4fbe4be93dfd109cbf976cb1b1c3163646578 Mon Sep 17 00:00:00 2001
From: Sarah Parker <sarahparker@google.com>
Date: Mon, 15 Aug 2016 19:11:19 -0700
Subject: [PATCH] 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 | 6 +++---
vp10/encoder/bitstream.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/vp10/decoder/decodeframe.c b/vp10/decoder/decodeframe.c
index f2f8ebbab7..4c2054a624 100644
--- a/vp10/decoder/decodeframe.c
+++ b/vp10/decoder/decodeframe.c
@@ -3387,11 +3387,11 @@ static void read_global_motion_params(Global_Motion_Params *params,
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] =
diff --git a/vp10/encoder/bitstream.c b/vp10/encoder/bitstream.c
index d5bf02c349..81d8991f66 100644
--- a/vp10/encoder/bitstream.c
+++ b/vp10/encoder/bitstream.c
@@ -3155,11 +3155,11 @@ static void write_global_motion_params(Global_Motion_Params *params,
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:
--
GitLab