Commit 439bcb5f authored by Hui Su's avatar Hui Su

More renaming about directional intra modes

Some leftover from 69ae7b86.

Change-Id: I4c37538fe8e13761631bd9521e954af0730c4e0b
parent cd41a512
......@@ -91,10 +91,10 @@ static INLINE PREDICTION_MODE compound_ref0_mode(PREDICTION_MODE mode) {
MB_MODE_COUNT, // H_PRED
MB_MODE_COUNT, // D45_PRED
MB_MODE_COUNT, // D135_PRED
MB_MODE_COUNT, // D117_PRED
MB_MODE_COUNT, // D153_PRED
MB_MODE_COUNT, // D207_PRED
MB_MODE_COUNT, // D63_PRED
MB_MODE_COUNT, // D113_PRED
MB_MODE_COUNT, // D157_PRED
MB_MODE_COUNT, // D203_PRED
MB_MODE_COUNT, // D67_PRED
MB_MODE_COUNT, // SMOOTH_PRED
MB_MODE_COUNT, // SMOOTH_V_PRED
MB_MODE_COUNT, // SMOOTH_H_PRED
......@@ -124,10 +124,10 @@ static INLINE PREDICTION_MODE compound_ref1_mode(PREDICTION_MODE mode) {
MB_MODE_COUNT, // H_PRED
MB_MODE_COUNT, // D45_PRED
MB_MODE_COUNT, // D135_PRED
MB_MODE_COUNT, // D117_PRED
MB_MODE_COUNT, // D153_PRED
MB_MODE_COUNT, // D207_PRED
MB_MODE_COUNT, // D63_PRED
MB_MODE_COUNT, // D113_PRED
MB_MODE_COUNT, // D157_PRED
MB_MODE_COUNT, // D203_PRED
MB_MODE_COUNT, // D67_PRED
MB_MODE_COUNT, // SMOOTH_PRED
MB_MODE_COUNT, // SMOOTH_V_PRED
MB_MODE_COUNT, // SMOOTH_H_PRED
......
......@@ -428,7 +428,7 @@ typedef enum ATTRIBUTE_PACKED {
PALETTE_COLORS
} PALETTE_COLOR;
// Note: All directional predictors must be between V_PRED and D63_PRED (both
// Note: All directional predictors must be between V_PRED and D67_PRED (both
// inclusive).
typedef enum ATTRIBUTE_PACKED {
DC_PRED, // Average of above and left pixels
......
......@@ -59,10 +59,10 @@ static const int mode_2_counter[] = {
9, // H_PRED
9, // D45_PRED
9, // D135_PRED
9, // D117_PRED
9, // D153_PRED
9, // D207_PRED
9, // D63_PRED
9, // D113_PRED
9, // D157_PRED
9, // D203_PRED
9, // D67_PRED
9, // SMOOTH_PRED
9, // SMOOTH_V_PRED
9, // SMOOTH_H_PRED
......
......@@ -541,10 +541,10 @@ static void update_state(const AV1_COMP *const cpi, TileDataEnc *tile_data,
THR_H_PRED /*H_PRED*/,
THR_D45_PRED /*D45_PRED*/,
THR_D135_PRED /*D135_PRED*/,
THR_D117_PRED /*D117_PRED*/,
THR_D153_PRED /*D153_PRED*/,
THR_D207_PRED /*D207_PRED*/,
THR_D63_PRED /*D63_PRED*/,
THR_D113_PRED /*D113_PRED*/,
THR_D157_PRED /*D157_PRED*/,
THR_D203_PRED /*D203_PRED*/,
THR_D67_PRED /*D67_PRED*/,
THR_SMOOTH, /*SMOOTH_PRED*/
THR_SMOOTH_V, /*SMOOTH_V_PRED*/
THR_SMOOTH_H, /*SMOOTH_H_PRED*/
......
......@@ -1171,10 +1171,10 @@ void av1_set_rd_speed_thresholds(AV1_COMP *cpi) {
rd->thresh_mult[THR_H_PRED] += 2000;
rd->thresh_mult[THR_V_PRED] += 2000;
rd->thresh_mult[THR_D135_PRED] += 2500;
rd->thresh_mult[THR_D207_PRED] += 2500;
rd->thresh_mult[THR_D153_PRED] += 2500;
rd->thresh_mult[THR_D63_PRED] += 2500;
rd->thresh_mult[THR_D117_PRED] += 2500;
rd->thresh_mult[THR_D203_PRED] += 2500;
rd->thresh_mult[THR_D157_PRED] += 2500;
rd->thresh_mult[THR_D67_PRED] += 2500;
rd->thresh_mult[THR_D113_PRED] += 2500;
rd->thresh_mult[THR_D45_PRED] += 2500;
#if CONFIG_EXT_COMP_REFS
......
......@@ -204,10 +204,10 @@ typedef enum {
THR_H_PRED,
THR_V_PRED,
THR_D135_PRED,
THR_D207_PRED,
THR_D153_PRED,
THR_D63_PRED,
THR_D117_PRED,
THR_D203_PRED,
THR_D157_PRED,
THR_D67_PRED,
THR_D113_PRED,
THR_D45_PRED,
#if CONFIG_EXT_COMP_REFS
......
......@@ -37,7 +37,7 @@ const int kNumAv1IntraFuncs = INTRA_MODES + 3; // 4 DC predictor variants.
const char *kAv1IntraPredNames[kNumAv1IntraFuncs] = {
"DC_PRED", "DC_LEFT_PRED", "DC_TOP_PRED", "DC_128_PRED",
"V_PRED", "H_PRED", "D45_PRED", "D135_PRED",
"D117_PRED", "D153_PRED", "D207_PRED", "D63_PRED",
"D113_PRED", "D157_PRED", "D203_PRED", "D67_PRED",
"PAETH_PRED", "SMOOTH_PRED", "SMOOTH_V_PRED", "SMOOTH_H_PRED",
};
......
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