diff options
author | Dmitry Kovalev <dkovalev@google.com> | 2013-08-27 10:03:57 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-08-27 10:03:57 -0700 |
commit | 78e670fcf8bf8423d9abb99ba8e60027e45d1e62 (patch) | |
tree | 46cb12a941e0ad1a512202d342950347a66c81e9 /vp9 | |
parent | 45125ee5732898d95b5055649a469d3d2bbe8dd3 (diff) | |
parent | 50ee61db4cfbd338d23d3c8368eef974840be08d (diff) | |
download | libvpx-78e670fcf8bf8423d9abb99ba8e60027e45d1e62.tar libvpx-78e670fcf8bf8423d9abb99ba8e60027e45d1e62.tar.gz libvpx-78e670fcf8bf8423d9abb99ba8e60027e45d1e62.tar.bz2 libvpx-78e670fcf8bf8423d9abb99ba8e60027e45d1e62.zip |
Merge "Renaming D27 to D207."
Diffstat (limited to 'vp9')
-rw-r--r-- | vp9/common/vp9_blockd.h | 2 | ||||
-rw-r--r-- | vp9/common/vp9_entropymode.c | 2 | ||||
-rw-r--r-- | vp9/common/vp9_loopfilter.c | 2 | ||||
-rw-r--r-- | vp9/common/vp9_mvref_common.c | 2 | ||||
-rw-r--r-- | vp9/common/vp9_reconintra.c | 4 | ||||
-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 |
9 files changed, 11 insertions, 11 deletions
diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h index 6e5725940..9a42ad9f1 100644 --- a/vp9/common/vp9_blockd.h +++ b/vp9/common/vp9_blockd.h @@ -71,7 +71,7 @@ typedef enum { D135_PRED, // Directional 135 deg = 180 - 45 D117_PRED, // Directional 117 deg = 180 - 63 D153_PRED, // Directional 153 deg = 180 - 27 - D27_PRED, // Directional 27 deg = round(arctan(1/2) * 180/pi) + D207_PRED, // Directional 207 deg = 180 + 27 D63_PRED, // Directional 63 deg = round(arctan(2/1) * 180/pi) TM_PRED, // True-motion NEARESTMV, diff --git a/vp9/common/vp9_entropymode.c b/vp9/common/vp9_entropymode.c index 3bc8de13d..a75d1a9a4 100644 --- a/vp9/common/vp9_entropymode.c +++ b/vp9/common/vp9_entropymode.c @@ -235,7 +235,7 @@ const vp9_tree_index vp9_intra_mode_tree[INTRA_MODES * 2 - 2] = { -D135_PRED, -D117_PRED, /* 5 = D135_NODE */ -D45_PRED, 14, /* 6 = D45_NODE */ -D63_PRED, 16, /* 7 = D63_NODE */ - -D153_PRED, -D27_PRED /* 8 = D153_NODE */ + -D153_PRED, -D207_PRED /* 8 = D153_NODE */ }; const vp9_tree_index vp9_inter_mode_tree[6] = { diff --git a/vp9/common/vp9_loopfilter.c b/vp9/common/vp9_loopfilter.c index fc527475c..8dcbc6ad2 100644 --- a/vp9/common/vp9_loopfilter.c +++ b/vp9/common/vp9_loopfilter.c @@ -28,7 +28,7 @@ static void lf_init_lut(loop_filter_info_n *lfi) { lfi->mode_lf_lut[D135_PRED] = 0; lfi->mode_lf_lut[D117_PRED] = 0; lfi->mode_lf_lut[D153_PRED] = 0; - lfi->mode_lf_lut[D27_PRED] = 0; + lfi->mode_lf_lut[D207_PRED] = 0; lfi->mode_lf_lut[D63_PRED] = 0; lfi->mode_lf_lut[V_PRED] = 0; lfi->mode_lf_lut[H_PRED] = 0; diff --git a/vp9/common/vp9_mvref_common.c b/vp9/common/vp9_mvref_common.c index e27ba439c..d8381ec48 100644 --- a/vp9/common/vp9_mvref_common.c +++ b/vp9/common/vp9_mvref_common.c @@ -36,7 +36,7 @@ static const int mode_2_counter[MB_MODE_COUNT] = { 9, // D135_PRED 9, // D117_PRED 9, // D153_PRED - 9, // D27_PRED + 9, // D207_PRED 9, // D63_PRED 9, // TM_PRED 0, // NEARESTMV diff --git a/vp9/common/vp9_reconintra.c b/vp9/common/vp9_reconintra.c index 2a1bf5c4e..4a451b909 100644 --- a/vp9/common/vp9_reconintra.c +++ b/vp9/common/vp9_reconintra.c @@ -26,7 +26,7 @@ const TX_TYPE mode2txfm_map[MB_MODE_COUNT] = { ADST_ADST, // D135 ADST_DCT, // D117 DCT_ADST, // D153 - DCT_ADST, // D27 + DCT_ADST, // D207 ADST_DCT, // D63 ADST_ADST, // TM DCT_DCT, // NEARESTMV @@ -297,7 +297,7 @@ static void init_intra_pred_fn_ptrs(void) { intra_pred_allsizes(pred[V_PRED], v); intra_pred_allsizes(pred[H_PRED], h); - intra_pred_allsizes(pred[D27_PRED], d207); + intra_pred_allsizes(pred[D207_PRED], d207); intra_pred_allsizes(pred[D45_PRED], d45); intra_pred_allsizes(pred[D63_PRED], d63); intra_pred_allsizes(pred[D117_PRED], d117); 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; |