ref: b0cd64f18922ef0e8ceb299abac794e5a5e580a0
parent: c0102fd88bb1e36fcf5607612720113e633f08f8
parent: cf8b5a09ed2189f776eb3e137691b70481db6506
author: Jingning Han <jingning@google.com>
date: Tue May 7 11:33:20 EDT 2013
Merge "Add building blocks for partition down to 4x4" into experimental
--- a/configure
+++ b/configure
@@ -250,6 +250,7 @@
multiple_arf
code_zerogroup
non420
+ ab4x4
"
CONFIG_LIST="
external_build
--- a/vp9/common/vp9_blockd.h
+++ b/vp9/common/vp9_blockd.h
@@ -192,7 +192,13 @@
static INLINE int b_width_log2(BLOCK_SIZE_TYPE sb_type) { switch (sb_type) {+#if CONFIG_AB4X4
+ case BLOCK_SIZE_SB4X8:
+#endif
case BLOCK_SIZE_AB4X4: return 0;
+#if CONFIG_AB4X4
+ case BLOCK_SIZE_SB8X4:
+#endif
case BLOCK_SIZE_SB8X8:
case BLOCK_SIZE_SB8X16: return 1;
case BLOCK_SIZE_SB16X8:
@@ -209,7 +215,13 @@
static INLINE int b_height_log2(BLOCK_SIZE_TYPE sb_type) { switch (sb_type) {+#if CONFIG_AB4X4
+ case BLOCK_SIZE_SB8X4:
+#endif
case BLOCK_SIZE_AB4X4: return 0;
+#if CONFIG_AB4X4
+ case BLOCK_SIZE_SB4X8:
+#endif
case BLOCK_SIZE_SB8X8:
case BLOCK_SIZE_SB16X8: return 1;
case BLOCK_SIZE_SB8X16:
--- a/vp9/common/vp9_enums.h
+++ b/vp9/common/vp9_enums.h
@@ -20,6 +20,10 @@
typedef enum BLOCK_SIZE_TYPE {BLOCK_SIZE_AB4X4,
+#if CONFIG_AB4X4
+ BLOCK_SIZE_SB4X8,
+ BLOCK_SIZE_SB8X4,
+#endif
BLOCK_SIZE_SB8X8,
BLOCK_SIZE_SB8X16,
BLOCK_SIZE_SB16X8,
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -2602,14 +2602,10 @@
mbmi->interp_filter = cm->mcomp_filter_type;
vp9_setup_interp_filters(xd, mbmi->interp_filter, &cpi->common);
- // if (!(cpi->ref_frame_flags & flag_list[ref_frame]))
- // continue;
-
if (bsize != BLOCK_SIZE_SB8X8 &&
(this_mode == I4X4_PRED || this_mode == SPLITMV))
continue;
- // if (vp9_mode_order[mode_index].second_ref_frame == INTRA_FRAME)
- // continue;
+
if (comp_pred) { if (ref_frame == ALTREF_FRAME) {--
⑨