commit c6733fb7f0a90f815246d6de92e8521c5f939440
author Thomas Davies <thdavies@cisco.com> Tue Nov 22 16:06:33 2016 +0000
committer Thomas Davies <thdavies@cisco.com> Tue Jan 31 11:16:24 2017 +0000
tree 208896121c7157942207aea40ef7b50a6fcbc157
parent f63903219f93ed9733a88d07192d523010cedb8c

EC_MULTISYMBOL: Separate out tokenization loop.

This will make merging EOB_TOKEN easier.

Change-Id: I1789344e9c3bbb329c30287a00aeee3c8a9d60c4

av1/encoder/tokenize.c

diff --git a/av1/encoder/tokenize.c b/av1/encoder/tokenize.c
index 8ed1d5f..a57bf83 100644
--- a/av1/encoder/tokenize.c
+++ b/av1/encoder/tokenize.c
@@ -493,17 +493,16 @@
   nb = scan_order->neighbors;
   c = 0;
 
+#if CONFIG_EC_MULTISYMBOL
   while (c < eob) {
     const int v = qcoeff[scan[c]];
     eob_branch[band[c]][pt] += !skip_eob;
 
     av1_get_token_extra(v, &token, &extra);
 
-    add_token(&t, coef_probs[band[c]][pt],
-#if CONFIG_EC_MULTISYMBOL
-              &coef_tail_cdfs[band[c]][pt], &coef_head_cdfs[band[c]][pt],
-#endif
-              extra, (uint8_t)token, (uint8_t)skip_eob, counts[band[c]][pt]);
+    add_token(&t, coef_probs[band[c]][pt], &coef_tail_cdfs[band[c]][pt],
+              &coef_head_cdfs[band[c]][pt], extra, (uint8_t)token,
+              (uint8_t)skip_eob, counts[band[c]][pt]);
 
     token_cache[scan[c]] = av1_pt_energy_class[token];
     ++c;
@@ -512,13 +511,31 @@
   }
   if (c < seg_eob) {
     assert(!skip_eob);  // The last token must be non-zero.
-    add_token(&t, coef_probs[band[c]][pt],
-#if CONFIG_EC_MULTISYMBOL
-              NULL, NULL,
-#endif
-              0, EOB_TOKEN, 0, counts[band[c]][pt]);
+    add_token(&t, coef_probs[band[c]][pt], NULL, NULL, 0, EOB_TOKEN, 0,
+              counts[band[c]][pt]);
     ++eob_branch[band[c]][pt];
   }
+#else
+  while (c < eob) {
+    const int v = qcoeff[scan[c]];
+    eob_branch[band[c]][pt] += !skip_eob;
+
+    av1_get_token_extra(v, &token, &extra);
+
+    add_token(&t, coef_probs[band[c]][pt], extra, (uint8_t)token,
+              (uint8_t)skip_eob, counts[band[c]][pt]);
+
+    token_cache[scan[c]] = av1_pt_energy_class[token];
+    ++c;
+    pt = get_coef_context(nb, token_cache, c);
+    skip_eob = (token == ZERO_TOKEN);
+  }
+  if (c < seg_eob) {
+    add_token(&t, coef_probs[band[c]][pt], 0, EOB_TOKEN, 0,
+              counts[band[c]][pt]);
+    ++eob_branch[band[c]][pt];
+  }
+#endif
 
 #if CONFIG_COEF_INTERLEAVE
   t->token = EOSB_TOKEN;