commit 3fb33f079ca81c04cce60cc3f7d7d25409de0c0a
author Debargha Mukherjee <debargha@google.com> Sat Nov 12 10:43:50 2016 -0800
committer Debargha Mukherjee <debargha@google.com> Mon Nov 14 19:24:32 2016 +0000
tree c2a701a85e24693b17e328824b90fb80c1ca746a
parent 721868c629a832bb4ed74e91df405b657ad06b27

Support for homography in global motion experiment

Change-Id: If4a480633032d8738a84fa8173c6ebd90564f0a4

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 4192801..a36f0c9 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -3970,7 +3970,14 @@
   av1_write_token(w, av1_global_motion_types_tree, probs,
                   &global_motion_types_encodings[type]);
   switch (type) {
-    case IDENTITY: break;
+    case HOMOGRAPHY:
+        aom_write_primitive_symmetric(
+            w, (params->wmmat[6] >> GM_ROW3HOMO_PREC_DIFF),
+            GM_ABS_ROW3HOMO_BITS);
+        aom_write_primitive_symmetric(
+            w, (params->wmmat[7] >> GM_ROW3HOMO_PREC_DIFF),
+            GM_ABS_ROW3HOMO_BITS);
+    // fallthrough intended
     case AFFINE:
     case ROTZOOM:
       aom_write_primitive_symmetric(
@@ -3979,7 +3986,7 @@
           GM_ABS_ALPHA_BITS);
       aom_write_primitive_symmetric(w, (params->wmmat[3] >> GM_ALPHA_PREC_DIFF),
                                     GM_ABS_ALPHA_BITS);
-      if (type == AFFINE) {
+      if (type == AFFINE || type == HOMOGRAPHY) {
         aom_write_primitive_symmetric(
             w, (params->wmmat[4] >> GM_ALPHA_PREC_DIFF), GM_ABS_ALPHA_BITS);
         aom_write_primitive_symmetric(w,
@@ -3994,6 +4001,7 @@
       aom_write_primitive_symmetric(w, (params->wmmat[1] >> GM_TRANS_PREC_DIFF),
                                     GM_ABS_TRANS_BITS);
       break;
+    case IDENTITY: break;
     default: assert(0);
   }
 }