summaryrefslogtreecommitdiff
path: root/vp9
diff options
context:
space:
mode:
authorJingning Han <jingning@google.com>2014-12-11 17:17:53 -0800
committerJingning Han <jingning@google.com>2014-12-11 17:21:24 -0800
commite2c2a65695af695d67cbcf4c29627b197ebe2713 (patch)
treed598b3c9622f74c5ee6de4232b5032583863d48f /vp9
parentd5c396a902069109f2bfb52891f323be75133ca2 (diff)
downloadlibvpx-e2c2a65695af695d67cbcf4c29627b197ebe2713.tar
libvpx-e2c2a65695af695d67cbcf4c29627b197ebe2713.tar.gz
libvpx-e2c2a65695af695d67cbcf4c29627b197ebe2713.tar.bz2
libvpx-e2c2a65695af695d67cbcf4c29627b197ebe2713.zip
Fix PICK_MODE_CONTEXT index in non-RD coding mode
This commit fixes a bug in the PICK_MODE_CONTEXT index for horizontal partition case. The compression performance change is less than 0.01% level, since most blocks are selected to use square block size in RTC coding mode. Change-Id: I67effc18ae8795fccdd82a55f4efc609fa5cb3e1
Diffstat (limited to 'vp9')
-rw-r--r--vp9/encoder/vp9_encodeframe.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index 7d8d8bdb1..b55ae7a65 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -3124,7 +3124,7 @@ static void nonrd_select_partition(VP9_COMP *cpi,
if (mi_row + hbs < cm->mi_rows) {
pc_tree->horizontal[1].pred_pixel_ready = 1;
nonrd_pick_sb_modes(cpi, tile_data, x, mi_row + hbs, mi_col,
- &this_rdc, subsize, &pc_tree->horizontal[0]);
+ &this_rdc, subsize, &pc_tree->horizontal[1]);
pc_tree->horizontal[1].mic.mbmi = xd->mi[0].src_mi->mbmi;
pc_tree->horizontal[1].skip_txfm[0] = x->skip_txfm[0];
pc_tree->horizontal[1].skip = x->skip;
@@ -3248,7 +3248,7 @@ static void nonrd_use_partition(VP9_COMP *cpi,
if (mi_row + hbs < cm->mi_rows) {
pc_tree->horizontal[1].pred_pixel_ready = 1;
nonrd_pick_sb_modes(cpi, tile_data, x, mi_row + hbs, mi_col,
- dummy_cost, subsize, &pc_tree->horizontal[0]);
+ dummy_cost, subsize, &pc_tree->horizontal[1]);
pc_tree->horizontal[1].mic.mbmi = xd->mi[0].src_mi->mbmi;
pc_tree->horizontal[1].skip_txfm[0] = x->skip_txfm[0];
pc_tree->horizontal[1].skip = x->skip;