ref: f7dab600961bbf1ec0475512f1d009b7b0634ebf
parent: d8c5bceee53e186cd3775d0a31af8298fa7fd427
author: Yaowu Xu <yaowu@google.com>
date: Mon Jan 14 07:11:06 EST 2013
Merge experiment "widerlpf" Change-Id: I0c94475075e66e13cfe4c20fab7db6474441ae86
--- a/configure
+++ b/configure
@@ -250,7 +250,6 @@
cnvcontext
newcoefcontext
enable_6tap
- widerlpf
abovesprefmv
"
CONFIG_LIST="
--- a/vp9/common/vp9_loopfilter.c
+++ b/vp9/common/vp9_loopfilter.c
@@ -252,12 +252,10 @@
(sb_mb_lf_skip(mode_info_context - 1, mode_info_context) ||
tx_size >= TX_32X32))
) {-#if CONFIG_WIDERLPF
if (tx_size >= TX_16X16)
vp9_lpf_mbv_w(y_ptr, u_ptr, v_ptr, post->y_stride,
post->uv_stride, &lfi);
else
-#endif
vp9_loop_filter_mbv(y_ptr, u_ptr, v_ptr, post->y_stride,
post->uv_stride, &lfi);
}
@@ -281,12 +279,10 @@
(sb_mb_lf_skip(mode_info_context - mis, mode_info_context) ||
tx_size >= TX_32X32))
) {-#if CONFIG_WIDERLPF
if (tx_size >= TX_16X16)
vp9_lpf_mbh_w(y_ptr, u_ptr, v_ptr, post->y_stride,
post->uv_stride, &lfi);
else
-#endif
vp9_loop_filter_mbh(y_ptr, u_ptr, v_ptr, post->y_stride,
post->uv_stride, &lfi);
}
--- a/vp9/common/vp9_loopfilter_filters.c
+++ b/vp9/common/vp9_loopfilter_filters.c
@@ -481,7 +481,6 @@
vp9_loop_filter_simple_vertical_edge_c(y_ptr + 12, y_stride, blimit);
}
-#if CONFIG_WIDERLPF
static __inline void wide_mbfilter(int8_t mask, uint8_t hev,
uint8_t flat, uint8_t flat2,
uint8_t *op7, uint8_t *op6, uint8_t *op5,
@@ -720,4 +719,3 @@
lfi->mblim, lfi->lim, lfi->hev_thr, 1);
}
-#endif
--- a/vp9/common/vp9_rtcd_defs.sh
+++ b/vp9/common/vp9_rtcd_defs.sh
@@ -233,13 +233,11 @@
vp9_loop_filter_simple_bh_mmx=vp9_loop_filter_bhs_mmx
vp9_loop_filter_simple_bh_sse2=vp9_loop_filter_bhs_sse2
-if [ "$CONFIG_WIDERLPF" = "yes" ]; then
prototype void vp9_lpf_mbh_w "unsigned char *y_ptr, unsigned char *u_ptr, unsigned char *v_ptr, int y_stride, int uv_stride, struct loop_filter_info *lfi"
specialize vp9_lpf_mbh_w sse2
prototype void vp9_lpf_mbv_w "unsigned char *y_ptr, unsigned char *u_ptr, unsigned char *v_ptr, int y_stride, int uv_stride, struct loop_filter_info *lfi"
specialize vp9_lpf_mbv_w sse2
-fi
#
# post proc
--- a/vp9/common/x86/vp9_loopfilter_x86.c
+++ b/vp9/common/x86/vp9_loopfilter_x86.c
@@ -86,7 +86,6 @@
#if HAVE_SSE2
-#if CONFIG_WIDERLPF
void vp9_mb_lpf_horizontal_edge_w_sse2(unsigned char *s,
int p,
const unsigned char *_blimit,
@@ -559,7 +558,6 @@
}
}
}
-#endif
void vp9_mbloop_filter_horizontal_edge_sse2(unsigned char *s,
int p,
@@ -1038,7 +1036,6 @@
transpose(src, 16, dst, p, 2);
}
-#if CONFIG_WIDERLPF
void vp9_mb_lpf_vertical_edge_w_sse2(unsigned char *s,
int p,
const unsigned char *blimit,
@@ -1069,8 +1066,8 @@
/* Transpose 16x16 */
transpose(src, 16, dst, p, 4);
}
-#endif
+
void vp9_mbloop_filter_vertical_edge_uv_sse2(unsigned char *u,
int p,
const unsigned char *blimit,
@@ -1113,7 +1110,7 @@
lfi->lim, lfi->hev_thr, v_ptr);
}
-#if CONFIG_WIDERLPF
+
void vp9_lpf_mbh_w_sse2(unsigned char *y_ptr, unsigned char *u_ptr,
unsigned char *v_ptr, int y_stride, int uv_stride,
struct loop_filter_info *lfi) {@@ -1125,8 +1122,8 @@
vp9_mbloop_filter_horizontal_edge_uv_sse2(u_ptr, uv_stride, lfi->mblim,
lfi->lim, lfi->hev_thr, v_ptr);
}
-#endif
+
void vp9_loop_filter_bh8x8_sse2(unsigned char *y_ptr, unsigned char *u_ptr,
unsigned char *v_ptr, int y_stride, int uv_stride,
struct loop_filter_info *lfi) {@@ -1152,7 +1149,7 @@
lfi->lim, lfi->hev_thr, v_ptr);
}
-#if CONFIG_WIDERLPF
+
void vp9_lpf_mbv_w_sse2(unsigned char *y_ptr, unsigned char *u_ptr,
unsigned char *v_ptr, int y_stride, int uv_stride,
struct loop_filter_info *lfi) {@@ -1164,7 +1161,7 @@
vp9_mbloop_filter_vertical_edge_uv_sse2(u_ptr, uv_stride, lfi->mblim,
lfi->lim, lfi->hev_thr, v_ptr);
}
-#endif
+
void vp9_loop_filter_bv8x8_sse2(unsigned char *y_ptr, unsigned char *u_ptr,
unsigned char *v_ptr, int y_stride, int uv_stride,