ref: ed5755445c7624c67236d08b7435e0c72f27f0a4
parent: bac4113c42f26f0d19096009118bb0dcf55e1a91
author: Deb Mukherjee <[email protected]>
date: Thu Feb 27 07:09:12 EST 2014
Turns variance based partitioning on in Speed 7 Improves coding efficiency by about 1%, increases speed by about 15-20% over exsiting speed 7. Change-Id: Ibf5b9b5a5c8548e863ce19047c42b579aac21d19
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -141,14 +141,12 @@
unsigned int var = get_sby_perpixel_diff_variance(cpi, &cpi->mb,
mi_row, mi_col,
BLOCK_64X64);
- if (var < 8)
+ if (var < 4)
return BLOCK_64X64;
- else if (var < 64)
+ else if (var < 10)
return BLOCK_32X32;
- else if (var < 2048)
- return BLOCK_16X16;
else
- return BLOCK_8X8;
+ return BLOCK_16X16;
}
// Original activity measure from Tim T's code.
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -855,8 +855,7 @@
sf->partition_search_type = VAR_BASED_FIXED_PARTITION;
}
if (speed >= 7) {
- sf->partition_search_type = FIXED_PARTITION;
- sf->always_this_block_size = BLOCK_16X16;
+ sf->partition_search_type = VAR_BASED_FIXED_PARTITION;
sf->use_nonrd_pick_mode = 1;
}
}