generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adding const to arguments of intra prediction functions.

Browse Source 
Adding const to above and left pointers. Cleanup.

Change-Id: I51e195fa2e2923048043fe68b4e38a47ee82cda1
This commit is contained in:
Dmitry Kovalev 2013-08-14 10:35:56 -07:00
parent 54979b4350
commit f2c073efaa
3 changed files with 209 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

337
vp9/common/vp9_reconintra.c
View File

@ -8,15 +8,16 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include <stdio.h>
#include "./vpx_config.h" #include "./vpx_config.h"
#include "vp9_rtcd.h"
#include "vp9/common/vp9_reconintra.h"
#include "vp9/common/vp9_onyxc_int.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "vpx_ports/vpx_once.h" #include "vpx_ports/vpx_once.h"
#include "vp9_rtcd.h"
#include "vp9/common/vp9_reconintra.h"
#include "vp9/common/vp9_onyxc_int.h"
const TX_TYPE mode2txfm_map[MB_MODE_COUNT] = { const TX_TYPE mode2txfm_map[MB_MODE_COUNT] = {
DCT_DCT, // DC DCT_DCT, // DC
ADST_DCT, // V ADST_DCT, // V
@ -35,284 +36,254 @@ const TX_TYPE mode2txfm_map[MB_MODE_COUNT] = {
}; };
#define intra_pred_sized(type, size) \ #define intra_pred_sized(type, size) \
void vp9_##type##_predictor_##size##x##size##_c(uint8_t *pred_ptr, \ void vp9_##type##_predictor_##size##x##size##_c(uint8_t *dst, \
ptrdiff_t stride, \ ptrdiff_t stride, \
uint8_t *above_row, \ const uint8_t *above, \
uint8_t *left_col) { \ const uint8_t *left) { \
type##_predictor(pred_ptr, stride, size, above_row, left_col); \ type##_predictor(dst, stride, size, above, left); \
} }
#define intra_pred_allsizes(type) \ #define intra_pred_allsizes(type) \
intra_pred_sized(type, 4) \ intra_pred_sized(type, 4) \
intra_pred_sized(type, 8) \ intra_pred_sized(type, 8) \
intra_pred_sized(type, 16) \ intra_pred_sized(type, 16) \
intra_pred_sized(type, 32) intra_pred_sized(type, 32)
static INLINE void d27_predictor(uint8_t *pred_ptr, ptrdiff_t stride, int bs, static INLINE void d27_predictor(uint8_t *dst, ptrdiff_t stride, int bs,
uint8_t *above_row, uint8_t *left_col) { const uint8_t *above, const uint8_t *left) {
int r, c; int r, c;
// first column // first column
for (r = 0; r < bs - 1; ++r) for (r = 0; r < bs - 1; ++r)
pred_ptr[r * stride] = ROUND_POWER_OF_TWO(left_col[r] + left_col[r + 1], 1); dst[r * stride] = ROUND_POWER_OF_TWO(left[r] + left[r + 1], 1);
dst[(bs - 1) * stride] = left[bs - 1];
dst++;
pred_ptr[(bs - 1) * stride] = left_col[bs - 1];
pred_ptr++;
// second column // second column
for (r = 0; r < bs - 2; ++r) for (r = 0; r < bs - 2; ++r)
pred_ptr[r * stride] = ROUND_POWER_OF_TWO(left_col[r] + dst[r * stride] = ROUND_POWER_OF_TWO(left[r] + left[r + 1] * 2 +
left_col[r + 1] * 2 + left[r + 2], 2);
left_col[r + 2], 2); dst[(bs - 2) * stride] = ROUND_POWER_OF_TWO(left[bs - 2] +
left[bs - 1] * 3, 2);
pred_ptr[(bs - 2) * stride] = ROUND_POWER_OF_TWO(left_col[bs - 2] + dst[(bs - 1) * stride] = left[bs - 1];
left_col[bs - 1] * 3, dst++;
2);
pred_ptr[(bs - 1) * stride] = left_col[bs - 1];
pred_ptr++;
// rest of last row // rest of last row
for (c = 0; c < bs - 2; ++c) for (c = 0; c < bs - 2; ++c)
pred_ptr[(bs - 1) * stride + c] = left_col[bs - 1]; dst[(bs - 1) * stride + c] = left[bs - 1];
for (r = bs - 2; r >= 0; --r) for (r = bs - 2; r >= 0; --r)
for (c = 0; c < bs - 2; ++c) for (c = 0; c < bs - 2; ++c)
pred_ptr[r * stride + c] = pred_ptr[(r + 1) * stride + c - 2]; dst[r * stride + c] = dst[(r + 1) * stride + c - 2];
} }
intra_pred_allsizes(d27) intra_pred_allsizes(d27)
static INLINE void d63_predictor(uint8_t *pred_ptr, ptrdiff_t stride, int bs, static INLINE void d63_predictor(uint8_t *dst, ptrdiff_t stride, int bs,
uint8_t *above_row, uint8_t *left_col) { const uint8_t *above, const uint8_t *left) {
int r, c; int r, c;
for (r = 0; r < bs; ++r) { for (r = 0; r < bs; ++r) {
for (c = 0; c < bs; ++c) for (c = 0; c < bs; ++c)
pred_ptr[c] = r & 1 ? ROUND_POWER_OF_TWO(above_row[r/2 + c] + dst[c] = r & 1 ? ROUND_POWER_OF_TWO(above[r/2 + c] +
above_row[r/2 + c + 1] * 2 + above[r/2 + c + 1] * 2 +
above_row[r/2 + c + 2], 2) above[r/2 + c + 2], 2)
: ROUND_POWER_OF_TWO(above_row[r/2 + c] + : ROUND_POWER_OF_TWO(above[r/2 + c] +
above_row[r/2+ c + 1], 1); above[r/2 + c + 1], 1);
pred_ptr += stride; dst += stride;
} }
} }
intra_pred_allsizes(d63) intra_pred_allsizes(d63)
static INLINE void d45_predictor(uint8_t *pred_ptr, ptrdiff_t stride, int bs, static INLINE void d45_predictor(uint8_t *dst, ptrdiff_t stride, int bs,
uint8_t *above_row, uint8_t *left_col) { const uint8_t *above, const uint8_t *left) {
int r, c; int r, c;
for (r = 0; r < bs; ++r) { for (r = 0; r < bs; ++r) {
for (c = 0; c < bs; ++c) { for (c = 0; c < bs; ++c)
if (r + c + 2 < bs * 2) dst[c] = r + c + 2 < bs * 2 ? ROUND_POWER_OF_TWO(above[r + c] +
pred_ptr[c] = ROUND_POWER_OF_TWO(above_row[r + c] + above[r + c + 1] * 2 +
above_row[r + c + 1] * 2 + above[r + c + 2], 2)
above_row[r + c + 2], 2); : above[bs * 2 - 1];
else dst += stride;
pred_ptr[c] = above_row[bs * 2 - 1];
}
pred_ptr += stride;
} }
} }
intra_pred_allsizes(d45) intra_pred_allsizes(d45)
static INLINE void d117_predictor(uint8_t *pred_ptr, ptrdiff_t stride, int bs, static INLINE void d117_predictor(uint8_t *dst, ptrdiff_t stride, int bs,
uint8_t *above_row, uint8_t *left_col) { const uint8_t *above, const uint8_t *left) {
int r, c; int r, c;
// first row // first row
for (c = 0; c < bs; c++) for (c = 0; c < bs; c++)
pred_ptr[c] = ROUND_POWER_OF_TWO(above_row[c - 1] + above_row[c], 1); dst[c] = ROUND_POWER_OF_TWO(above[c - 1] + above[c], 1);
pred_ptr += stride; dst += stride;
// second row // second row
pred_ptr[0] = ROUND_POWER_OF_TWO(left_col[0] + dst[0] = ROUND_POWER_OF_TWO(left[0] + above[-1] * 2 + above[0], 2);
above_row[-1] * 2 +
above_row[0], 2);
for (c = 1; c < bs; c++) for (c = 1; c < bs; c++)
pred_ptr[c] = ROUND_POWER_OF_TWO(above_row[c - 2] + dst[c] = ROUND_POWER_OF_TWO(above[c - 2] + above[c - 1] * 2 + above[c], 2);
above_row[c - 1] * 2 + dst += stride;
above_row[c], 2);
pred_ptr += stride;
// the rest of first col // the rest of first col
pred_ptr[0] = ROUND_POWER_OF_TWO(above_row[-1] + dst[0] = ROUND_POWER_OF_TWO(above[-1] + left[0] * 2 + left[1], 2);
left_col[0] * 2 +
left_col[1], 2);
for (r = 3; r < bs; ++r) for (r = 3; r < bs; ++r)
pred_ptr[(r - 2) * stride] = ROUND_POWER_OF_TWO(left_col[r - 3] + dst[(r - 2) * stride] = ROUND_POWER_OF_TWO(left[r - 3] + left[r - 2] * 2 +
left_col[r - 2] * 2 + left[r - 1], 2);
left_col[r - 1], 2);
// the rest of the block // the rest of the block
for (r = 2; r < bs; ++r) { for (r = 2; r < bs; ++r) {
for (c = 1; c < bs; c++) for (c = 1; c < bs; c++)
pred_ptr[c] = pred_ptr[-2 * stride + c - 1]; dst[c] = dst[-2 * stride + c - 1];
pred_ptr += stride; dst += stride;
} }
} }
intra_pred_allsizes(d117) intra_pred_allsizes(d117)
static INLINE void d135_predictor(uint8_t *pred_ptr, ptrdiff_t stride, int bs, static INLINE void d135_predictor(uint8_t *dst, ptrdiff_t stride, int bs,
uint8_t *above_row, uint8_t *left_col) { const uint8_t *above, const uint8_t *left) {
int r, c; int r, c;
pred_ptr[0] = ROUND_POWER_OF_TWO(left_col[0] + dst[0] = ROUND_POWER_OF_TWO(left[0] + above[-1] * 2 + above[0], 2);
above_row[-1] * 2 +
above_row[0], 2);
for (c = 1; c < bs; c++) for (c = 1; c < bs; c++)
pred_ptr[c] = ROUND_POWER_OF_TWO(above_row[c - 2] + dst[c] = ROUND_POWER_OF_TWO(above[c - 2] + above[c - 1] * 2 + above[c], 2);
above_row[c - 1] * 2 +
above_row[c], 2);
pred_ptr[stride] = ROUND_POWER_OF_TWO(above_row[-1] + dst[stride] = ROUND_POWER_OF_TWO(above[-1] + left[0] * 2 + left[1], 2);
left_col[0] * 2 +
left_col[1], 2);
for (r = 2; r < bs; ++r) for (r = 2; r < bs; ++r)
pred_ptr[r * stride] = ROUND_POWER_OF_TWO(left_col[r - 2] + dst[r * stride] = ROUND_POWER_OF_TWO(left[r - 2] + left[r - 1] * 2 +
left_col[r - 1] * 2 + left[r], 2);
left_col[r], 2);
pred_ptr += stride; dst += stride;
for (r = 1; r < bs; ++r) { for (r = 1; r < bs; ++r) {
for (c = 1; c < bs; c++) for (c = 1; c < bs; c++)
pred_ptr[c] = pred_ptr[-stride + c - 1]; dst[c] = dst[-stride + c - 1];
pred_ptr += stride; dst += stride;
} }
} }
intra_pred_allsizes(d135) intra_pred_allsizes(d135)
static INLINE void d153_predictor(uint8_t *pred_ptr, ptrdiff_t stride, int bs, static INLINE void d153_predictor(uint8_t *dst, ptrdiff_t stride, int bs,
uint8_t *above_row, uint8_t *left_col) { const uint8_t *above, const uint8_t *left) {
int r, c; int r, c;
pred_ptr[0] = ROUND_POWER_OF_TWO(above_row[-1] + left_col[0], 1); dst[0] = ROUND_POWER_OF_TWO(above[-1] + left[0], 1);
for (r = 1; r < bs; r++) for (r = 1; r < bs; r++)
pred_ptr[r * stride] = dst[r * stride] = ROUND_POWER_OF_TWO(left[r - 1] + left[r], 1);
ROUND_POWER_OF_TWO(left_col[r - 1] + left_col[r], 1); dst++;
pred_ptr++;
pred_ptr[0] = ROUND_POWER_OF_TWO(left_col[0] + dst[0] = ROUND_POWER_OF_TWO(left[0] + above[-1] * 2 + above[0], 2);
above_row[-1] * 2 + dst[stride] = ROUND_POWER_OF_TWO(above[-1] + left[0] * 2 + left[1], 2);
above_row[0], 2);
pred_ptr[stride] = ROUND_POWER_OF_TWO(above_row[-1] +
left_col[0] * 2 +
left_col[1], 2);
for (r = 2; r < bs; r++) for (r = 2; r < bs; r++)
pred_ptr[r * stride] = ROUND_POWER_OF_TWO(left_col[r - 2] + dst[r * stride] = ROUND_POWER_OF_TWO(left[r - 2] + left[r - 1] * 2 +
left_col[r - 1] * 2 + left[r], 2);
left_col[r], 2); dst++;
pred_ptr++;
for (c = 0; c < bs - 2; c++) for (c = 0; c < bs - 2; c++)
pred_ptr[c] = ROUND_POWER_OF_TWO(above_row[c - 1] + dst[c] = ROUND_POWER_OF_TWO(above[c - 1] + above[c] * 2 + above[c + 1], 2);
above_row[c] * 2 + dst += stride;
above_row[c + 1], 2);
pred_ptr += stride;
for (r = 1; r < bs; ++r) { for (r = 1; r < bs; ++r) {
for (c = 0; c < bs - 2; c++) for (c = 0; c < bs - 2; c++)
pred_ptr[c] = pred_ptr[-stride + c - 2]; dst[c] = dst[-stride + c - 2];
pred_ptr += stride; dst += stride;
} }
} }
intra_pred_allsizes(d153) intra_pred_allsizes(d153)
static INLINE void v_predictor(uint8_t *pred_ptr, ptrdiff_t stride, int bs, static INLINE void v_predictor(uint8_t *dst, ptrdiff_t stride, int bs,
uint8_t *above_row, uint8_t *left_col) { const uint8_t *above, const uint8_t *left) {
int r; int r;
for (r = 0; r < bs; r++) { for (r = 0; r < bs; r++) {
vpx_memcpy(pred_ptr, above_row, bs); vpx_memcpy(dst, above, bs);
pred_ptr += stride; dst += stride;
} }
} }
intra_pred_allsizes(v) intra_pred_allsizes(v)
static INLINE void h_predictor(uint8_t *pred_ptr, ptrdiff_t stride, int bs, static INLINE void h_predictor(uint8_t *dst, ptrdiff_t stride, int bs,
uint8_t *above_row, uint8_t *left_col) { const uint8_t *above, const uint8_t *left) {
int r; int r;
for (r = 0; r < bs; r++) { for (r = 0; r < bs; r++) {
vpx_memset(pred_ptr, left_col[r], bs); vpx_memset(dst, left[r], bs);
pred_ptr += stride; dst += stride;
} }
} }
intra_pred_allsizes(h) intra_pred_allsizes(h)
static INLINE void tm_predictor(uint8_t *pred_ptr, ptrdiff_t stride, int bs, static INLINE void tm_predictor(uint8_t *dst, ptrdiff_t stride, int bs,
uint8_t *above_row, uint8_t *left_col) { const uint8_t *above, const uint8_t *left) {
int r, c; int r, c;
int ytop_left = above_row[-1]; int ytop_left = above[-1];
for (r = 0; r < bs; r++) { for (r = 0; r < bs; r++) {
for (c = 0; c < bs; c++) for (c = 0; c < bs; c++)
pred_ptr[c] = clip_pixel(left_col[r] + above_row[c] - ytop_left); dst[c] = clip_pixel(left[r] + above[c] - ytop_left);
pred_ptr += stride; dst += stride;
} }
} }
intra_pred_allsizes(tm) intra_pred_allsizes(tm)
static INLINE void dc_128_predictor(uint8_t *pred_ptr, ptrdiff_t stride, int bs, static INLINE void dc_128_predictor(uint8_t *dst, ptrdiff_t stride, int bs,
uint8_t *above_row, uint8_t *left_col) { const uint8_t *above, const uint8_t *left) {
int r; int r;
for (r = 0; r < bs; r++) { for (r = 0; r < bs; r++) {
vpx_memset(pred_ptr, 128, bs); vpx_memset(dst, 128, bs);
pred_ptr += stride; dst += stride;
} }
} }
intra_pred_allsizes(dc_128) intra_pred_allsizes(dc_128)
static INLINE void dc_left_predictor(uint8_t *pred_ptr, ptrdiff_t stride, static INLINE void dc_left_predictor(uint8_t *dst, ptrdiff_t stride, int bs,
int bs, const uint8_t *above,
uint8_t *above_row, uint8_t *left_col) { const uint8_t *left) {
int i, r; int i, r, expected_dc, sum = 0;
int expected_dc = 128;
int average = 0;
const int count = bs;
for (i = 0; i < bs; i++) for (i = 0; i < bs; i++)
average += left_col[i]; sum += left[i];
expected_dc = (average + (count >> 1)) / count; expected_dc = (sum + (bs >> 1)) / bs;
for (r = 0; r < bs; r++) { for (r = 0; r < bs; r++) {
vpx_memset(pred_ptr, expected_dc, bs); vpx_memset(dst, expected_dc, bs);
pred_ptr += stride; dst += stride;
} }
} }
intra_pred_allsizes(dc_left) intra_pred_allsizes(dc_left)
static INLINE void dc_top_predictor(uint8_t *pred_ptr, ptrdiff_t stride, int bs, static INLINE void dc_top_predictor(uint8_t *dst, ptrdiff_t stride, int bs,
uint8_t *above_row, uint8_t *left_col) { const uint8_t *above, const uint8_t *left) {
int i, r; int i, r, expected_dc, sum = 0;
int expected_dc = 128;
int average = 0;
const int count = bs;
for (i = 0; i < bs; i++) for (i = 0; i < bs; i++)
average += above_row[i]; sum += above[i];
expected_dc = (average + (count >> 1)) / count; expected_dc = (sum + (bs >> 1)) / bs;
for (r = 0; r < bs; r++) { for (r = 0; r < bs; r++) {
vpx_memset(pred_ptr, expected_dc, bs); vpx_memset(dst, expected_dc, bs);
pred_ptr += stride; dst += stride;
} }
} }
intra_pred_allsizes(dc_top) intra_pred_allsizes(dc_top)
static INLINE void dc_predictor(uint8_t *pred_ptr, ptrdiff_t stride, int bs, static INLINE void dc_predictor(uint8_t *dst, ptrdiff_t stride, int bs,
uint8_t *above_row, uint8_t *left_col) { const uint8_t *above, const uint8_t *left) {
int i, r; int i, r, expected_dc, sum = 0;
int expected_dc = 128;
int average = 0;
const int count = 2 * bs; const int count = 2 * bs;
for (i = 0; i < bs; i++) for (i = 0; i < bs; i++) {
average += above_row[i]; sum += above[i];
for (i = 0; i < bs; i++) sum += left[i];
average += left_col[i]; }
expected_dc = (average + (count >> 1)) / count;
expected_dc = (sum + (count >> 1)) / count;
for (r = 0; r < bs; r++) { for (r = 0; r < bs; r++) {
vpx_memset(pred_ptr, expected_dc, bs); vpx_memset(dst, expected_dc, bs);
pred_ptr += stride; dst += stride;
} }
} }
intra_pred_allsizes(dc) intra_pred_allsizes(dc)
#undef intra_pred_allsizes #undef intra_pred_allsizes
typedef void (*intra_pred_fn)(uint8_t *pred_ptr, ptrdiff_t stride, typedef void (*intra_pred_fn)(uint8_t *dst, ptrdiff_t stride,
uint8_t *above_row, uint8_t *left_col); const uint8_t *above, const uint8_t *left);
static intra_pred_fn pred[VP9_INTRA_MODES][4]; static intra_pred_fn pred[VP9_INTRA_MODES][4];
static intra_pred_fn dc_pred[2][2][4]; static intra_pred_fn dc_pred[2][2][4];
@ -342,16 +313,17 @@ static void init_intra_pred_fn_ptrs(void) {
#undef intra_pred_allsizes #undef intra_pred_allsizes
} }
static void build_intra_predictors(uint8_t *src, int src_stride, static void build_intra_predictors(const uint8_t *ref, int ref_stride,
uint8_t *pred_ptr, int stride, uint8_t *dst, int dst_stride,
MB_PREDICTION_MODE mode, TX_SIZE txsz, MB_PREDICTION_MODE mode, TX_SIZE tx_size,
int up_available, int left_available, int up_available, int left_available,
int right_available) { int right_available) {
int i; int i;
DECLARE_ALIGNED_ARRAY(16, uint8_t, left_col, 64); DECLARE_ALIGNED_ARRAY(16, uint8_t, left_col, 64);
DECLARE_ALIGNED_ARRAY(16, uint8_t, yabove_data, 128 + 16); DECLARE_ALIGNED_ARRAY(16, uint8_t, above_data, 128 + 16);
uint8_t *above_row = yabove_data + 16; uint8_t *above_row = above_data + 16;
const int bs = 4 << txsz; const uint8_t *const_above_row = above_row;
const int bs = 4 << tx_size;
// 127 127 127 .. 127 127 127 127 127 127 // 127 127 127 .. 127 127 127 127 127 127
// 129 A B .. Y Z // 129 A B .. Y Z
@ -361,45 +333,46 @@ static void build_intra_predictors(uint8_t *src, int src_stride,
// .. // ..
once(init_intra_pred_fn_ptrs); once(init_intra_pred_fn_ptrs);
// left
if (left_available) { if (left_available) {
for (i = 0; i < bs; i++) for (i = 0; i < bs; i++)
left_col[i] = src[i * src_stride - 1]; left_col[i] = ref[i * ref_stride - 1];
} else { } else {
vpx_memset(left_col, 129, bs); vpx_memset(left_col, 129, bs);
} }
// above
if (up_available) { if (up_available) {
uint8_t *above_ptr = src - src_stride; const uint8_t *above_ref = ref - ref_stride;
if (bs == 4 && right_available && left_available) { if (bs == 4 && right_available && left_available) {
above_row = above_ptr; const_above_row = above_ref;
} else { } else {
vpx_memcpy(above_row, above_ptr, bs); vpx_memcpy(above_row, above_ref, bs);
if (bs == 4 && right_available) if (bs == 4 && right_available)
vpx_memcpy(above_row + bs, above_ptr + bs, bs); vpx_memcpy(above_row + bs, above_ref + bs, bs);
else else
vpx_memset(above_row + bs, above_row[bs - 1], bs); vpx_memset(above_row + bs, above_row[bs - 1], bs);
above_row[-1] = left_available ? above_ptr[-1] : 129; above_row[-1] = left_available ? above_ref[-1] : 129;
} }
} else { } else {
vpx_memset(above_row, 127, bs * 2); vpx_memset(above_row, 127, bs * 2);
above_row[-1] = 127; above_row[-1] = 127;
} }
// predict
if (mode == DC_PRED) { if (mode == DC_PRED) {
dc_pred[left_available][up_available][txsz](pred_ptr, stride, dc_pred[left_available][up_available][tx_size](dst, dst_stride,
above_row, left_col); const_above_row, left_col);
} else { } else {
pred[mode][txsz](pred_ptr, stride, above_row, left_col); pred[mode][tx_size](dst, dst_stride, const_above_row, left_col);
} }
} }
void vp9_predict_intra_block(MACROBLOCKD *xd, void vp9_predict_intra_block(MACROBLOCKD *xd, int block_idx, int bwl_in,
int block_idx, TX_SIZE tx_size, int mode,
int bwl_in, const uint8_t *ref, int ref_stride,
TX_SIZE tx_size, uint8_t *dst, int dst_stride) {
int mode,
uint8_t *reference, int ref_stride,
uint8_t *predictor, int pre_stride) {
const int bwl = bwl_in - tx_size; const int bwl = bwl_in - tx_size;
const int wmask = (1 << bwl) - 1; const int wmask = (1 << bwl) - 1;
const int have_top = (block_idx >> bwl) || xd->up_available; const int have_top = (block_idx >> bwl) || xd->up_available;
@ -407,10 +380,6 @@ void vp9_predict_intra_block(MACROBLOCKD *xd,
const int have_right = ((block_idx & wmask) != wmask); const int have_right = ((block_idx & wmask) != wmask);
assert(bwl >= 0); assert(bwl >= 0);
build_intra_predictors(reference, ref_stride, build_intra_predictors(ref, ref_stride, dst, dst_stride, mode, tx_size,
predictor, pre_stride, have_top, have_left, have_right);
mode,
tx_size,
have_top, have_left,
have_right);
} }

17
vp9/common/vp9_reconintra.h
View File

@ -14,17 +14,8 @@
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
#include "vp9/common/vp9_blockd.h" #include "vp9/common/vp9_blockd.h"
MB_PREDICTION_MODE vp9_find_dominant_direction(uint8_t *ptr, void vp9_predict_intra_block(MACROBLOCKD *xd, int block_idx, int bwl_in,
int stride, int n, TX_SIZE tx_size, int mode,
int tx, int ty); const uint8_t *ref, int ref_stride,
uint8_t *dst, int dst_stride);
MB_PREDICTION_MODE vp9_find_bpred_context(MACROBLOCKD *xd, int block,
uint8_t *ptr, int stride);
void vp9_predict_intra_block(MACROBLOCKD *xd,
int block_idx,
int bwl_in,
TX_SIZE tx_size,
int mode, uint8_t *ref, int ref_stride,
uint8_t *predictor, int pre_stride);
#endif // VP9_COMMON_VP9_RECONINTRA_H_ #endif // VP9_COMMON_VP9_RECONINTRA_H_

104
vp9/common/vp9_rtcd_defs.sh
View File

@ -46,160 +46,160 @@ specialize vp9_idct_add_32x32
# #
# RECON # RECON
# #
prototype void vp9_d27_predictor_4x4 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_d27_predictor_4x4 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d27_predictor_4x4 specialize vp9_d27_predictor_4x4
prototype void vp9_d45_predictor_4x4 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_d45_predictor_4x4 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d45_predictor_4x4 $ssse3_x86inc specialize vp9_d45_predictor_4x4 $ssse3_x86inc
prototype void vp9_d63_predictor_4x4 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_d63_predictor_4x4 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d63_predictor_4x4 specialize vp9_d63_predictor_4x4
prototype void vp9_h_predictor_4x4 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_h_predictor_4x4 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_h_predictor_4x4 $ssse3_x86inc specialize vp9_h_predictor_4x4 $ssse3_x86inc
prototype void vp9_d117_predictor_4x4 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_d117_predictor_4x4 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d117_predictor_4x4 specialize vp9_d117_predictor_4x4
prototype void vp9_d135_predictor_4x4 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_d135_predictor_4x4 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d135_predictor_4x4 specialize vp9_d135_predictor_4x4
prototype void vp9_d153_predictor_4x4 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_d153_predictor_4x4 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d153_predictor_4x4 specialize vp9_d153_predictor_4x4
prototype void vp9_v_predictor_4x4 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_v_predictor_4x4 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_v_predictor_4x4 $sse_x86inc specialize vp9_v_predictor_4x4 $sse_x86inc
prototype void vp9_tm_predictor_4x4 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_tm_predictor_4x4 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_tm_predictor_4x4 $sse_x86inc specialize vp9_tm_predictor_4x4 $sse_x86inc
prototype void vp9_dc_predictor_4x4 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_dc_predictor_4x4 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_dc_predictor_4x4 $sse_x86inc specialize vp9_dc_predictor_4x4 $sse_x86inc
prototype void vp9_dc_top_predictor_4x4 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_dc_top_predictor_4x4 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_dc_top_predictor_4x4 specialize vp9_dc_top_predictor_4x4
prototype void vp9_dc_left_predictor_4x4 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_dc_left_predictor_4x4 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_dc_left_predictor_4x4 specialize vp9_dc_left_predictor_4x4
prototype void vp9_dc_128_predictor_4x4 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_dc_128_predictor_4x4 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_dc_128_predictor_4x4 specialize vp9_dc_128_predictor_4x4
prototype void vp9_d27_predictor_8x8 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_d27_predictor_8x8 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d27_predictor_8x8 specialize vp9_d27_predictor_8x8
prototype void vp9_d45_predictor_8x8 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_d45_predictor_8x8 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d45_predictor_8x8 $ssse3_x86inc specialize vp9_d45_predictor_8x8 $ssse3_x86inc
prototype void vp9_d63_predictor_8x8 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_d63_predictor_8x8 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d63_predictor_8x8 specialize vp9_d63_predictor_8x8
prototype void vp9_h_predictor_8x8 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_h_predictor_8x8 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_h_predictor_8x8 $ssse3_x86inc specialize vp9_h_predictor_8x8 $ssse3_x86inc
prototype void vp9_d117_predictor_8x8 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_d117_predictor_8x8 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d117_predictor_8x8 specialize vp9_d117_predictor_8x8
prototype void vp9_d135_predictor_8x8 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_d135_predictor_8x8 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d135_predictor_8x8 specialize vp9_d135_predictor_8x8
prototype void vp9_d153_predictor_8x8 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_d153_predictor_8x8 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d153_predictor_8x8 specialize vp9_d153_predictor_8x8
prototype void vp9_v_predictor_8x8 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_v_predictor_8x8 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_v_predictor_8x8 $sse_x86inc specialize vp9_v_predictor_8x8 $sse_x86inc
prototype void vp9_tm_predictor_8x8 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_tm_predictor_8x8 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_tm_predictor_8x8 $sse2_x86inc specialize vp9_tm_predictor_8x8 $sse2_x86inc
prototype void vp9_dc_predictor_8x8 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_dc_predictor_8x8 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_dc_predictor_8x8 $sse_x86inc specialize vp9_dc_predictor_8x8 $sse_x86inc
prototype void vp9_dc_top_predictor_8x8 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_dc_top_predictor_8x8 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_dc_top_predictor_8x8 specialize vp9_dc_top_predictor_8x8
prototype void vp9_dc_left_predictor_8x8 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_dc_left_predictor_8x8 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_dc_left_predictor_8x8 specialize vp9_dc_left_predictor_8x8
prototype void vp9_dc_128_predictor_8x8 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_dc_128_predictor_8x8 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_dc_128_predictor_8x8 specialize vp9_dc_128_predictor_8x8
prototype void vp9_d27_predictor_16x16 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_d27_predictor_16x16 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d27_predictor_16x16 specialize vp9_d27_predictor_16x16
prototype void vp9_d45_predictor_16x16 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_d45_predictor_16x16 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d45_predictor_16x16 $ssse3_x86inc specialize vp9_d45_predictor_16x16 $ssse3_x86inc
prototype void vp9_d63_predictor_16x16 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_d63_predictor_16x16 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d63_predictor_16x16 specialize vp9_d63_predictor_16x16
prototype void vp9_h_predictor_16x16 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_h_predictor_16x16 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_h_predictor_16x16 $ssse3_x86inc specialize vp9_h_predictor_16x16 $ssse3_x86inc
prototype void vp9_d117_predictor_16x16 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_d117_predictor_16x16 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d117_predictor_16x16 specialize vp9_d117_predictor_16x16
prototype void vp9_d135_predictor_16x16 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_d135_predictor_16x16 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d135_predictor_16x16 specialize vp9_d135_predictor_16x16
prototype void vp9_d153_predictor_16x16 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_d153_predictor_16x16 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d153_predictor_16x16 specialize vp9_d153_predictor_16x16
prototype void vp9_v_predictor_16x16 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_v_predictor_16x16 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_v_predictor_16x16 $sse2_x86inc specialize vp9_v_predictor_16x16 $sse2_x86inc
prototype void vp9_tm_predictor_16x16 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_tm_predictor_16x16 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_tm_predictor_16x16 $sse2_x86inc specialize vp9_tm_predictor_16x16 $sse2_x86inc
prototype void vp9_dc_predictor_16x16 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_dc_predictor_16x16 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_dc_predictor_16x16 $sse2_x86inc specialize vp9_dc_predictor_16x16 $sse2_x86inc
prototype void vp9_dc_top_predictor_16x16 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_dc_top_predictor_16x16 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_dc_top_predictor_16x16 specialize vp9_dc_top_predictor_16x16
prototype void vp9_dc_left_predictor_16x16 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_dc_left_predictor_16x16 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_dc_left_predictor_16x16 specialize vp9_dc_left_predictor_16x16
prototype void vp9_dc_128_predictor_16x16 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_dc_128_predictor_16x16 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_dc_128_predictor_16x16 specialize vp9_dc_128_predictor_16x16
prototype void vp9_d27_predictor_32x32 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_d27_predictor_32x32 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d27_predictor_32x32 specialize vp9_d27_predictor_32x32
prototype void vp9_d45_predictor_32x32 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_d45_predictor_32x32 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d45_predictor_32x32 $ssse3_x86inc specialize vp9_d45_predictor_32x32 $ssse3_x86inc
prototype void vp9_d63_predictor_32x32 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_d63_predictor_32x32 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d63_predictor_32x32 specialize vp9_d63_predictor_32x32
prototype void vp9_h_predictor_32x32 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_h_predictor_32x32 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_h_predictor_32x32 $ssse3 x86inc specialize vp9_h_predictor_32x32 $ssse3 x86inc
prototype void vp9_d117_predictor_32x32 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_d117_predictor_32x32 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d117_predictor_32x32 specialize vp9_d117_predictor_32x32
prototype void vp9_d135_predictor_32x32 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_d135_predictor_32x32 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d135_predictor_32x32 specialize vp9_d135_predictor_32x32
prototype void vp9_d153_predictor_32x32 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_d153_predictor_32x32 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d153_predictor_32x32 specialize vp9_d153_predictor_32x32
prototype void vp9_v_predictor_32x32 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_v_predictor_32x32 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_v_predictor_32x32 $sse2_x86inc specialize vp9_v_predictor_32x32 $sse2_x86inc
prototype void vp9_tm_predictor_32x32 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_tm_predictor_32x32 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_tm_predictor_32x32 $sse2_x86_64 specialize vp9_tm_predictor_32x32 $sse2_x86_64
prototype void vp9_dc_predictor_32x32 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_dc_predictor_32x32 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_dc_predictor_32x32 $sse2_x86inc specialize vp9_dc_predictor_32x32 $sse2_x86inc
prototype void vp9_dc_top_predictor_32x32 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_dc_top_predictor_32x32 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_dc_top_predictor_32x32 specialize vp9_dc_top_predictor_32x32
prototype void vp9_dc_left_predictor_32x32 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_dc_left_predictor_32x32 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_dc_left_predictor_32x32 specialize vp9_dc_left_predictor_32x32
prototype void vp9_dc_128_predictor_32x32 "uint8_t *ypred_ptr, ptrdiff_t y_stride, uint8_t *yabove_row, uint8_t *yleft_col" prototype void vp9_dc_128_predictor_32x32 "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_dc_128_predictor_32x32 specialize vp9_dc_128_predictor_32x32
if [ "$CONFIG_VP9_DECODER" = "yes" ]; then if [ "$CONFIG_VP9_DECODER" = "yes" ]; then