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
69d2fb85
Commit
69d2fb85
authored
May 12, 2014
by
Yaowu Xu
Committed by
Gerrit Code Review
May 12, 2014
Browse files
Merge "Change to use proper type"
parents
c80287f0
26cb7bee
Changes
2
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_rdopt.c
View file @
69d2fb85
...
...
@@ -806,7 +806,7 @@ static void choose_txfm_size_from_rd(VP9_COMP *cpi, MACROBLOCK *x,
{
INT64_MAX
,
INT64_MAX
},
{
INT64_MAX
,
INT64_MAX
},
{
INT64_MAX
,
INT64_MAX
}};
int
n
,
m
;
TX_SIZE
n
,
m
;
int
s0
,
s1
;
const
TX_SIZE
max_mode_tx_size
=
tx_mode_to_biggest_tx_size
[
cm
->
tx_mode
];
int64_t
best_rd
=
INT64_MAX
;
...
...
@@ -889,7 +889,7 @@ static void choose_txfm_size_from_modelrd(VP9_COMP *cpi, MACROBLOCK *x,
{
INT64_MAX
,
INT64_MAX
},
{
INT64_MAX
,
INT64_MAX
},
{
INT64_MAX
,
INT64_MAX
}};
int
n
,
m
;
TX_SIZE
n
,
m
;
int
s0
,
s1
;
double
scale_rd
[
TX_SIZES
]
=
{
1
.
73
,
1
.
44
,
1
.
20
,
1
.
00
};
const
TX_SIZE
max_mode_tx_size
=
tx_mode_to_biggest_tx_size
[
cm
->
tx_mode
];
...
...
vp9/encoder/vp9_speed_features.h
View file @
69d2fb85
...
...
@@ -176,7 +176,7 @@ typedef struct SPEED_FEATURES {
// a log search that iterates 4 times (check around mv for last for best
// error of combined predictor then check around mv for alt). If 0 we
// we just use the best motion vector found for each frame by itself.
int
comp_inter_joint_search_thresh
;
BLOCK_SIZE
comp_inter_joint_search_thresh
;
// This variable is used to cap the maximum number of times we skip testing a
// mode to be evaluated. A high value means we will be faster.
...
...
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