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
ecb78b3e
Commit
ecb78b3e
authored
Aug 13, 2013
by
Guillaume Martres
Committed by
Gerrit Code Review
Aug 13, 2013
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Trivial clean up."
parents
7e0f88b6
5459f68d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
8 deletions
+0
-8
vp9/encoder/vp9_onyx_if.c
vp9/encoder/vp9_onyx_if.c
+0
-6
vp9/encoder/vp9_onyx_int.h
vp9/encoder/vp9_onyx_int.h
+0
-2
No files found.
vp9/encoder/vp9_onyx_if.c
View file @
ecb78b3e
...
...
@@ -730,9 +730,7 @@ void vp9_set_speed_features(VP9_COMP *cpi) {
sf
->
auto_min_max_partition_size
=
0
;
sf
->
auto_min_max_partition_interval
=
0
;
sf
->
auto_min_max_partition_count
=
0
;
// sf->use_max_partition_size = 0;
sf
->
max_partition_size
=
BLOCK_64X64
;
// sf->use_min_partition_size = 0;
sf
->
min_partition_size
=
BLOCK_4X4
;
sf
->
adjust_partitioning_from_last_frame
=
0
;
sf
->
last_partitioning_redo_frequency
=
4
;
...
...
@@ -794,8 +792,6 @@ void vp9_set_speed_features(VP9_COMP *cpi) {
sf
->
auto_mv_step_size
=
1
;
sf
->
auto_min_max_partition_size
=
1
;
// sf->use_max_partition_size = 1;
// sf->use_min_partition_size = 1;
sf
->
auto_min_max_partition_interval
=
1
;
}
if
(
speed
==
2
)
{
...
...
@@ -883,13 +879,11 @@ void vp9_set_speed_features(VP9_COMP *cpi) {
if (speed == 2) {
sf->first_step = 0;
sf->comp_inter_joint_search_thresh = BLOCK_8X8;
sf->use_max_partition_size = 1;
sf->max_partition_size = BLOCK_16X16;
}
if (speed == 3) {
sf->first_step = 0;
sf->comp_inter_joint_search_thresh = BLOCK_B8X8;
sf->use_min_partition_size = 1;
sf->min_partition_size = BLOCK_8X8;
}
*/
...
...
vp9/encoder/vp9_onyx_int.h
View file @
ecb78b3e
...
...
@@ -275,8 +275,6 @@ typedef struct {
int
auto_min_max_partition_count
;
BLOCK_SIZE_TYPE
min_partition_size
;
BLOCK_SIZE_TYPE
max_partition_size
;
// int use_min_partition_size; // not used in code
// int use_max_partition_size;
int
adjust_partitioning_from_last_frame
;
int
last_partitioning_redo_frequency
;
int
disable_splitmv
;
...
...
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