Some fixes from merging MISC_FIXES config Change-Id: I3f77e952af3c441a50479bb5d278ea0fd6cf62c6
diff --git a/vp10/common/reconintra.c b/vp10/common/reconintra.c index 32f592e..ed253f7 100644 --- a/vp10/common/reconintra.c +++ b/vp10/common/reconintra.c
@@ -192,9 +192,9 @@ INIT_ALL_SIZES(pred[V_PRED], v); INIT_ALL_SIZES(pred[H_PRED], h); - INIT_ALL_SIZES(pred[D207_PRED], d207); - INIT_ALL_SIZES(pred[D45_PRED], d45); - INIT_ALL_SIZES(pred[D63_PRED], d63); + INIT_ALL_SIZES(pred[D207_PRED], d207e); + INIT_ALL_SIZES(pred[D45_PRED], d45e); + INIT_ALL_SIZES(pred[D63_PRED], d63e); INIT_ALL_SIZES(pred[D117_PRED], d117); INIT_ALL_SIZES(pred[D135_PRED], d135); INIT_ALL_SIZES(pred[D153_PRED], d153); @@ -208,9 +208,9 @@ #if CONFIG_VP9_HIGHBITDEPTH INIT_ALL_SIZES(pred_high[V_PRED], highbd_v); INIT_ALL_SIZES(pred_high[H_PRED], highbd_h); - INIT_ALL_SIZES(pred_high[D207_PRED], highbd_d207); - INIT_ALL_SIZES(pred_high[D45_PRED], highbd_d45); - INIT_ALL_SIZES(pred_high[D63_PRED], highbd_d63); + INIT_ALL_SIZES(pred_high[D207_PRED], highbd_d207e); + INIT_ALL_SIZES(pred_high[D45_PRED], highbd_d45e); + INIT_ALL_SIZES(pred_high[D63_PRED], highbd_d63e); INIT_ALL_SIZES(pred_high[D117_PRED], highbd_d117); INIT_ALL_SIZES(pred_high[D135_PRED], highbd_d135); INIT_ALL_SIZES(pred_high[D153_PRED], highbd_d153);
diff --git a/vp10/decoder/dsubexp.c b/vp10/decoder/dsubexp.c index d0b8d7d..7d2872e 100644 --- a/vp10/decoder/dsubexp.c +++ b/vp10/decoder/dsubexp.c
@@ -23,7 +23,7 @@ static int decode_uniform(vpx_reader *r) { const int l = 8; - const int m = (1 << l) - 192; + const int m = (1 << l) - 190; const int v = vpx_read_literal(r, l - 1); return v < m ? v : (v << 1) - m + vpx_read_bit(r); }
diff --git a/vp10/encoder/subexp.c b/vp10/encoder/subexp.c index fd82231..8d279b1 100644 --- a/vp10/encoder/subexp.c +++ b/vp10/encoder/subexp.c
@@ -85,7 +85,7 @@ static void encode_uniform(vpx_writer *w, int v) { const int l = 8; - const int m = (1 << l) - 192; + const int m = (1 << l) - 190; if (v < m) { vpx_write_literal(w, v, l - 1); } else {
diff --git a/vpx_dsp/intrapred.c b/vpx_dsp/intrapred.c index b03168f..18bcd87 100644 --- a/vpx_dsp/intrapred.c +++ b/vpx_dsp/intrapred.c
@@ -832,6 +832,9 @@ intra_pred_no_4x4(d207) intra_pred_no_4x4(d63) intra_pred_no_4x4(d45) +intra_pred_allsizes(d207e) +intra_pred_allsizes(d63e) +intra_pred_no_4x4(d45e) intra_pred_no_4x4(d117) intra_pred_no_4x4(d135) intra_pred_no_4x4(d153)