diff options
| author | Yunqing Wang <yunqingwang@google.com> | 2013-08-01 11:03:34 -0700 |
|---|---|---|
| committer | Yunqing Wang <yunqingwang@google.com> | 2013-08-01 11:03:34 -0700 |
| commit | 7965a6ea34b128c22c91a87aa19a3b33062a6388 (patch) | |
| tree | 09bcacf5e57408645f07d5da1658fe4587148649 | |
| parent | 3be9fd912086d396edb8ea0b9055f151e6ee4354 (diff) | |
| download | libvpx-7965a6ea34b128c22c91a87aa19a3b33062a6388.tar libvpx-7965a6ea34b128c22c91a87aa19a3b33062a6388.tar.gz libvpx-7965a6ea34b128c22c91a87aa19a3b33062a6388.tar.bz2 libvpx-7965a6ea34b128c22c91a87aa19a3b33062a6388.zip | |
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
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 8 | ||||
| -rw-r--r-- | vp9/encoder/vp9_onyx_int.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index fb1b527f1..f6521740b 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -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) { int larger_is_better = 0; // PARTITION_NONE diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 78992cfff..62781cfa6 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -734,9 +734,9 @@ 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->use_max_partition_size = 0; 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->adjust_partitioning_from_last_frame = 0; sf->last_partitioning_redo_frequency = 4; @@ -795,8 +795,8 @@ 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->use_max_partition_size = 1; + // sf->use_min_partition_size = 1; sf->auto_min_max_partition_interval = 1; } if (speed == 2) { diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h index f4d8db4e1..4529ff083 100644 --- a/vp9/encoder/vp9_onyx_int.h +++ b/vp9/encoder/vp9_onyx_int.h @@ -261,10 +261,10 @@ typedef struct { int auto_min_max_partition_size; int auto_min_max_partition_interval; int auto_min_max_partition_count; - int use_min_partition_size; BLOCK_SIZE_TYPE min_partition_size; - int use_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 last_partitioning_redo_frequency; int disable_splitmv; |