Fix two asan failures

Change-Id: I57865e9604ac162ef0d97deb16e81ca436a98428

diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c
index 6989c66bdec1ee0a067e39393d13d236a0fae5c6..66da8d49828fd15ee82095727dc058eeda8db6b1 100644 (file)
--- a/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -1204,7 +1204,8 @@ static int64_t rd_pick_intra_sby_mode(VP10_COMP *cpi, MACROBLOCK *x,
   TX_SIZE best_tx = TX_4X4;
   int *bmode_costs;
   PALETTE_MODE_INFO palette_mode_info;
-  uint8_t *best_palette_color_map = x->palette_buffer->best_palette_color_map;
+  uint8_t *best_palette_color_map =  cpi->common.allow_screen_content_tools ?
+       x->palette_buffer->best_palette_color_map : NULL;
   int rows = 4 * num_4x4_blocks_high_lookup[bsize];
   int cols = 4 * num_4x4_blocks_wide_lookup[bsize];
   int palette_ctx = 0;

diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index a05a300c4d63cb8e5b68dd06619407619832ad9b..9a639813dc61af05eec8f70f2383825f9ecce681 100644 (file)
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -2422,11 +2422,8 @@ static void rd_pick_partition(VP9_COMP *cpi, ThreadData *td,
     do_split &= bsize > min_size;
   }
 
-  if (cpi->sf.use_square_partition_only &&
-      (bsize > cpi->sf.use_square_only_threshold)) {
-    if (!vp9_active_h_edge(cpi, mi_row, mi_step) || x->e_mbd.lossless)
+  if (cpi->sf.use_square_partition_only) {
       partition_horz_allowed &= force_horz_split;
-    if (!vp9_active_v_edge(cpi, mi_row, mi_step) || x->e_mbd.lossless)
       partition_vert_allowed &= force_vert_split;
   }