ref: 168d313888ed8f2e752b96b1adf5d2d83d15c056
parent: e931dac733665970949138933b73621e55b321cd
author: Ronald S. Bultje <rbultje@google.com>
date: Thu May 2 09:55:08 EDT 2013
Cache splitmv motion vectors appropriately in decoder. This fixes some problems in splitmv-related bitstream parsing in the sb8x8 experiment. Change-Id: Id168f9ec9c88626877d8f536e6f394b6f4f782e4
--- a/vp9/decoder/vp9_decodemv.c
+++ b/vp9/decoder/vp9_decodemv.c
@@ -692,7 +692,12 @@
if (vp9_segfeature_active(xd, mbmi->segment_id, SEG_LVL_SKIP)) {mbmi->mode = ZEROMV;
} else {- mbmi->mode = mbmi->sb_type > BLOCK_SIZE_MB16X16 ?
+ mbmi->mode =
+#if CONFIG_SB8X8
+ mbmi->sb_type > BLOCK_SIZE_SB8X8 ?
+#else
+ mbmi->sb_type > BLOCK_SIZE_MB16X16 ?
+#endif
read_sb_mv_ref(r, mv_ref_p)
: read_mv_ref(r, mv_ref_p);
vp9_accum_mv_refs(cm, mbmi->mode, mbmi->mb_mode_context[ref_frame]);
@@ -882,7 +887,11 @@
}
*/
-#if !CONFIG_SB8X8
+#if CONFIG_SB8X8
+ mi->bmi[j].as_mv[0].as_int = blockmv.as_int;
+ if (mbmi->second_ref_frame > 0)
+ mi->bmi[j].as_mv[1].as_int = secondmv.as_int;
+#else
{/* Fill (uniform) modes, mvs of jth subset.
Must do it here because ensuing subsets can
--- a/vp9/encoder/vp9_bitstream.c
+++ b/vp9/encoder/vp9_bitstream.c
@@ -765,7 +765,12 @@
// If segment skip is not enabled code the mode.
if (!vp9_segfeature_active(xd, segment_id, SEG_LVL_SKIP)) {- if (mi->sb_type > BLOCK_SIZE_MB16X16) {+#if CONFIG_SB8X8
+ if (mi->sb_type > BLOCK_SIZE_SB8X8)
+#else
+ if (mi->sb_type > BLOCK_SIZE_MB16X16)
+#endif
+ {write_sb_mv_ref(bc, mode, mv_ref_p);
} else {write_mv_ref(bc, mode, mv_ref_p);
--
⑨