summaryrefslogtreecommitdiff
path: root/vp9/common
diff options
context:
space:
mode:
authorJingning Han <jingning@google.com>2013-05-11 15:19:56 -0700
committerJingning Han <jingning@google.com>2013-05-11 15:22:13 -0700
commit6910f178f1ca405157390abd6525d0bc81bcafb6 (patch)
tree5ea9ee11a29074f087e61e2afddaeac459775235 /vp9/common
parent4c2c350309d65b1e46454464c87040bc60a03b8b (diff)
downloadlibvpx-6910f178f1ca405157390abd6525d0bc81bcafb6.tar
libvpx-6910f178f1ca405157390abd6525d0bc81bcafb6.tar.gz
libvpx-6910f178f1ca405157390abd6525d0bc81bcafb6.tar.bz2
libvpx-6910f178f1ca405157390abd6525d0bc81bcafb6.zip
Use consistent partition context setup in enc/dec
Move set_partition_seg_context_ to common file. Use consistent context setup conditions for partition probability model update at encoder and decoder. Change-Id: I24b7ed3b1c48e3d2568191a46b70136b99b67b1a
Diffstat (limited to 'vp9/common')
-rw-r--r--vp9/common/vp9_onyxc_int.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h
index 57f9978f4..2d4cd30cc 100644
--- a/vp9/common/vp9_onyxc_int.h
+++ b/vp9/common/vp9_onyxc_int.h
@@ -306,6 +306,13 @@ static int mi_cols_aligned_to_sb(VP9_COMMON *cm) {
return 2 * ((cm->mb_cols + 3) & ~3);
}
+static INLINE void set_partition_seg_context(VP9_COMMON *cm,
+ MACROBLOCKD *xd,
+ int mi_row, int mi_col) {
+ xd->above_seg_context = cm->above_seg_context + mi_col;
+ xd->left_seg_context = cm->left_seg_context + (mi_row & MI_MASK);
+}
+
static void set_mi_row_col(VP9_COMMON *cm, MACROBLOCKD *xd,
int mi_row, int bh,
int mi_col, int bw) {