ref: 0d6808044506260f30cfb5f1158c77671a881e17
parent: d91e9f4e369020d301804f39acc400eece894590
parent: 7965a6ea34b128c22c91a87aa19a3b33062a6388
author: Yunqing Wang <yunqingwang@google.com>
date: Fri Aug 2 05:58:46 EDT 2013
Merge "Comment out 2 unused speed features"
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -1671,7 +1671,7 @@
}
}
- 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
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -736,9 +736,9 @@
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;
@@ -797,8 +797,8 @@
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) {--- a/vp9/encoder/vp9_onyx_int.h
+++ b/vp9/encoder/vp9_onyx_int.h
@@ -261,10 +261,10 @@
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;
--
⑨