diff options
Diffstat (limited to 'vp9/encoder')
-rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 2 | ||||
-rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 2 | ||||
-rw-r--r-- | vp9/encoder/vp9_onyx_int.h | 2 | ||||
-rw-r--r-- | vp9/encoder/vp9_rdopt.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index a0a3ace7f..360abad77 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -404,7 +404,7 @@ static void update_state(VP9_COMP *cpi, PICK_MODE_CONTEXT *ctx, THR_D135_PRED /*D135_PRED*/, THR_D117_PRED /*D117_PRED*/, THR_D153_PRED /*D153_PRED*/, - THR_D27_PRED /*D27_PRED*/, + THR_D207_PRED /*D207_PRED*/, THR_D63_PRED /*D63_PRED*/, THR_TM /*TM_PRED*/, THR_B_PRED /*I4X4_PRED*/, diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index e15c44d14..34bd43ef1 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -608,7 +608,7 @@ static void set_rd_speed_thresholds(VP9_COMP *cpi, int mode, int speed) { sf->thresh_mult[THR_D135_PRED] += speed_multiplier * 2500; sf->thresh_mult[THR_D117_PRED] += speed_multiplier * 2500; sf->thresh_mult[THR_D153_PRED] += speed_multiplier * 2500; - sf->thresh_mult[THR_D27_PRED] += speed_multiplier * 2500; + sf->thresh_mult[THR_D207_PRED] += speed_multiplier * 2500; sf->thresh_mult[THR_D63_PRED] += speed_multiplier * 2500; if (cpi->sf.skip_lots_of_modes) { diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h index 8328374d6..653615949 100644 --- a/vp9/encoder/vp9_onyx_int.h +++ b/vp9/encoder/vp9_onyx_int.h @@ -182,7 +182,7 @@ typedef enum { THR_H_PRED, THR_V_PRED, THR_D135_PRED, - THR_D27_PRED, + THR_D207_PRED, THR_D153_PRED, THR_D63_PRED, THR_D117_PRED, diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index ee219572e..74282aafe 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -90,7 +90,7 @@ const MODE_DEFINITION vp9_mode_order[MAX_MODES] = { {H_PRED, INTRA_FRAME, NONE}, {V_PRED, INTRA_FRAME, NONE}, {D135_PRED, INTRA_FRAME, NONE}, - {D27_PRED, INTRA_FRAME, NONE}, + {D207_PRED, INTRA_FRAME, NONE}, {D153_PRED, INTRA_FRAME, NONE}, {D63_PRED, INTRA_FRAME, NONE}, {D117_PRED, INTRA_FRAME, NONE}, @@ -979,7 +979,7 @@ static int conditional_skipintra(MB_PREDICTION_MODE mode, best_intra_mode != V_PRED && best_intra_mode != D45_PRED) return 1; - if (mode == D27_PRED && + if (mode == D207_PRED && best_intra_mode != H_PRED && best_intra_mode != D45_PRED) return 1; |