generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Trivial clean up."

Browse Source
This commit is contained in:
Guillaume Martres 2013-08-13 12:40:37 -07:00 committed by Gerrit Code Review
commit ecb78b3e0c
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vp9/encoder/vp9_onyx_if.c
View File

@ -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;
}
*/

2
vp9/encoder/vp9_onyx_int.h
View File

@ -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;