commit 5226184268659517c28e9c7d2fcec0f899554c3f
author Jingning Han <jingning@google.com> Wed Dec 14 12:17:49 2016 -0800
committer Jingning Han <jingning@google.com> Thu Dec 15 16:47:56 2016 +0000
tree da18bab92a7a3bada7de562cc45b610cf102d62e
parent e03fa610a3be64056a0ebbe0f0446d94a20e69d8

Unify prediction mode write and read operations

Unify the prediction mode write and read for all block sizes.

Change-Id: I32415fa4d9413978324597f7879c29963afe8118

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index b287994..8f8dc2c 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -803,6 +803,15 @@
   mbmi->ref_frame[0] = INTRA_FRAME;
   mbmi->ref_frame[1] = NONE;
 
+#if CONFIG_CB4X4
+  (void)i;
+  mbmi->mode =
+#if CONFIG_DAALA_EC
+      read_intra_mode(r, get_y_mode_cdf(cm, mi, above_mi, left_mi, 0));
+#else
+      read_intra_mode(r, get_y_mode_probs(cm, mi, above_mi, left_mi, 0));
+#endif  // CONFIG_DAALA_EC
+#else
   switch (bsize) {
     case BLOCK_4X4:
       for (i = 0; i < 4; ++i)
@@ -850,6 +859,7 @@
           read_intra_mode(r, get_y_mode_probs(cm, mi, above_mi, left_mi, 0));
 #endif
   }
+#endif
 
   mbmi->uv_mode = read_intra_mode_uv(cm, xd, r, mbmi->mode);
 #if CONFIG_EXT_INTRA
@@ -1127,6 +1137,10 @@
   mbmi->ref_frame[0] = INTRA_FRAME;
   mbmi->ref_frame[1] = NONE;
 
+#if CONFIG_CB4X4
+  (void)i;
+  mbmi->mode = read_intra_mode_y(cm, xd, r, size_group_lookup[bsize]);
+#else
   switch (bsize) {
     case BLOCK_4X4:
       for (i = 0; i < 4; ++i)
@@ -1146,6 +1160,7 @@
     default:
       mbmi->mode = read_intra_mode_y(cm, xd, r, size_group_lookup[bsize]);
   }
+#endif
 
   mbmi->uv_mode = read_intra_mode_uv(cm, xd, r, mbmi->mode);
 #if CONFIG_EXT_INTRA