From 80e5326cf2a63b017e65400121c9128f0e232693 Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Thu, 22 May 2014 16:17:59 -0700 Subject: [PATCH] Use offset mode info when filling pc tree. Use the appropriate subblock offset mode info rather than the parent block base, when filling mbmi in the pc tree in nonrd_use_partition. This mimics what is done in the vertical case and what is done for both cases in nonrd_pick_partition. This change has little practical effect at the moment since in speed 5 rt horizontal and vertical partitions are currently only used unpaired at edges of the picture. Change-Id: I4632f66ca84086dac56c7d36b45ddbe38a06f42a --- vp9/encoder/vp9_encodeframe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index cca17592e..ef0871873 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -2870,7 +2870,7 @@ static void nonrd_use_partition(VP9_COMP *cpi, if (mi_row + hbs < cm->mi_rows) { nonrd_pick_sb_modes(cpi, tile, mi_row + hbs, mi_col, &rate, &dist, subsize); - pc_tree->horizontal[1].mic.mbmi = mi[0]->mbmi; + pc_tree->horizontal[1].mic.mbmi = xd->mi[0]->mbmi; if (rate != INT_MAX && dist != INT64_MAX && *totrate != INT_MAX && *totdist != INT64_MAX) { *totrate += rate;