Commit 7965a6ea authored by Yunqing Wang's avatar Yunqing Wang
Browse files

Comment out 2 unused speed features

use_min_partition_size and use_max_partition_size are not used
currently, and could be added back if needed later.

Change-Id: Ib22a9c06b064567a7c1d6d5445567ed77e0d3acc
parent 3be9fd91
...@@ -1653,7 +1653,7 @@ static void rd_pick_partition(VP9_COMP *cpi, TOKENEXTRA **tp, int mi_row, ...@@ -1653,7 +1653,7 @@ static void rd_pick_partition(VP9_COMP *cpi, TOKENEXTRA **tp, int mi_row,
} }
} }
if (!cpi->sf.use_max_partition_size || if (!cpi->sf.auto_min_max_partition_size ||
bsize <= cpi->sf.max_partition_size) { bsize <= cpi->sf.max_partition_size) {
int larger_is_better = 0; int larger_is_better = 0;
// PARTITION_NONE // PARTITION_NONE
......
...@@ -734,9 +734,9 @@ void vp9_set_speed_features(VP9_COMP *cpi) { ...@@ -734,9 +734,9 @@ void vp9_set_speed_features(VP9_COMP *cpi) {
sf->auto_min_max_partition_size = 0; sf->auto_min_max_partition_size = 0;
sf->auto_min_max_partition_interval = 0; sf->auto_min_max_partition_interval = 0;
sf->auto_min_max_partition_count = 0; sf->auto_min_max_partition_count = 0;
sf->use_max_partition_size = 0; // sf->use_max_partition_size = 0;
sf->max_partition_size = BLOCK_64X64; sf->max_partition_size = BLOCK_64X64;
sf->use_min_partition_size = 0; // sf->use_min_partition_size = 0;
sf->min_partition_size = BLOCK_4X4; sf->min_partition_size = BLOCK_4X4;
sf->adjust_partitioning_from_last_frame = 0; sf->adjust_partitioning_from_last_frame = 0;
sf->last_partitioning_redo_frequency = 4; sf->last_partitioning_redo_frequency = 4;
...@@ -795,8 +795,8 @@ void vp9_set_speed_features(VP9_COMP *cpi) { ...@@ -795,8 +795,8 @@ void vp9_set_speed_features(VP9_COMP *cpi) {
sf->auto_mv_step_size = 1; sf->auto_mv_step_size = 1;
sf->auto_min_max_partition_size = 1; sf->auto_min_max_partition_size = 1;
sf->use_max_partition_size = 1; // sf->use_max_partition_size = 1;
sf->use_min_partition_size = 1; // sf->use_min_partition_size = 1;
sf->auto_min_max_partition_interval = 1; sf->auto_min_max_partition_interval = 1;
} }
if (speed == 2) { if (speed == 2) {
......
...@@ -261,10 +261,10 @@ typedef struct { ...@@ -261,10 +261,10 @@ typedef struct {
int auto_min_max_partition_size; int auto_min_max_partition_size;
int auto_min_max_partition_interval; int auto_min_max_partition_interval;
int auto_min_max_partition_count; int auto_min_max_partition_count;
int use_min_partition_size;
BLOCK_SIZE_TYPE min_partition_size; BLOCK_SIZE_TYPE min_partition_size;
int use_max_partition_size;
BLOCK_SIZE_TYPE max_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 adjust_partitioning_from_last_frame;
int last_partitioning_redo_frequency; int last_partitioning_redo_frequency;
int disable_splitmv; int disable_splitmv;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment