commit e8c675217d34920dd71a767211789769e72a0de0
author Frederic Barbier <frederic.barbier@allegrodvt.com> Tue Mar 27 15:09:57 2018 +0200
committer Sebastien Alaiwan <sebastien.alaiwan@allegrodvt.com> Wed Mar 28 04:37:55 2018 +0000
tree fe89e3f365a4f9a382886045ad655cc96f69bfe9
parent 38c90674ea3114bebd44f75095a4b9c17698c381

Move function out of decoder scope

Change-Id: Iedb8bb684ff1815ddf873ad6d0f060a1902fb3ea

av1/common/txb_common.h

diff --git a/av1/common/txb_common.h b/av1/common/txb_common.h
index d64bc00..a93137f 100644
--- a/av1/common/txb_common.h
+++ b/av1/common/txb_common.h
@@ -566,23 +566,6 @@
   return get_nz_map_ctx_from_stats(stats, coeff_idx, bwl, tx_size, tx_class);
 }
 
-static INLINE int get_nz_map_ctx(const uint8_t *const levels,
-                                 const int coeff_idx, const int bwl,
-                                 const int height, const int scan_idx,
-                                 const int is_eob, const TX_SIZE tx_size,
-                                 const TX_TYPE tx_type) {
-  if (is_eob) {
-    if (scan_idx == 0) return 0;
-    if (scan_idx <= (height << bwl) / 8) return 1;
-    if (scan_idx <= (height << bwl) / 4) return 2;
-    return 3;
-  }
-  const TX_CLASS tx_class = tx_type_to_class[tx_type];
-  const int stats =
-      get_nz_mag(levels + get_padded_idx(coeff_idx, bwl), bwl, tx_class);
-  return get_nz_map_ctx_from_stats(stats, coeff_idx, bwl, tx_size, tx_class);
-}
-
 static INLINE void set_dc_sign(int *cul_level, tran_low_t v) {
   if (v < 0)
     *cul_level |= 1 << COEFF_CONTEXT_BITS;

av1/encoder/encodetxb.c

diff --git a/av1/encoder/encodetxb.c b/av1/encoder/encodetxb.c
index c58cac2..82432b0 100644
--- a/av1/encoder/encodetxb.c
+++ b/av1/encoder/encodetxb.c
@@ -245,6 +245,23 @@
                           const LV_MAP_COEFF_COST *const txb_costs,
                           const int coeff_ctx);
 
+static INLINE int get_nz_map_ctx(const uint8_t *const levels,
+                                 const int coeff_idx, const int bwl,
+                                 const int height, const int scan_idx,
+                                 const int is_eob, const TX_SIZE tx_size,
+                                 const TX_TYPE tx_type) {
+  if (is_eob) {
+    if (scan_idx == 0) return 0;
+    if (scan_idx <= (height << bwl) / 8) return 1;
+    if (scan_idx <= (height << bwl) / 4) return 2;
+    return 3;
+  }
+  const TX_CLASS tx_class = tx_type_to_class[tx_type];
+  const int stats =
+      get_nz_mag(levels + get_padded_idx(coeff_idx, bwl), bwl, tx_class);
+  return get_nz_map_ctx_from_stats(stats, coeff_idx, bwl, tx_size, tx_class);
+}
+
 static void get_dist_cost_stats(LevelDownStats *const stats, const int scan_idx,
                                 const int is_eob,
                                 const LV_MAP_COEFF_COST *const txb_costs,