From 5459f68d7102705c9679dde81e7583760067d373 Mon Sep 17 00:00:00 2001 From: Paul Wilkins Date: Tue, 13 Aug 2013 13:22:13 +0100 Subject: Trivial clean up. Delete unused / commented out variable references. Change-Id: Iaf20c0c3744f89adb296d153b516b5ea41b4f3b4 --- vp9/encoder/vp9_onyx_if.c | 6 ------ vp9/encoder/vp9_onyx_int.h | 2 -- 2 files changed, 8 deletions(-) (limited to 'vp9') diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 7ba322bfc..fd624af47 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -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; } */ diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h index e5b3eb78e..5a78bd9be 100644 --- a/vp9/encoder/vp9_onyx_int.h +++ b/vp9/encoder/vp9_onyx_int.h @@ -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; -- cgit v1.2.3