Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
0876302e
Commit
0876302e
authored
Feb 14, 2014
by
Deb Mukherjee
Committed by
Gerrit Code Review
Feb 14, 2014
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Make cpi->speed always positive"
parents
5306eda9
56835f1b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
vp9/encoder/vp9_onyx_if.c
vp9/encoder/vp9_onyx_if.c
+1
-1
vp9/encoder/vp9_rdopt.c
vp9/encoder/vp9_rdopt.c
+1
-1
No files found.
vp9/encoder/vp9_onyx_if.c
View file @
0876302e
...
...
@@ -1496,7 +1496,7 @@ void vp9_change_config(VP9_PTR ptr, VP9_CONFIG *oxcf) {
update_layer_context_change_config
(
cpi
,
cpi
->
oxcf
.
target_bandwidth
);
}
cpi
->
speed
=
cpi
->
oxcf
.
cpu_used
;
cpi
->
speed
=
abs
(
cpi
->
oxcf
.
cpu_used
)
;
if
(
cpi
->
oxcf
.
lag_in_frames
==
0
)
{
// Force allow_lag to 0 if lag_in_frames is 0.
...
...
vp9/encoder/vp9_rdopt.c
View file @
0876302e
...
...
@@ -447,7 +447,7 @@ static void model_rd_for_sb(VP9_COMP *cpi, BLOCK_SIZE bsize,
x
->
pred_sse
[
ref
]
=
sse
;
// Fast approximate the modelling function.
if
(
cpi
->
oxcf
.
cpu_used
<
-
4
)
{
if
(
cpi
->
speed
>
4
)
{
int
rate
;
int64_t
dist
;
int64_t
square_error
=
sse
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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