ref: ecb78b3e0c2de8dbe1ee9eaea56a5355dbf92a35
parent: 7e0f88b6be2784309bead554ef190096ac0a58c1
parent: 5459f68d7102705c9679dde81e7583760067d373
author: Guillaume Martres <gmartres@google.com>
date: Tue Aug 13 08:40:37 EDT 2013
Merge "Trivial clean up."
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -730,9 +730,7 @@
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 @@
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 @@
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;
}
*/
--- a/vp9/encoder/vp9_onyx_int.h
+++ b/vp9/encoder/vp9_onyx_int.h
@@ -275,8 +275,6 @@
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;
--
⑨