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

Adding sad function generation macros

Browse Source 
Tidying up the high bitdepth SAD implementation to match
the corresponding change 69783 on master.

Change-Id: I9c415a996a3ff237b2d25c57ad874284a45793fc
This commit is contained in:
Peter de Rivaz
2014-05-01 11:49:44 +01:00
parent a0c772e381
commit a242def2aa
1 changed files with 81 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

350
vp9/encoder/vp9_sad.c
View File

@@ -173,295 +173,107 @@ static INLINE unsigned int high_sadb(const uint8_t *a8, int a_stride,
return sad; return sad;
} }
#define high_sad_mxn_func(m, n) \ #define high_sadMxN(m, n) \
unsigned int vp9_high_sad##m##x##n##_c(const uint8_t *src_ptr, int src_stride, \ unsigned int vp9_high_sad##m##x##n##_c(const uint8_t *src, int src_stride, \
const uint8_t *ref_ptr, int ref_stride, \ const uint8_t *ref, int ref_stride, \
unsigned int max_sad) { \ unsigned int max_sad) { \
return high_sad(src_ptr, src_stride, ref_ptr, ref_stride, m, n); \ return high_sad(src, src_stride, ref, ref_stride, m, n); \
} \ } \
unsigned int vp9_high_sad##m##x##n##_avg_c(const uint8_t *src_ptr, \ unsigned int vp9_high_sad##m##x##n##_avg_c(const uint8_t *src, int src_stride, \
int src_stride, \ const uint8_t *ref, int ref_stride, \
const uint8_t *ref_ptr, \ const uint8_t *second_pred, \
int ref_stride, \ unsigned int max_sad) { \
const uint8_t *second_pred, \
unsigned int max_sad) { \
uint16_t comp_pred[m * n]; \ uint16_t comp_pred[m * n]; \
high_comp_avg_pred(comp_pred, second_pred, m, n, ref_ptr, ref_stride); \ high_comp_avg_pred(comp_pred, second_pred, m, n, ref, ref_stride); \
return high_sadb(src_ptr, src_stride, comp_pred, m, m, n); \ return high_sadb(src, src_stride, comp_pred, m, m, n); \
} }
high_sad_mxn_func(64, 64) #define high_sadMxNxK(m, n, k) \
high_sad_mxn_func(64, 32) void vp9_high_sad##m##x##n##x##k##_c(const uint8_t *src, int src_stride, \
high_sad_mxn_func(32, 64) const uint8_t *ref, int ref_stride, \
high_sad_mxn_func(32, 32) unsigned int *sads) { \
high_sad_mxn_func(32, 16) int i; \
high_sad_mxn_func(16, 32) for (i = 0; i < k; ++i) \
high_sad_mxn_func(16, 16) sads[i] = vp9_high_sad##m##x##n##_c(src, src_stride, &ref[i], ref_stride, \
high_sad_mxn_func(16, 8) 0x7fffffff); \
high_sad_mxn_func(8, 16)
high_sad_mxn_func(8, 8)
high_sad_mxn_func(8, 4)
high_sad_mxn_func(4, 8)
high_sad_mxn_func(4, 4)
void vp9_high_sad64x32x4d_c(const uint8_t *src_ptr, int src_stride,
const uint8_t* const ref_ptr[], int ref_stride,
unsigned int *sad_array) {
int i;
for (i = 0; i < 4; ++i)
sad_array[i] = vp9_high_sad64x32(src_ptr, src_stride, ref_ptr[i],
ref_stride, 0x7fffffff);
} }
void vp9_high_sad32x64x4d_c(const uint8_t *src_ptr, int src_stride, #define high_sadMxNx4D(m, n) \
const uint8_t* const ref_ptr[], void vp9_high_sad##m##x##n##x4d_c(const uint8_t *src, int src_stride, \
int ref_stride, unsigned int *sad_array) { const uint8_t *const refs[], \
int i; int ref_stride, unsigned int *sads) { \
for (i = 0; i < 4; ++i) int i; \
sad_array[i] = vp9_high_sad32x64(src_ptr, src_stride, ref_ptr[i], for (i = 0; i < 4; ++i) \
ref_stride, 0x7fffffff); sads[i] = vp9_high_sad##m##x##n##_c(src, src_stride, refs[i], ref_stride, \
0x7fffffff); \
} }
void vp9_high_sad32x16x4d_c(const uint8_t *src_ptr, int src_stride, // 64x64
const uint8_t* const ref_ptr[], int ref_stride, high_sadMxN(64, 64)
unsigned int *sad_array) { high_sadMxNxK(64, 64, 3)
int i; high_sadMxNxK(64, 64, 8)
for (i = 0; i < 4; ++i) high_sadMxNx4D(64, 64)
sad_array[i] = vp9_high_sad32x16(src_ptr, src_stride, ref_ptr[i],
ref_stride, 0x7fffffff);
}
void vp9_high_sad16x32x4d_c(const uint8_t *src_ptr, int src_stride, // 64x32
const uint8_t* const ref_ptr[], high_sadMxN(64, 32)
int ref_stride, unsigned int *sad_array) { high_sadMxNx4D(64, 32)
int i;
for (i = 0; i < 4; ++i)
sad_array[i] = vp9_high_sad16x32(src_ptr, src_stride, ref_ptr[i],
ref_stride, 0x7fffffff);
}
void vp9_high_sad64x64x3_c(const uint8_t *src_ptr, int src_stride, // 32x64
const uint8_t *ref_ptr, int ref_stride, high_sadMxN(32, 64)
unsigned int *sad_array) { high_sadMxNx4D(32, 64)
int i;
for (i = 0; i < 3; ++i)
sad_array[i] = vp9_high_sad64x64(src_ptr, src_stride, ref_ptr + i,
ref_stride, 0x7fffffff);
}
void vp9_high_sad32x32x3_c(const uint8_t *src_ptr, int src_stride, // 32x32
const uint8_t *ref_ptr, int ref_stride, high_sadMxN(32, 32)
unsigned int *sad_array) { high_sadMxNxK(32, 32, 3)
int i; high_sadMxNxK(32, 32, 8)
for (i = 0; i < 3; ++i) high_sadMxNx4D(32, 32)
sad_array[i] = vp9_high_sad32x32(src_ptr, src_stride, ref_ptr + i,
ref_stride, 0x7fffffff);
}
void vp9_high_sad64x64x8_c(const uint8_t *src_ptr, int src_stride, // 32x16
const uint8_t *ref_ptr, int ref_stride, high_sadMxN(32, 16)
unsigned int *sad_array) { high_sadMxNx4D(32, 16)
int i;
for (i = 0; i < 8; ++i)
sad_array[i] = vp9_high_sad64x64(src_ptr, src_stride, ref_ptr + i,
ref_stride, 0x7fffffff);
}
void vp9_high_sad32x32x8_c(const uint8_t *src_ptr, int src_stride, // 16x32
const uint8_t *ref_ptr, int ref_stride, high_sadMxN(16, 32)
unsigned int *sad_array) { high_sadMxNx4D(16, 32)
int i;
for (i = 0; i < 8; ++i)
sad_array[i] = vp9_high_sad32x32(src_ptr, src_stride, ref_ptr + i,
ref_stride, 0x7fffffff);
}
void vp9_high_sad16x16x3_c(const uint8_t *src_ptr, int src_stride, // 16x16
const uint8_t *ref_ptr, int ref_stride, high_sadMxN(16, 16)
unsigned int *sad_array) { high_sadMxNxK(16, 16, 3)
int i; high_sadMxNxK(16, 16, 8)
for (i = 0; i < 3; ++i) high_sadMxNx4D(16, 16)
sad_array[i] = vp9_high_sad16x16(src_ptr, src_stride, ref_ptr + i,
ref_stride, 0x7fffffff);
}
void vp9_high_sad16x16x8_c(const uint8_t *src_ptr, int src_stride, // 16x8
const uint8_t *ref_ptr, int ref_stride, high_sadMxN(16, 8)
uint32_t *sad_array) { high_sadMxNxK(16, 8, 3)
int i; high_sadMxNxK(16, 8, 8)
for (i = 0; i < 8; ++i) high_sadMxNx4D(16, 8)
sad_array[i] = vp9_high_sad16x16(src_ptr, src_stride, ref_ptr + i,
ref_stride, 0x7fffffff);
}
void vp9_high_sad16x8x3_c(const uint8_t *src_ptr, int src_stride, // 8x16
const uint8_t *ref_ptr, int ref_stride, high_sadMxN(8, 16)
unsigned int *sad_array) { high_sadMxNxK(8, 16, 3)
int i; high_sadMxNxK(8, 16, 8)
for (i = 0; i < 3; ++i) high_sadMxNx4D(8, 16)
sad_array[i] = vp9_high_sad16x8(src_ptr, src_stride, ref_ptr + i,
ref_stride, 0x7fffffff);
}
void vp9_high_sad16x8x8_c(const uint8_t *src_ptr, int src_stride, // 8x8
const uint8_t *ref_ptr, int ref_stride, high_sadMxN(8, 8)
uint32_t *sad_array) { high_sadMxNxK(8, 8, 3)
int i; high_sadMxNxK(8, 8, 8)
for (i = 0; i < 8; ++i) high_sadMxNx4D(8, 8)
sad_array[i] = vp9_high_sad16x8(src_ptr, src_stride, ref_ptr + i,
ref_stride, 0x7fffffff);
}
void vp9_high_sad8x8x3_c(const uint8_t *src_ptr, int src_stride, // 8x4
const uint8_t *ref_ptr, int ref_stride, high_sadMxN(8, 4)
unsigned int *sad_array) { high_sadMxNxK(8, 4, 8)
int i; high_sadMxNx4D(8, 4)
for (i = 0; i < 3; ++i)
sad_array[i] = vp9_high_sad8x8(src_ptr, src_stride, ref_ptr + i,
ref_stride, 0x7fffffff);
}
void vp9_high_sad8x8x8_c(const uint8_t *src_ptr, int src_stride, // 4x8
const uint8_t *ref_ptr, int ref_stride, high_sadMxN(4, 8)
uint32_t *sad_array) { high_sadMxNxK(4, 8, 8)
int i; high_sadMxNx4D(4, 8)
for (i = 0; i < 8; ++i)
sad_array[i] = vp9_high_sad8x8(src_ptr, src_stride, ref_ptr + i,
ref_stride, 0x7fffffff);
}
void vp9_high_sad8x16x3_c(const uint8_t *src_ptr, int src_stride, // 4x4
const uint8_t *ref_ptr, int ref_stride, high_sadMxN(4, 4)
unsigned int *sad_array) { high_sadMxNxK(4, 4, 3)
int i; high_sadMxNxK(4, 4, 8)
for (i = 0; i < 3; ++i) high_sadMxNx4D(4, 4)
sad_array[i] = vp9_high_sad8x16(src_ptr, src_stride, ref_ptr + i,
ref_stride, 0x7fffffff);
}
void vp9_high_sad8x16x8_c(const uint8_t *src_ptr, int src_stride,
const uint8_t *ref_ptr, int ref_stride,
uint32_t *sad_array) {
int i;
for (i = 0; i < 8; ++i)
sad_array[i] = vp9_high_sad8x16(src_ptr, src_stride, ref_ptr + i,
ref_stride, 0x7fffffff);
}
void vp9_high_sad4x4x3_c(const uint8_t *src_ptr, int src_stride,
const uint8_t *ref_ptr, int ref_stride,
unsigned int *sad_array) {
int i;
for (i = 0; i < 3; ++i)
sad_array[i] = vp9_high_sad4x4(src_ptr, src_stride, ref_ptr + i,
ref_stride, 0x7fffffff);
}
void vp9_high_sad4x4x8_c(const uint8_t *src_ptr, int src_stride,
const uint8_t *ref_ptr, int ref_stride,
uint32_t *sad_array) {
int i;
for (i = 0; i < 8; ++i)
sad_array[i] = vp9_high_sad4x4(src_ptr, src_stride, ref_ptr + i,
ref_stride, 0x7fffffff);
}
void vp9_high_sad64x64x4d_c(const uint8_t *src_ptr, int src_stride,
const uint8_t* const ref_ptr[], int ref_stride,
unsigned int *sad_array) {
int i;
for (i = 0; i < 4; ++i)
sad_array[i] = vp9_high_sad64x64(src_ptr, src_stride, ref_ptr[i],
ref_stride, 0x7fffffff);
}
void vp9_high_sad32x32x4d_c(const uint8_t *src_ptr, int src_stride,
const uint8_t* const ref_ptr[], int ref_stride,
unsigned int *sad_array) {
int i;
for (i = 0; i < 4; ++i)
sad_array[i] = vp9_high_sad32x32(src_ptr, src_stride, ref_ptr[i],
ref_stride, 0x7fffffff);
}
void vp9_high_sad16x16x4d_c(const uint8_t *src_ptr, int src_stride,
const uint8_t* const ref_ptr[], int ref_stride,
unsigned int *sad_array) {
int i;
for (i = 0; i < 4; ++i)
sad_array[i] = vp9_high_sad16x16(src_ptr, src_stride, ref_ptr[i],
ref_stride, 0x7fffffff);
}
void vp9_high_sad16x8x4d_c(const uint8_t *src_ptr, int src_stride,
const uint8_t* const ref_ptr[], int ref_stride,
unsigned int *sad_array) {
int i;
for (i = 0; i < 4; ++i)
sad_array[i] = vp9_high_sad16x8(src_ptr, src_stride, ref_ptr[i],
ref_stride, 0x7fffffff);
}
void vp9_high_sad8x8x4d_c(const uint8_t *src_ptr, int src_stride,
const uint8_t* const ref_ptr[], int ref_stride,
unsigned int *sad_array) {
int i;
for (i = 0; i < 4; ++i)
sad_array[i] = vp9_high_sad8x8(src_ptr, src_stride, ref_ptr[i],
ref_stride, 0x7fffffff);
}
void vp9_high_sad8x16x4d_c(const uint8_t *src_ptr, int src_stride,
const uint8_t* const ref_ptr[], int ref_stride,
unsigned int *sad_array) {
int i;
for (i = 0; i < 4; ++i)
sad_array[i] = vp9_high_sad8x16(src_ptr, src_stride, ref_ptr[i],
ref_stride, 0x7fffffff);
}
void vp9_high_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride,
const uint8_t* const ref_ptr[], int ref_stride,
unsigned int *sad_array) {
int i;
for (i = 0; i < 4; ++i)
sad_array[i] = vp9_high_sad8x4(src_ptr, src_stride, ref_ptr[i],
ref_stride, 0x7fffffff);
}
void vp9_high_sad8x4x8_c(const uint8_t *src_ptr, int src_stride,
const uint8_t *ref_ptr, int ref_stride,
uint32_t *sad_array) {
int i;
for (i = 0; i < 8; ++i)
sad_array[i] = vp9_high_sad8x4(src_ptr, src_stride, ref_ptr + i,
ref_stride, 0x7fffffff);
}
void vp9_high_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride,
const uint8_t* const ref_ptr[], int ref_stride,
unsigned int *sad_array) {
int i;
for (i = 0; i < 4; ++i)
sad_array[i] = vp9_high_sad4x8(src_ptr, src_stride, ref_ptr[i],
ref_stride, 0x7fffffff);
}
void vp9_high_sad4x8x8_c(const uint8_t *src_ptr, int src_stride,
const uint8_t *ref_ptr, int ref_stride,
uint32_t *sad_array) {
int i;
for (i = 0; i < 8; ++i)
sad_array[i] = vp9_high_sad4x8(src_ptr, src_stride, ref_ptr + i,
ref_stride, 0x7fffffff);
}
void vp9_high_sad4x4x4d_c(const uint8_t *src_ptr, int src_stride,
const uint8_t* const ref_ptr[], int ref_stride,
unsigned int *sad_array) {
int i;
for (i = 0; i < 4; ++i)
sad_array[i] = vp9_high_sad4x4(src_ptr, src_stride, ref_ptr[i],
ref_stride, 0x7fffffff);
}
#endif #endif