From 1dca126ca717fabb07df537fdfe723344a3562da Mon Sep 17 00:00:00 2001
From: Angie Chiang <angiebird@google.com>
Date: Fri, 17 Mar 2017 16:11:52 -0700
Subject: [PATCH] Turn off token related check for lv_map experiment

lv_map is not using token list anymore

Change-Id: Ief4f743975815c889d83703cc42b019fce517a69
---
 av1/encoder/bitstream.c   | 4 ++--
 av1/encoder/encodeframe.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 1c944e427..d9eaf2332 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -2260,7 +2260,7 @@ static void write_tokens_b(AV1_COMP *cpi, const TileInfo *const tile,
   }
 #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 @@ static void write_tokens_b(AV1_COMP *cpi, const TileInfo *const tile,
 #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
diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index fbd5ad575..6ddb06f2e 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -4539,7 +4539,7 @@ static void rd_pick_partition(const AV1_COMP *const cpi, ThreadData *td,
   }
 
   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);
-- 
GitLab