Commit 40136453 authored by hui su's avatar hui su

Replace prefix vp9_ with vpx_ for intra prediction functions

Change-Id: I8ae6fb586f8d5d018ace228df11714f82b085076
parent 7971846a
......@@ -164,8 +164,8 @@ endif # VP9
LIBVPX_TEST_SRCS-$(CONFIG_ENCODERS) += sad_test.cc
TEST_INTRA_PRED_SPEED_SRCS-$(CONFIG_VP9_DECODER) := test_intra_pred_speed.cc
TEST_INTRA_PRED_SPEED_SRCS-$(CONFIG_VP9_DECODER) += ../md5_utils.h ../md5_utils.c
TEST_INTRA_PRED_SPEED_SRCS-$(CONFIG_VP9) := test_intra_pred_speed.cc
TEST_INTRA_PRED_SPEED_SRCS-$(CONFIG_VP9) += ../md5_utils.h ../md5_utils.c
endif # CONFIG_SHARED
......
This diff is collapsed.
This diff is collapsed.
......@@ -66,10 +66,10 @@ static intra_high_pred_fn dc_pred_high[2][2][4];
static void vp9_init_intra_predictors_internal(void) {
#define INIT_ALL_SIZES(p, type) \
p[TX_4X4] = vp9_##type##_predictor_4x4; \
p[TX_8X8] = vp9_##type##_predictor_8x8; \
p[TX_16X16] = vp9_##type##_predictor_16x16; \
p[TX_32X32] = vp9_##type##_predictor_32x32
p[TX_4X4] = vpx_##type##_predictor_4x4; \
p[TX_8X8] = vpx_##type##_predictor_8x8; \
p[TX_16X16] = vpx_##type##_predictor_16x16; \
p[TX_32X32] = vpx_##type##_predictor_32x32
INIT_ALL_SIZES(pred[V_PRED], v);
INIT_ALL_SIZES(pred[H_PRED], h);
......
This diff is collapsed.
This diff is collapsed.
......@@ -247,7 +247,7 @@ static INLINE void dc_predictor(uint8_t *dst, ptrdiff_t stride, int bs,
}
}
void vp9_d207_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride,
void vpx_d207_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride,
const uint8_t *above, const uint8_t *left) {
const int I = left[0];
const int J = left[1];
......@@ -264,7 +264,7 @@ void vp9_d207_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride,
DST(0, 3) = DST(1, 3) = DST(2, 3) = DST(3, 3) = L;
}
void vp9_d63_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride,
void vpx_d63_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride,
const uint8_t *above, const uint8_t *left) {
const int A = above[0];
const int B = above[1];
......@@ -287,7 +287,7 @@ void vp9_d63_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride,
DST(3, 3) = AVG3(E, F, G); // differs from vp8
}
void vp9_d45_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride,
void vpx_d45_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride,
const uint8_t *above, const uint8_t *left) {
const int A = above[0];
const int B = above[1];
......@@ -308,7 +308,7 @@ void vp9_d45_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride,
DST(3, 3) = H; // differs from vp8
}
void vp9_d117_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride,
void vpx_d117_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride,
const uint8_t *above, const uint8_t *left) {
const int I = left[0];
const int J = left[1];
......@@ -331,7 +331,7 @@ void vp9_d117_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride,
DST(3, 1) = AVG3(B, C, D);
}
void vp9_d135_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride,
void vpx_d135_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride,
const uint8_t *above, const uint8_t *left) {
const int I = left[0];
const int J = left[1];
......@@ -352,7 +352,7 @@ void vp9_d135_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride,
DST(3, 0) = AVG3(D, C, B);
}
void vp9_d153_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride,
void vpx_d153_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride,
const uint8_t *above, const uint8_t *left) {
const int I = left[0];
const int J = left[1];
......@@ -629,7 +629,7 @@ static INLINE void highbd_dc_predictor(uint16_t *dst, ptrdiff_t stride,
// can be unified and accessed as a pointer array. Note that the boundary
// above and left are not necessarily used all the time.
#define intra_pred_sized(type, size) \
void vp9_##type##_predictor_##size##x##size##_c(uint8_t *dst, \
void vpx_##type##_predictor_##size##x##size##_c(uint8_t *dst, \
ptrdiff_t stride, \
const uint8_t *above, \
const uint8_t *left) { \
......@@ -638,7 +638,7 @@ static INLINE void highbd_dc_predictor(uint16_t *dst, ptrdiff_t stride,
#if CONFIG_VP9_HIGHBITDEPTH
#define intra_pred_highbd_sized(type, size) \
void vp9_highbd_##type##_predictor_##size##x##size##_c( \
void vpx_highbd_##type##_predictor_##size##x##size##_c( \
uint16_t *dst, ptrdiff_t stride, const uint16_t *above, \
const uint16_t *left, int bd) { \
highbd_##type##_predictor(dst, stride, size, above, left, bd); \
......
......@@ -11,7 +11,7 @@
#include "vpx_dsp/mips/common_dspr2.h"
#if HAVE_DSPR2
void vp9_h_predictor_16x16_dspr2(uint8_t *dst, ptrdiff_t stride,
void vpx_h_predictor_16x16_dspr2(uint8_t *dst, ptrdiff_t stride,
const uint8_t *above, const uint8_t *left) {
int32_t tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7, tmp8;
int32_t tmp9, tmp10, tmp11, tmp12, tmp13, tmp14, tmp15, tmp16;
......@@ -158,7 +158,7 @@ void vp9_h_predictor_16x16_dspr2(uint8_t *dst, ptrdiff_t stride,
);
}
void vp9_dc_predictor_16x16_dspr2(uint8_t *dst, ptrdiff_t stride,
void vpx_dc_predictor_16x16_dspr2(uint8_t *dst, ptrdiff_t stride,
const uint8_t *above, const uint8_t *left) {
int32_t expected_dc;
int32_t average;
......
......@@ -27,7 +27,7 @@ void vpx_dsputil_static_init(void) {
vpx_ff_cropTbl = &vpx_ff_cropTbl_a[CROP_WIDTH];
}
void vp9_h_predictor_4x4_dspr2(uint8_t *dst, ptrdiff_t stride,
void vpx_h_predictor_4x4_dspr2(uint8_t *dst, ptrdiff_t stride,
const uint8_t *above, const uint8_t *left) {
int32_t tmp1, tmp2, tmp3, tmp4;
......@@ -54,7 +54,7 @@ void vp9_h_predictor_4x4_dspr2(uint8_t *dst, ptrdiff_t stride,
);
}
void vp9_dc_predictor_4x4_dspr2(uint8_t *dst, ptrdiff_t stride,
void vpx_dc_predictor_4x4_dspr2(uint8_t *dst, ptrdiff_t stride,
const uint8_t *above, const uint8_t *left) {
int32_t expected_dc;
int32_t average;
......@@ -96,7 +96,7 @@ void vp9_dc_predictor_4x4_dspr2(uint8_t *dst, ptrdiff_t stride,
);
}
void vp9_tm_predictor_4x4_dspr2(uint8_t *dst, ptrdiff_t stride,
void vpx_tm_predictor_4x4_dspr2(uint8_t *dst, ptrdiff_t stride,
const uint8_t *above, const uint8_t *left) {
int32_t abovel, abover;
int32_t left0, left1, left2, left3;
......
......@@ -11,7 +11,7 @@
#include "vpx_dsp/mips/common_dspr2.h"
#if HAVE_DSPR2
void vp9_h_predictor_8x8_dspr2(uint8_t *dst, ptrdiff_t stride,
void vpx_h_predictor_8x8_dspr2(uint8_t *dst, ptrdiff_t stride,
const uint8_t *above, const uint8_t *left) {
int32_t tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7, tmp8;
......@@ -67,7 +67,7 @@ void vp9_h_predictor_8x8_dspr2(uint8_t *dst, ptrdiff_t stride,
);
}
void vp9_dc_predictor_8x8_dspr2(uint8_t *dst, ptrdiff_t stride,
void vpx_dc_predictor_8x8_dspr2(uint8_t *dst, ptrdiff_t stride,
const uint8_t *above, const uint8_t *left) {
int32_t expected_dc;
int32_t average;
......@@ -150,7 +150,7 @@ void vp9_dc_predictor_8x8_dspr2(uint8_t *dst, ptrdiff_t stride,
);
}
void vp9_tm_predictor_8x8_dspr2(uint8_t *dst, ptrdiff_t stride,
void vpx_tm_predictor_8x8_dspr2(uint8_t *dst, ptrdiff_t stride,
const uint8_t *above, const uint8_t *left) {
int32_t abovel, abover;
int32_t abovel_1, abover_1;
......
......@@ -550,125 +550,125 @@ static void intra_predict_tm_32x32_msa(const uint8_t *src_top,
}
}
void vp9_v_predictor_4x4_msa(uint8_t *dst, ptrdiff_t y_stride,
void vpx_v_predictor_4x4_msa(uint8_t *dst, ptrdiff_t y_stride,
const uint8_t *above, const uint8_t *left) {
(void)left;
intra_predict_vert_4x4_msa(above, dst, y_stride);
}
void vp9_v_predictor_8x8_msa(uint8_t *dst, ptrdiff_t y_stride,
void vpx_v_predictor_8x8_msa(uint8_t *dst, ptrdiff_t y_stride,
const uint8_t *above, const uint8_t *left) {
(void)left;
intra_predict_vert_8x8_msa(above, dst, y_stride);
}
void vp9_v_predictor_16x16_msa(uint8_t *dst, ptrdiff_t y_stride,
void vpx_v_predictor_16x16_msa(uint8_t *dst, ptrdiff_t y_stride,
const uint8_t *above, const uint8_t *left) {
(void)left;
intra_predict_vert_16x16_msa(above, dst, y_stride);
}
void vp9_v_predictor_32x32_msa(uint8_t *dst, ptrdiff_t y_stride,
void vpx_v_predictor_32x32_msa(uint8_t *dst, ptrdiff_t y_stride,
const uint8_t *above, const uint8_t *left) {
(void)left;
intra_predict_vert_32x32_msa(above, dst, y_stride);
}
void vp9_h_predictor_4x4_msa(uint8_t *dst, ptrdiff_t y_stride,
void vpx_h_predictor_4x4_msa(uint8_t *dst, ptrdiff_t y_stride,
const uint8_t *above, const uint8_t *left) {
(void)above;
intra_predict_horiz_4x4_msa(left, dst, y_stride);
}
void vp9_h_predictor_8x8_msa(uint8_t *dst, ptrdiff_t y_stride,
void vpx_h_predictor_8x8_msa(uint8_t *dst, ptrdiff_t y_stride,
const uint8_t *above, const uint8_t *left) {
(void)above;
intra_predict_horiz_8x8_msa(left, dst, y_stride);
}
void vp9_h_predictor_16x16_msa(uint8_t *dst, ptrdiff_t y_stride,
void vpx_h_predictor_16x16_msa(uint8_t *dst, ptrdiff_t y_stride,
const uint8_t *above, const uint8_t *left) {
(void)above;
intra_predict_horiz_16x16_msa(left, dst, y_stride);
}
void vp9_h_predictor_32x32_msa(uint8_t *dst, ptrdiff_t y_stride,
void vpx_h_predictor_32x32_msa(uint8_t *dst, ptrdiff_t y_stride,
const uint8_t *above, const uint8_t *left) {
(void)above;
intra_predict_horiz_32x32_msa(left, dst, y_stride);
}
void vp9_dc_predictor_4x4_msa(uint8_t *dst, ptrdiff_t y_stride,
void vpx_dc_predictor_4x4_msa(uint8_t *dst, ptrdiff_t y_stride,
const uint8_t *above, const uint8_t *left) {
intra_predict_dc_4x4_msa(above, left, dst, y_stride);
}
void vp9_dc_predictor_8x8_msa(uint8_t *dst, ptrdiff_t y_stride,
void vpx_dc_predictor_8x8_msa(uint8_t *dst, ptrdiff_t y_stride,
const uint8_t *above, const uint8_t *left) {
intra_predict_dc_8x8_msa(above, left, dst, y_stride);
}
void vp9_dc_predictor_16x16_msa(uint8_t *dst, ptrdiff_t y_stride,
void vpx_dc_predictor_16x16_msa(uint8_t *dst, ptrdiff_t y_stride,
const uint8_t *above, const uint8_t *left) {
intra_predict_dc_16x16_msa(above, left, dst, y_stride);
}
void vp9_dc_predictor_32x32_msa(uint8_t *dst, ptrdiff_t y_stride,
void vpx_dc_predictor_32x32_msa(uint8_t *dst, ptrdiff_t y_stride,
const uint8_t *above, const uint8_t *left) {
intra_predict_dc_32x32_msa(above, left, dst, y_stride);
}
void vp9_dc_top_predictor_4x4_msa(uint8_t *dst, ptrdiff_t y_stride,
void vpx_dc_top_predictor_4x4_msa(uint8_t *dst, ptrdiff_t y_stride,
const uint8_t *above, const uint8_t *left) {
(void)left;
intra_predict_dc_tl_4x4_msa(above, dst, y_stride);
}
void vp9_dc_top_predictor_8x8_msa(uint8_t *dst, ptrdiff_t y_stride,
void vpx_dc_top_predictor_8x8_msa(uint8_t *dst, ptrdiff_t y_stride,
const uint8_t *above, const uint8_t *left) {
(void)left;
intra_predict_dc_tl_8x8_msa(above, dst, y_stride);
}
void vp9_dc_top_predictor_16x16_msa(uint8_t *dst, ptrdiff_t y_stride,
void vpx_dc_top_predictor_16x16_msa(uint8_t *dst, ptrdiff_t y_stride,
const uint8_t *above, const uint8_t *left) {
(void)left;
intra_predict_dc_tl_16x16_msa(above, dst, y_stride);
}
void vp9_dc_top_predictor_32x32_msa(uint8_t *dst, ptrdiff_t y_stride,
void vpx_dc_top_predictor_32x32_msa(uint8_t *dst, ptrdiff_t y_stride,
const uint8_t *above, const uint8_t *left) {
(void)left;
intra_predict_dc_tl_32x32_msa(above, dst, y_stride);
}
void vp9_dc_left_predictor_4x4_msa(uint8_t *dst, ptrdiff_t y_stride,
void vpx_dc_left_predictor_4x4_msa(uint8_t *dst, ptrdiff_t y_stride,
const uint8_t *above, const uint8_t *left) {
(void)above;
intra_predict_dc_tl_4x4_msa(left, dst, y_stride);
}
void vp9_dc_left_predictor_8x8_msa(uint8_t *dst, ptrdiff_t y_stride,
void vpx_dc_left_predictor_8x8_msa(uint8_t *dst, ptrdiff_t y_stride,
const uint8_t *above, const uint8_t *left) {
(void)above;
intra_predict_dc_tl_8x8_msa(left, dst, y_stride);
}
void vp9_dc_left_predictor_16x16_msa(uint8_t *dst, ptrdiff_t y_stride,
void vpx_dc_left_predictor_16x16_msa(uint8_t *dst, ptrdiff_t y_stride,
const uint8_t *above,
const uint8_t *left) {
(void)above;
......@@ -676,7 +676,7 @@ void vp9_dc_left_predictor_16x16_msa(uint8_t *dst, ptrdiff_t y_stride,
intra_predict_dc_tl_16x16_msa(left, dst, y_stride);
}
void vp9_dc_left_predictor_32x32_msa(uint8_t *dst, ptrdiff_t y_stride,
void vpx_dc_left_predictor_32x32_msa(uint8_t *dst, ptrdiff_t y_stride,
const uint8_t *above,
const uint8_t *left) {
(void)above;
......@@ -684,7 +684,7 @@ void vp9_dc_left_predictor_32x32_msa(uint8_t *dst, ptrdiff_t y_stride,
intra_predict_dc_tl_32x32_msa(left, dst, y_stride);
}
void vp9_dc_128_predictor_4x4_msa(uint8_t *dst, ptrdiff_t y_stride,
void vpx_dc_128_predictor_4x4_msa(uint8_t *dst, ptrdiff_t y_stride,
const uint8_t *above, const uint8_t *left) {
(void)above;
(void)left;
......@@ -692,7 +692,7 @@ void vp9_dc_128_predictor_4x4_msa(uint8_t *dst, ptrdiff_t y_stride,
intra_predict_128dc_4x4_msa(dst, y_stride);
}
void vp9_dc_128_predictor_8x8_msa(uint8_t *dst, ptrdiff_t y_stride,
void vpx_dc_128_predictor_8x8_msa(uint8_t *dst, ptrdiff_t y_stride,
const uint8_t *above, const uint8_t *left) {
(void)above;
(void)left;
......@@ -700,7 +700,7 @@ void vp9_dc_128_predictor_8x8_msa(uint8_t *dst, ptrdiff_t y_stride,
intra_predict_128dc_8x8_msa(dst, y_stride);
}
void vp9_dc_128_predictor_16x16_msa(uint8_t *dst, ptrdiff_t y_stride,
void vpx_dc_128_predictor_16x16_msa(uint8_t *dst, ptrdiff_t y_stride,
const uint8_t *above, const uint8_t *left) {
(void)above;
(void)left;
......@@ -708,7 +708,7 @@ void vp9_dc_128_predictor_16x16_msa(uint8_t *dst, ptrdiff_t y_stride,
intra_predict_128dc_16x16_msa(dst, y_stride);
}
void vp9_dc_128_predictor_32x32_msa(uint8_t *dst, ptrdiff_t y_stride,
void vpx_dc_128_predictor_32x32_msa(uint8_t *dst, ptrdiff_t y_stride,
const uint8_t *above, const uint8_t *left) {
(void)above;
(void)left;
......@@ -716,22 +716,22 @@ void vp9_dc_128_predictor_32x32_msa(uint8_t *dst, ptrdiff_t y_stride,
intra_predict_128dc_32x32_msa(dst, y_stride);
}
void vp9_tm_predictor_4x4_msa(uint8_t *dst, ptrdiff_t y_stride,
void vpx_tm_predictor_4x4_msa(uint8_t *dst, ptrdiff_t y_stride,
const uint8_t *above, const uint8_t *left) {
intra_predict_tm_4x4_msa(above, left, dst, y_stride);
}
void vp9_tm_predictor_8x8_msa(uint8_t *dst, ptrdiff_t y_stride,
void vpx_tm_predictor_8x8_msa(uint8_t *dst, ptrdiff_t y_stride,
const uint8_t *above, const uint8_t *left) {
intra_predict_tm_8x8_msa(above, left, dst, y_stride);
}
void vp9_tm_predictor_16x16_msa(uint8_t *dst, ptrdiff_t y_stride,
void vpx_tm_predictor_16x16_msa(uint8_t *dst, ptrdiff_t y_stride,
const uint8_t *above, const uint8_t *left) {
intra_predict_tm_16x16_msa(above, left, dst, y_stride);
}
void vp9_tm_predictor_32x32_msa(uint8_t *dst, ptrdiff_t y_stride,
void vpx_tm_predictor_32x32_msa(uint8_t *dst, ptrdiff_t y_stride,
const uint8_t *above, const uint8_t *left) {
intra_predict_tm_32x32_msa(above, left, dst, y_stride);
}
This diff is collapsed.
......@@ -8,6 +8,8 @@
; be found in the AUTHORS file in the root of the source tree.
;
%define program_name vpx
%include "third_party/x86inc/x86inc.asm"
SECTION_RODATA
......
......@@ -8,6 +8,8 @@
; be found in the AUTHORS file in the root of the source tree.
;
%define program_name vpx
%include "third_party/x86inc/x86inc.asm"
SECTION_RODATA
......
......@@ -8,6 +8,8 @@
; be found in the AUTHORS file in the root of the source tree.
;
%define program_name vpx
%include "third_party/x86inc/x86inc.asm"
SECTION_RODATA
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment