summaryrefslogtreecommitdiff
path: root/vp9/encoder/vp9_rdopt.c
diff options
context:
space:
mode:
authorDeb Mukherjee <debargha@google.com>2014-02-24 15:21:13 -0800
committerDeb Mukherjee <debargha@google.com>2014-02-25 12:20:59 -0800
commit10bae8251071421618a381f6ca21c835ac893423 (patch)
tree2669174483b6826b06cdbf4c2f04dc7f64c418cd /vp9/encoder/vp9_rdopt.c
parent8cc54d576f64bb78a8d20b9147e09036bfebb2dc (diff)
downloadlibvpx-10bae8251071421618a381f6ca21c835ac893423.tar
libvpx-10bae8251071421618a381f6ca21c835ac893423.tar.gz
libvpx-10bae8251071421618a381f6ca21c835ac893423.tar.bz2
libvpx-10bae8251071421618a381f6ca21c835ac893423.zip
Adds variance based fixed size partitioning
Adds a method for determining a fixed size partition based on variance of a 64x64 SB. This method is added to rtc speed 6. Also fixes a bug in rtc_use_partition() and includes some refactoring related to partitioning search, and some cosmetics. Currently compared to speed 5, the coding efficiency of speed 6 is -19% and that of speed 7 is -55%, in cbr mode. Change-Id: I057e04125a8b765906bb7d4bf7a36d1e575de7c6
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
-rw-r--r--vp9/encoder/vp9_rdopt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index 506afe01a..7fc4fb093 100644
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -295,7 +295,7 @@ void vp9_initialize_rd_consts(VP9_COMP *cpi) {
set_block_thresholds(cpi);
- if (!cpi->sf.use_pick_mode) {
+ if (!cpi->sf.use_nonrd_pick_mode) {
fill_token_costs(x->token_costs, cm->fc.coef_probs);
for (i = 0; i < PARTITION_CONTEXTS; i++)
@@ -303,7 +303,7 @@ void vp9_initialize_rd_consts(VP9_COMP *cpi) {
vp9_partition_tree);
}
- if (!cpi->sf.use_pick_mode || (cm->current_video_frame & 0x07) == 1) {
+ if (!cpi->sf.use_nonrd_pick_mode || (cm->current_video_frame & 0x07) == 1) {
fill_mode_costs(cpi);
if (!frame_is_intra_only(cm)) {