From 42e5c2ad8abfb6ac2616e0011b380f1359788ff2 Mon Sep 17 00:00:00 2001
From: Yaowu Xu <yaowu@google.com>
Date: Fri, 18 Mar 2016 11:38:56 -0700
Subject: [PATCH] Two minor logic fixes
Change-Id: I1d5624fb2f34f87a55613036851034ec7c2d0b76
---
vp10/encoder/bitstream.c | 2 +-
vp10/encoder/rdopt.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/vp10/encoder/bitstream.c b/vp10/encoder/bitstream.c
index f20c224b45..a305c42ea3 100644
--- a/vp10/encoder/bitstream.c
+++ b/vp10/encoder/bitstream.c
@@ -1457,7 +1457,7 @@ static void write_modes_b(VP10_COMP *cpi, const TileInfo *const tile,
assert(*tok < tok_end);
pack_palette_tokens(w, tok, m->mbmi.palette_mode_info.palette_size[plane],
rows * cols - 1);
- assert(*tok < tok_end);
+ assert(*tok < tok_end + m->mbmi.skip);
}
}
diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c
index 01b5abb95b..647d571f74 100644
--- a/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -8286,7 +8286,7 @@ void vp10_rd_pick_inter_mode_sb(VP10_COMP *cpi,
rd_cost->rate = rate2;
#if CONFIG_SUPERTX
- if (x->skip && rate_y == INT_MAX)
+ if (x->skip)
*returnrate_nocoef = rate2;
else
*returnrate_nocoef = rate2 - rate_y - rate_uv;
--
GitLab