commit e314316c65ecb719b3bcd84bcfb7a96bd1a600f1
author Jingning Han <jingning@google.com> Fri Sep 02 17:14:18 2016 -0700
committer Jingning Han <jingning@google.com> Mon Sep 05 17:41:49 2016 +0000
tree ece5a697f1c8a0c46f883cf5566e34ed2a7b53fe
parent f476e1a675485ee288965308ae9bced099307181

Unify the enc/dec uv block tx_size fetch

Simplify the code logic and make the codebase easier to maintain.

Change-Id: I867060614209f3d82426bb97e2e4d7d16db2097b

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index e4bb88e..62493af 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -423,13 +423,6 @@
   return eob;
 }
 
-static INLINE TX_SIZE dec_get_uv_tx_size(const MB_MODE_INFO *mbmi, int n4_wl,
-                                         int n4_hl) {
-  // get minimum log2 num4x4s dimension
-  const int x = AOMMIN(n4_wl, n4_hl);
-  return AOMMIN(mbmi->tx_size, x);
-}
-
 static INLINE void dec_reset_skip_context(MACROBLOCKD *xd) {
   int i;
   for (i = 0; i < MAX_MB_PLANE; i++) {
@@ -503,9 +496,7 @@
 #endif  // CONFIG_PALETTE
     for (plane = 0; plane < MAX_MB_PLANE; ++plane) {
       const struct macroblockd_plane *const pd = &xd->plane[plane];
-      const TX_SIZE tx_size =
-          plane ? dec_get_uv_tx_size(mbmi, pd->n4_wl, pd->n4_hl)
-                : mbmi->tx_size;
+      const TX_SIZE tx_size = plane ? get_uv_tx_size(mbmi, pd) : mbmi->tx_size;
       const int num_4x4_w = pd->n4_w;
       const int num_4x4_h = pd->n4_h;
       const int step = tx_size_1d_in_unit[tx_size];
@@ -539,8 +530,7 @@
       for (plane = 0; plane < MAX_MB_PLANE; ++plane) {
         const struct macroblockd_plane *const pd = &xd->plane[plane];
         const TX_SIZE tx_size =
-            plane ? dec_get_uv_tx_size(mbmi, pd->n4_wl, pd->n4_hl)
-                  : mbmi->tx_size;
+            plane ? get_uv_tx_size(mbmi, pd) : mbmi->tx_size;
         const int num_4x4_w = pd->n4_w;
         const int num_4x4_h = pd->n4_h;
         const int step = tx_size_1d_in_unit[tx_size];