Commit 4727fa2a authored by Yaowu Xu's avatar Yaowu Xu

Fix two asan failures

Change-Id: I57865e9604ac162ef0d97deb16e81ca436a98428
parent c2b8b5bf
......@@ -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;
......
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment