ref: 4727fa2a75354677f8670a18ce0e1f6174c2975d
parent: c2b8b5bfe2bdb5bff7225cbd656c6fbbaa4230a5
author: Yaowu Xu <[email protected]>
date: Wed Oct 14 04:37:15 EDT 2015
Fix two asan failures Change-Id: I57865e9604ac162ef0d97deb16e81ca436a98428
--- a/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -1204,7 +1204,8 @@
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;
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -2422,11 +2422,8 @@
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;
}