commit 173a756af9f94138287d36bd3b2265c6bca4a652
author angiebird <angiebird@google.com> Tue Jun 30 12:22:20 2020 -0700
committer Angie Chiang <angiebird@google.com> Wed Jul 01 17:02:51 2020 +0000
tree 67867186d3b74501a2a3f06fa2f859143009ae92
parent af9c0f4245f28d0f6b024adfa023418bd553fa2d

Let av1_set_entropy_contexts() return uint8_t

Change-Id: I82546886d63d614ba9cb4ba8d83473c2999b7768

av1/encoder/encodetxb.c

diff --git a/av1/encoder/encodetxb.c b/av1/encoder/encodetxb.c
index 5e8bf0b..ccde689 100644
--- a/av1/encoder/encodetxb.c
+++ b/av1/encoder/encodetxb.c
@@ -1980,8 +1980,8 @@
   return txb_info.eob;
 }
 
-int av1_get_txb_entropy_context(const tran_low_t *qcoeff,
-                                const SCAN_ORDER *scan_order, int eob) {
+uint8_t av1_get_txb_entropy_context(const tran_low_t *qcoeff,
+                                    const SCAN_ORDER *scan_order, int eob) {
   const int16_t *const scan = scan_order->scan;
   int cul_level = 0;
   int c;
@@ -1995,7 +1995,7 @@
   cul_level = AOMMIN(COEFF_CONTEXT_MASK, cul_level);
   set_dc_sign(&cul_level, qcoeff[0]);
 
-  return cul_level;
+  return (uint8_t)cul_level;
 }
 
 static void update_tx_type_count(const AV1_COMP *cpi, const AV1_COMMON *cm,
@@ -2221,7 +2221,8 @@
   } else {
     tcoeff = qcoeff;
   }
-  const int cul_level = av1_get_txb_entropy_context(tcoeff, scan_order, eob);
+  const uint8_t cul_level =
+      av1_get_txb_entropy_context(tcoeff, scan_order, eob);
   av1_set_entropy_contexts(xd, pd, plane, plane_bsize, tx_size, cul_level,
                            blk_col, blk_row);
 }