commit af322e1d71ac6d320335bd9558ef415b953a291d
author James Zern <jzern@google.com> Sat Oct 22 12:43:15 2016 -0700
committer James Zern <jzern@google.com> Sat Oct 22 12:46:43 2016 -0700
tree 32babfccb1f71c5c62d8b4c0670a1bc11dfdb31a
parent 958077ab0b85fd5ac34aa2186ba5778e63cabfa9

update_state: quiet const warning w/global-motion

+ add a TODO as this is incompatible with tile-based threading

Change-Id: I057c551a5f19020366c6b85c2e67e8394bb3306f

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 9dc6a2e..ca15d96 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -1165,7 +1165,9 @@
       av1_update_mv_count(td);
 #if CONFIG_GLOBAL_MOTION
       if (bsize >= BLOCK_8X8) {
-        update_global_motion_used(mbmi->mode, mbmi, cpi);
+        // TODO(sarahparker): global motion stats need to be handled per-tile
+        // to be compatible with tile-based threading.
+        update_global_motion_used(mbmi->mode, mbmi, (AV1_COMP *)cpi);
       } else {
         const int num_4x4_w = num_4x4_blocks_wide_lookup[bsize];
         const int num_4x4_h = num_4x4_blocks_high_lookup[bsize];
@@ -1173,7 +1175,8 @@
         for (idy = 0; idy < 2; idy += num_4x4_h) {
           for (idx = 0; idx < 2; idx += num_4x4_w) {
             const int j = idy * 2 + idx;
-            update_global_motion_used(mi->bmi[j].as_mode, mbmi, cpi);
+            update_global_motion_used(mi->bmi[j].as_mode, mbmi,
+                                      (AV1_COMP *)cpi);
           }
         }
       }