summaryrefslogtreecommitdiff
path: root/vp9/encoder
diff options
context:
space:
mode:
authorAlex Converse <aconverse@google.com>2014-05-22 16:17:59 -0700
committerAlex Converse <aconverse@google.com>2014-05-22 16:24:40 -0700
commit80e5326cf2a63b017e65400121c9128f0e232693 (patch)
treea6055dc79df3ae23b6175dac0f2bc209eaa691b6 /vp9/encoder
parent00fbdc159b1ac4896a57a8ef5665a24df4a06e19 (diff)
downloadlibvpx-80e5326cf2a63b017e65400121c9128f0e232693.tar
libvpx-80e5326cf2a63b017e65400121c9128f0e232693.tar.gz
libvpx-80e5326cf2a63b017e65400121c9128f0e232693.tar.bz2
libvpx-80e5326cf2a63b017e65400121c9128f0e232693.zip
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
Diffstat (limited to 'vp9/encoder')
-rw-r--r--vp9/encoder/vp9_encodeframe.c2
1 files changed, 1 insertions, 1 deletions
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;