commit 1dca126ca717fabb07df537fdfe723344a3562da
author Angie Chiang <angiebird@google.com> Fri Mar 17 16:11:52 2017 -0700
committer Angie Chiang <angiebird@google.com> Mon Mar 20 18:16:51 2017 +0000
tree 8e8a6d6ebcfe9d637fa42a75d706717e1b551a1a
parent 4af07d928514c416c82752b07d82c8a9ef3ecba8

Turn off token related check for lv_map experiment

lv_map is not using token list anymore

Change-Id: Ief4f743975815c889d83703cc42b019fce517a69

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 1c944e4..d9eaf23 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -2260,7 +2260,7 @@
   }
 #else  // CONFIG_COEF_INTERLEAVE
   if (!mbmi->skip) {
-#if !CONFIG_PVQ
+#if !CONFIG_PVQ && !CONFIG_LV_MAP
     assert(*tok < tok_end);
 #endif
     for (plane = 0; plane < MAX_MB_PLANE; ++plane) {
@@ -2355,7 +2355,7 @@
 #endif  // CONFIG_RD_DEBUG
 #endif  // CONFIG_VAR_TX
 
-#if !CONFIG_PVQ
+#if !CONFIG_PVQ && !CONFIG_LV_MAP
       assert(*tok < tok_end && (*tok)->token == EOSB_TOKEN);
       (*tok)++;
 #endif

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index fbd5ad5..6ddb06f 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -4539,7 +4539,7 @@
   }
 
   if (bsize == cm->sb_size) {
-#if !CONFIG_PVQ
+#if !CONFIG_PVQ && !CONFIG_LV_MAP
     assert(tp_orig < *tp || (tp_orig == *tp && xd->mi[0]->mbmi.skip));
 #endif
     assert(best_rdc.rate < INT_MAX);