Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
78e670fc
Commit
78e670fc
authored
Aug 27, 2013
by
Dmitry Kovalev
Committed by
Gerrit Code Review
Aug 27, 2013
Browse files
Merge "Renaming D27 to D207."
parents
45125ee5
50ee61db
Changes
9
Hide whitespace changes
Inline
Side-by-side
vp9/common/vp9_blockd.h
View file @
78e670fc
...
...
@@ -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)
D2
0
7_PRED
,
// Directional 2
0
7 deg =
180 + 27
D63_PRED
,
// Directional 63 deg = round(arctan(2/1) * 180/pi)
TM_PRED
,
// True-motion
NEARESTMV
,
...
...
vp9/common/vp9_entropymode.c
View file @
78e670fc
...
...
@@ -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
,
-
D2
0
7_PRED
/* 8 = D153_NODE */
};
const
vp9_tree_index
vp9_inter_mode_tree
[
6
]
=
{
...
...
vp9/common/vp9_loopfilter.c
View file @
78e670fc
...
...
@@ -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
[
D2
0
7_PRED
]
=
0
;
lfi
->
mode_lf_lut
[
D63_PRED
]
=
0
;
lfi
->
mode_lf_lut
[
V_PRED
]
=
0
;
lfi
->
mode_lf_lut
[
H_PRED
]
=
0
;
...
...
vp9/common/vp9_mvref_common.c
View file @
78e670fc
...
...
@@ -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
,
// D2
0
7_PRED
9
,
// D63_PRED
9
,
// TM_PRED
0
,
// NEARESTMV
...
...
vp9/common/vp9_reconintra.c
View file @
78e670fc
...
...
@@ -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
,
// D2
0
7
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
[
D2
0
7_PRED
],
d207
);
intra_pred_allsizes
(
pred
[
D45_PRED
],
d45
);
intra_pred_allsizes
(
pred
[
D63_PRED
],
d63
);
intra_pred_allsizes
(
pred
[
D117_PRED
],
d117
);
...
...
vp9/encoder/vp9_encodeframe.c
View file @
78e670fc
...
...
@@ -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_D2
0
7_PRED
/*D2
0
7_PRED*/
,
THR_D63_PRED
/*D63_PRED*/
,
THR_TM
/*TM_PRED*/
,
THR_B_PRED
/*I4X4_PRED*/
,
...
...
vp9/encoder/vp9_onyx_if.c
View file @
78e670fc
...
...
@@ -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_D2
0
7_PRED
]
+=
speed_multiplier
*
2500
;
sf
->
thresh_mult
[
THR_D63_PRED
]
+=
speed_multiplier
*
2500
;
if
(
cpi
->
sf
.
skip_lots_of_modes
)
{
...
...
vp9/encoder/vp9_onyx_int.h
View file @
78e670fc
...
...
@@ -182,7 +182,7 @@ typedef enum {
THR_H_PRED
,
THR_V_PRED
,
THR_D135_PRED
,
THR_D27_PRED
,
THR_D2
0
7_PRED
,
THR_D153_PRED
,
THR_D63_PRED
,
THR_D117_PRED
,
...
...
vp9/encoder/vp9_rdopt.c
View file @
78e670fc
...
...
@@ -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
},
{
D2
0
7_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
==
D2
0
7_PRED
&&
best_intra_mode
!=
H_PRED
&&
best_intra_mode
!=
D45_PRED
)
return
1
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment