commit 9bab28b61f8e32b0d8cb0d54dc2f0bf5d07de7ea
author Luc Trudeau <luc@trud.ca> Thu May 11 15:23:02 2017 -0400
committer Luc Trudeau <luc@trud.ca> Fri May 12 00:31:09 2017 +0000
tree bf3def58b1774e28f1c88031a81b36cded81df16
parent f436b12e24a1e10fc612ece052adfb9dc8206ff0

[CFL] Reduce arrays used in inspection

Merge cfl_alpha_sign_u and cfl_alpha_sign_v into cfl_alpha_sign,
where:
    cfl_alpha_sign = (cfl_alpha_sign_v << 1) + cfl_alpha_sign_u;

Change-Id: I8c491e37d23f6ef85a33a8b2f8770b7b606d8e0a

av1/decoder/inspection.c

diff --git a/av1/decoder/inspection.c b/av1/decoder/inspection.c
index f2e6fd3..926c77e 100644
--- a/av1/decoder/inspection.c
+++ b/av1/decoder/inspection.c
@@ -103,12 +103,11 @@
 #if CONFIG_CFL
       if (mbmi->uv_mode == DC_PRED) {
         mi->cfl_alpha_idx = mbmi->cfl_alpha_idx;
-        mi->cfl_alpha_sign_u = mbmi->cfl_alpha_signs[CFL_PRED_U];
-        mi->cfl_alpha_sign_v = mbmi->cfl_alpha_signs[CFL_PRED_V];
+        mi->cfl_alpha_sign = (mbmi->cfl_alpha_signs[CFL_PRED_V] << CFL_PRED_V) +
+                             mbmi->cfl_alpha_signs[CFL_PRED_U];
       } else {
         mi->cfl_alpha_idx = 0;
-        mi->cfl_alpha_sign_u = 0;
-        mi->cfl_alpha_sign_v = 0;
+        mi->cfl_alpha_sign = 0;
       }
 #endif
     }

av1/decoder/inspection.h

diff --git a/av1/decoder/inspection.h b/av1/decoder/inspection.h
index eb90bef..44132d5 100644
--- a/av1/decoder/inspection.h
+++ b/av1/decoder/inspection.h
@@ -51,8 +51,7 @@
 #endif
 #if CONFIG_CFL
   int8_t cfl_alpha_idx;
-  int8_t cfl_alpha_sign_u;
-  int8_t cfl_alpha_sign_v;
+  int8_t cfl_alpha_sign;
 #endif
 };
 

examples/inspect.c

diff --git a/examples/inspect.c b/examples/inspect.c
index e54e8e4..2d8c798 100644
--- a/examples/inspect.c
+++ b/examples/inspect.c
@@ -501,10 +501,8 @@
   if (layers & CFL_LAYER) {
     buf += put_block_info(buf, NULL, "cfl_alpha_idx",
                           offsetof(insp_mi_data, cfl_alpha_idx));
-    buf += put_block_info(buf, NULL, "cfl_alpha_sign_u",
-                          offsetof(insp_mi_data, cfl_alpha_sign_u));
-    buf += put_block_info(buf, NULL, "cfl_alpha_sign_v",
-                          offsetof(insp_mi_data, cfl_alpha_sign_v));
+    buf += put_block_info(buf, NULL, "cfl_alpha_sign",
+                          offsetof(insp_mi_data, cfl_alpha_sign));
   }
 #endif
   if (layers & MOTION_VECTORS_LAYER) {