Removing duplicated SAD calculation code.

Change-Id: I8d693371a29103769d5bed9d5f9cfe4f58ca3189
This commit is contained in:
Dmitry Kovalev 2014-01-15 18:25:05 -08:00
Родитель 575a083bcc
Коммит c2b5a39345
3 изменённых файлов: 202 добавлений и 532 удалений

Просмотреть файл

@ -8,31 +8,44 @@
* 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 <stdlib.h> #include <stdlib.h>
#include "./vp9_rtcd.h" #include "./vp9_rtcd.h"
#include "./vpx_config.h" #include "./vpx_config.h"
#include "vp9/encoder/vp9_sadmxn.h"
#include "vp9/encoder/vp9_variance.h"
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
#include "vp9/encoder/vp9_variance.h"
static INLINE unsigned int sad(const uint8_t *a, int a_stride,
const uint8_t *b, int b_stride,
int width, int height) {
int y, x;
unsigned int sad = 0;
for (y = 0; y < height; y++) {
for (x = 0; x < width; x++)
sad += abs(a[x] - b[x]);
a += a_stride;
b += b_stride;
}
return sad;
}
#define sad_mxn_func(m, n) \ #define sad_mxn_func(m, n) \
unsigned int vp9_sad##m##x##n##_c(const uint8_t *src_ptr, \ unsigned int vp9_sad##m##x##n##_c(const uint8_t *src_ptr, int src_stride, \
int src_stride, \ const uint8_t *ref_ptr, int ref_stride, \
const uint8_t *ref_ptr, \
int ref_stride, \
unsigned int max_sad) { \ unsigned int max_sad) { \
return sad_mx_n_c(src_ptr, src_stride, ref_ptr, ref_stride, m, n); \ return sad(src_ptr, src_stride, ref_ptr, ref_stride, m, n); \
} \ } \
unsigned int vp9_sad##m##x##n##_avg_c(const uint8_t *src_ptr, \ unsigned int vp9_sad##m##x##n##_avg_c(const uint8_t *src_ptr, int src_stride, \
int src_stride, \ const uint8_t *ref_ptr, int ref_stride, \
const uint8_t *ref_ptr, \
int ref_stride, \
const uint8_t *second_pred, \ const uint8_t *second_pred, \
unsigned int max_sad) { \ unsigned int max_sad) { \
uint8_t comp_pred[m * n]; \ uint8_t comp_pred[m * n]; \
comp_avg_pred(comp_pred, second_pred, m, n, ref_ptr, ref_stride); \ comp_avg_pred(comp_pred, second_pred, m, n, ref_ptr, ref_stride); \
return sad_mx_n_c(src_ptr, src_stride, comp_pred, m, m, n); \ return sad(src_ptr, src_stride, comp_pred, m, m, n); \
} }
sad_mxn_func(64, 64) sad_mxn_func(64, 64)
@ -49,567 +62,263 @@ sad_mxn_func(8, 4)
sad_mxn_func(4, 8) sad_mxn_func(4, 8)
sad_mxn_func(4, 4) sad_mxn_func(4, 4)
void vp9_sad64x32x4d_c(const uint8_t *src_ptr, void vp9_sad64x32x4d_c(const uint8_t *src_ptr, int src_stride,
int src_stride, const uint8_t* const ref_ptr[], int ref_stride,
const uint8_t* const ref_ptr[],
int ref_stride,
unsigned int *sad_array) { unsigned int *sad_array) {
sad_array[0] = vp9_sad64x32(src_ptr, src_stride, int i;
ref_ptr[0], ref_stride, 0x7fffffff); for (i = 0; i < 4; ++i)
sad_array[1] = vp9_sad64x32(src_ptr, src_stride, sad_array[i] = vp9_sad64x32(src_ptr, src_stride, ref_ptr[i], ref_stride,
ref_ptr[1], ref_stride, 0x7fffffff); 0x7fffffff);
sad_array[2] = vp9_sad64x32(src_ptr, src_stride,
ref_ptr[2], ref_stride, 0x7fffffff);
sad_array[3] = vp9_sad64x32(src_ptr, src_stride,
ref_ptr[3], ref_stride, 0x7fffffff);
} }
void vp9_sad32x64x4d_c(const uint8_t *src_ptr, void vp9_sad32x64x4d_c(const uint8_t *src_ptr, int src_stride,
int src_stride, const uint8_t* const ref_ptr[], int ref_stride,
const uint8_t* const ref_ptr[],
int ref_stride,
unsigned int *sad_array) { unsigned int *sad_array) {
sad_array[0] = vp9_sad32x64(src_ptr, src_stride, int i;
ref_ptr[0], ref_stride, 0x7fffffff); for (i = 0; i < 4; ++i)
sad_array[1] = vp9_sad32x64(src_ptr, src_stride, sad_array[i] = vp9_sad32x64(src_ptr, src_stride, ref_ptr[i], ref_stride,
ref_ptr[1], ref_stride, 0x7fffffff); 0x7fffffff);
sad_array[2] = vp9_sad32x64(src_ptr, src_stride,
ref_ptr[2], ref_stride, 0x7fffffff);
sad_array[3] = vp9_sad32x64(src_ptr, src_stride,
ref_ptr[3], ref_stride, 0x7fffffff);
} }
void vp9_sad32x16x4d_c(const uint8_t *src_ptr, void vp9_sad32x16x4d_c(const uint8_t *src_ptr, int src_stride,
int src_stride, const uint8_t* const ref_ptr[], int ref_stride,
const uint8_t* const ref_ptr[],
int ref_stride,
unsigned int *sad_array) { unsigned int *sad_array) {
sad_array[0] = vp9_sad32x16(src_ptr, src_stride, int i;
ref_ptr[0], ref_stride, 0x7fffffff); for (i = 0; i < 4; ++i)
sad_array[1] = vp9_sad32x16(src_ptr, src_stride, sad_array[i] = vp9_sad32x16(src_ptr, src_stride, ref_ptr[i], ref_stride,
ref_ptr[1], ref_stride, 0x7fffffff); 0x7fffffff);
sad_array[2] = vp9_sad32x16(src_ptr, src_stride,
ref_ptr[2], ref_stride, 0x7fffffff);
sad_array[3] = vp9_sad32x16(src_ptr, src_stride,
ref_ptr[3], ref_stride, 0x7fffffff);
} }
void vp9_sad16x32x4d_c(const uint8_t *src_ptr, void vp9_sad16x32x4d_c(const uint8_t *src_ptr, int src_stride,
int src_stride, const uint8_t* const ref_ptr[], int ref_stride,
const uint8_t* const ref_ptr[],
int ref_stride,
unsigned int *sad_array) { unsigned int *sad_array) {
sad_array[0] = vp9_sad16x32(src_ptr, src_stride, int i;
ref_ptr[0], ref_stride, 0x7fffffff); for (i = 0; i < 4; ++i)
sad_array[1] = vp9_sad16x32(src_ptr, src_stride, sad_array[i] = vp9_sad16x32(src_ptr, src_stride, ref_ptr[i], ref_stride,
ref_ptr[1], ref_stride, 0x7fffffff); 0x7fffffff);
sad_array[2] = vp9_sad16x32(src_ptr, src_stride,
ref_ptr[2], ref_stride, 0x7fffffff);
sad_array[3] = vp9_sad16x32(src_ptr, src_stride,
ref_ptr[3], ref_stride, 0x7fffffff);
} }
void vp9_sad64x64x3_c(const uint8_t *src_ptr, void vp9_sad64x64x3_c(const uint8_t *src_ptr, int src_stride,
int src_stride, const uint8_t *ref_ptr, int ref_stride,
const uint8_t *ref_ptr,
int ref_stride,
unsigned int *sad_array) { unsigned int *sad_array) {
sad_array[0] = vp9_sad64x64(src_ptr, src_stride, ref_ptr, ref_stride, int i;
0x7fffffff); for (i = 0; i < 3; ++i)
sad_array[1] = vp9_sad64x64(src_ptr, src_stride, ref_ptr + 1, ref_stride, sad_array[i] = vp9_sad64x64(src_ptr, src_stride, ref_ptr + i, ref_stride,
0x7fffffff); 0x7fffffff);
sad_array[2] = vp9_sad64x64(src_ptr, src_stride, ref_ptr + 2, ref_stride,
0x7fffffff);
} }
void vp9_sad32x32x3_c(const uint8_t *src_ptr, void vp9_sad32x32x3_c(const uint8_t *src_ptr, int src_stride,
int src_stride, const uint8_t *ref_ptr, int ref_stride,
const uint8_t *ref_ptr,
int ref_stride,
unsigned int *sad_array) { unsigned int *sad_array) {
sad_array[0] = vp9_sad32x32(src_ptr, src_stride, int i;
ref_ptr, ref_stride, 0x7fffffff); for (i = 0; i < 3; ++i)
sad_array[1] = vp9_sad32x32(src_ptr, src_stride, sad_array[i] = vp9_sad32x32(src_ptr, src_stride, ref_ptr + i, ref_stride,
ref_ptr + 1, ref_stride, 0x7fffffff); 0x7fffffff);
sad_array[2] = vp9_sad32x32(src_ptr, src_stride,
ref_ptr + 2, ref_stride, 0x7fffffff);
} }
void vp9_sad64x64x8_c(const uint8_t *src_ptr, void vp9_sad64x64x8_c(const uint8_t *src_ptr, int src_stride,
int src_stride, const uint8_t *ref_ptr, int ref_stride,
const uint8_t *ref_ptr,
int ref_stride,
unsigned int *sad_array) { unsigned int *sad_array) {
sad_array[0] = vp9_sad64x64(src_ptr, src_stride, int i;
ref_ptr, ref_stride, for (i = 0; i < 8; ++i)
0x7fffffff); sad_array[i] = vp9_sad64x64(src_ptr, src_stride, ref_ptr + i, ref_stride,
sad_array[1] = vp9_sad64x64(src_ptr, src_stride, 0x7fffffff);
ref_ptr + 1, ref_stride,
0x7fffffff);
sad_array[2] = vp9_sad64x64(src_ptr, src_stride,
ref_ptr + 2, ref_stride,
0x7fffffff);
sad_array[3] = vp9_sad64x64(src_ptr, src_stride,
ref_ptr + 3, ref_stride,
0x7fffffff);
sad_array[4] = vp9_sad64x64(src_ptr, src_stride,
ref_ptr + 4, ref_stride,
0x7fffffff);
sad_array[5] = vp9_sad64x64(src_ptr, src_stride,
ref_ptr + 5, ref_stride,
0x7fffffff);
sad_array[6] = vp9_sad64x64(src_ptr, src_stride,
ref_ptr + 6, ref_stride,
0x7fffffff);
sad_array[7] = vp9_sad64x64(src_ptr, src_stride,
ref_ptr + 7, ref_stride,
0x7fffffff);
} }
void vp9_sad32x32x8_c(const uint8_t *src_ptr, void vp9_sad32x32x8_c(const uint8_t *src_ptr, int src_stride,
int src_stride, const uint8_t *ref_ptr, int ref_stride,
const uint8_t *ref_ptr,
int ref_stride,
unsigned int *sad_array) { unsigned int *sad_array) {
sad_array[0] = vp9_sad32x32(src_ptr, src_stride, int i;
ref_ptr, ref_stride, for (i = 0; i < 8; ++i)
0x7fffffff); sad_array[i] = vp9_sad32x32(src_ptr, src_stride, ref_ptr + i, ref_stride,
sad_array[1] = vp9_sad32x32(src_ptr, src_stride, 0x7fffffff);
ref_ptr + 1, ref_stride,
0x7fffffff);
sad_array[2] = vp9_sad32x32(src_ptr, src_stride,
ref_ptr + 2, ref_stride,
0x7fffffff);
sad_array[3] = vp9_sad32x32(src_ptr, src_stride,
ref_ptr + 3, ref_stride,
0x7fffffff);
sad_array[4] = vp9_sad32x32(src_ptr, src_stride,
ref_ptr + 4, ref_stride,
0x7fffffff);
sad_array[5] = vp9_sad32x32(src_ptr, src_stride,
ref_ptr + 5, ref_stride,
0x7fffffff);
sad_array[6] = vp9_sad32x32(src_ptr, src_stride,
ref_ptr + 6, ref_stride,
0x7fffffff);
sad_array[7] = vp9_sad32x32(src_ptr, src_stride,
ref_ptr + 7, ref_stride,
0x7fffffff);
} }
void vp9_sad16x16x3_c(const uint8_t *src_ptr, void vp9_sad16x16x3_c(const uint8_t *src_ptr, int src_stride,
int src_stride, const uint8_t *ref_ptr, int ref_stride,
const uint8_t *ref_ptr,
int ref_stride,
unsigned int *sad_array) { unsigned int *sad_array) {
sad_array[0] = vp9_sad16x16(src_ptr, src_stride, int i;
ref_ptr, ref_stride, 0x7fffffff); for (i = 0; i < 3; ++i)
sad_array[1] = vp9_sad16x16(src_ptr, src_stride, sad_array[i] = vp9_sad16x16(src_ptr, src_stride, ref_ptr + i, ref_stride,
ref_ptr + 1, ref_stride, 0x7fffffff); 0x7fffffff);
sad_array[2] = vp9_sad16x16(src_ptr, src_stride,
ref_ptr + 2, ref_stride, 0x7fffffff);
} }
void vp9_sad16x16x8_c(const uint8_t *src_ptr, void vp9_sad16x16x8_c(const uint8_t *src_ptr, int src_stride,
int src_stride, const uint8_t *ref_ptr, int ref_stride,
const uint8_t *ref_ptr,
int ref_stride,
uint32_t *sad_array) { uint32_t *sad_array) {
sad_array[0] = vp9_sad16x16(src_ptr, src_stride, int i;
ref_ptr, ref_stride, for (i = 0; i < 8; ++i)
0x7fffffff); sad_array[i] = vp9_sad16x16(src_ptr, src_stride, ref_ptr + i, ref_stride,
sad_array[1] = vp9_sad16x16(src_ptr, src_stride, 0x7fffffff);
ref_ptr + 1, ref_stride,
0x7fffffff);
sad_array[2] = vp9_sad16x16(src_ptr, src_stride,
ref_ptr + 2, ref_stride,
0x7fffffff);
sad_array[3] = vp9_sad16x16(src_ptr, src_stride,
ref_ptr + 3, ref_stride,
0x7fffffff);
sad_array[4] = vp9_sad16x16(src_ptr, src_stride,
ref_ptr + 4, ref_stride,
0x7fffffff);
sad_array[5] = vp9_sad16x16(src_ptr, src_stride,
ref_ptr + 5, ref_stride,
0x7fffffff);
sad_array[6] = vp9_sad16x16(src_ptr, src_stride,
ref_ptr + 6, ref_stride,
0x7fffffff);
sad_array[7] = vp9_sad16x16(src_ptr, src_stride,
ref_ptr + 7, ref_stride,
0x7fffffff);
} }
void vp9_sad16x8x3_c(const uint8_t *src_ptr, void vp9_sad16x8x3_c(const uint8_t *src_ptr, int src_stride,
int src_stride, const uint8_t *ref_ptr, int ref_stride,
const uint8_t *ref_ptr,
int ref_stride,
unsigned int *sad_array) { unsigned int *sad_array) {
sad_array[0] = vp9_sad16x8(src_ptr, src_stride, int i;
ref_ptr, ref_stride, 0x7fffffff); for (i = 0; i < 3; ++i)
sad_array[1] = vp9_sad16x8(src_ptr, src_stride, sad_array[i] = vp9_sad16x8(src_ptr, src_stride, ref_ptr + i, ref_stride,
ref_ptr + 1, ref_stride, 0x7fffffff); 0x7fffffff);
sad_array[2] = vp9_sad16x8(src_ptr, src_stride,
ref_ptr + 2, ref_stride, 0x7fffffff);
} }
void vp9_sad16x8x8_c(const uint8_t *src_ptr, void vp9_sad16x8x8_c(const uint8_t *src_ptr, int src_stride,
int src_stride, const uint8_t *ref_ptr, int ref_stride,
const uint8_t *ref_ptr,
int ref_stride,
uint32_t *sad_array) { uint32_t *sad_array) {
sad_array[0] = vp9_sad16x8(src_ptr, src_stride, int i;
ref_ptr, ref_stride, for (i = 0; i < 8; ++i)
0x7fffffff); sad_array[i] = vp9_sad16x8(src_ptr, src_stride, ref_ptr + i, ref_stride,
sad_array[1] = vp9_sad16x8(src_ptr, src_stride, 0x7fffffff);
ref_ptr + 1, ref_stride,
0x7fffffff);
sad_array[2] = vp9_sad16x8(src_ptr, src_stride,
ref_ptr + 2, ref_stride,
0x7fffffff);
sad_array[3] = vp9_sad16x8(src_ptr, src_stride,
ref_ptr + 3, ref_stride,
0x7fffffff);
sad_array[4] = vp9_sad16x8(src_ptr, src_stride,
ref_ptr + 4, ref_stride,
0x7fffffff);
sad_array[5] = vp9_sad16x8(src_ptr, src_stride,
ref_ptr + 5, ref_stride,
0x7fffffff);
sad_array[6] = vp9_sad16x8(src_ptr, src_stride,
ref_ptr + 6, ref_stride,
0x7fffffff);
sad_array[7] = vp9_sad16x8(src_ptr, src_stride,
ref_ptr + 7, ref_stride,
0x7fffffff);
} }
void vp9_sad8x8x3_c(const uint8_t *src_ptr, void vp9_sad8x8x3_c(const uint8_t *src_ptr, int src_stride,
int src_stride, const uint8_t *ref_ptr, int ref_stride,
const uint8_t *ref_ptr,
int ref_stride,
unsigned int *sad_array) { unsigned int *sad_array) {
sad_array[0] = vp9_sad8x8(src_ptr, src_stride, int i;
ref_ptr, ref_stride, 0x7fffffff); for (i = 0; i < 3; ++i)
sad_array[1] = vp9_sad8x8(src_ptr, src_stride, sad_array[i] = vp9_sad8x8(src_ptr, src_stride, ref_ptr + i, ref_stride,
ref_ptr + 1, ref_stride, 0x7fffffff); 0x7fffffff);
sad_array[2] = vp9_sad8x8(src_ptr, src_stride,
ref_ptr + 2, ref_stride, 0x7fffffff);
} }
void vp9_sad8x8x8_c(const uint8_t *src_ptr, void vp9_sad8x8x8_c(const uint8_t *src_ptr, int src_stride,
int src_stride, const uint8_t *ref_ptr, int ref_stride,
const uint8_t *ref_ptr,
int ref_stride,
uint32_t *sad_array) { uint32_t *sad_array) {
sad_array[0] = vp9_sad8x8(src_ptr, src_stride, int i;
ref_ptr, ref_stride, for (i = 0; i < 8; ++i)
0x7fffffff); sad_array[i] = vp9_sad8x8(src_ptr, src_stride, ref_ptr + i, ref_stride,
sad_array[1] = vp9_sad8x8(src_ptr, src_stride, 0x7fffffff);
ref_ptr + 1, ref_stride,
0x7fffffff);
sad_array[2] = vp9_sad8x8(src_ptr, src_stride,
ref_ptr + 2, ref_stride,
0x7fffffff);
sad_array[3] = vp9_sad8x8(src_ptr, src_stride,
ref_ptr + 3, ref_stride,
0x7fffffff);
sad_array[4] = vp9_sad8x8(src_ptr, src_stride,
ref_ptr + 4, ref_stride,
0x7fffffff);
sad_array[5] = vp9_sad8x8(src_ptr, src_stride,
ref_ptr + 5, ref_stride,
0x7fffffff);
sad_array[6] = vp9_sad8x8(src_ptr, src_stride,
ref_ptr + 6, ref_stride,
0x7fffffff);
sad_array[7] = vp9_sad8x8(src_ptr, src_stride,
ref_ptr + 7, ref_stride,
0x7fffffff);
} }
void vp9_sad8x16x3_c(const uint8_t *src_ptr, void vp9_sad8x16x3_c(const uint8_t *src_ptr, int src_stride,
int src_stride, const uint8_t *ref_ptr, int ref_stride,
const uint8_t *ref_ptr,
int ref_stride,
unsigned int *sad_array) { unsigned int *sad_array) {
sad_array[0] = vp9_sad8x16(src_ptr, src_stride, int i;
ref_ptr, ref_stride, 0x7fffffff); for (i = 0; i < 3; ++i)
sad_array[1] = vp9_sad8x16(src_ptr, src_stride, sad_array[i] = vp9_sad8x16(src_ptr, src_stride, ref_ptr + i, ref_stride,
ref_ptr + 1, ref_stride, 0x7fffffff); 0x7fffffff);
sad_array[2] = vp9_sad8x16(src_ptr, src_stride,
ref_ptr + 2, ref_stride, 0x7fffffff);
} }
void vp9_sad8x16x8_c(const uint8_t *src_ptr, void vp9_sad8x16x8_c(const uint8_t *src_ptr, int src_stride,
int src_stride, const uint8_t *ref_ptr, int ref_stride,
const uint8_t *ref_ptr,
int ref_stride,
uint32_t *sad_array) { uint32_t *sad_array) {
sad_array[0] = vp9_sad8x16(src_ptr, src_stride, int i;
ref_ptr, ref_stride, for (i = 0; i < 8; ++i)
0x7fffffff); sad_array[i] = vp9_sad8x16(src_ptr, src_stride, ref_ptr + i, ref_stride,
sad_array[1] = vp9_sad8x16(src_ptr, src_stride, 0x7fffffff);
ref_ptr + 1, ref_stride,
0x7fffffff);
sad_array[2] = vp9_sad8x16(src_ptr, src_stride,
ref_ptr + 2, ref_stride,
0x7fffffff);
sad_array[3] = vp9_sad8x16(src_ptr, src_stride,
ref_ptr + 3, ref_stride,
0x7fffffff);
sad_array[4] = vp9_sad8x16(src_ptr, src_stride,
ref_ptr + 4, ref_stride,
0x7fffffff);
sad_array[5] = vp9_sad8x16(src_ptr, src_stride,
ref_ptr + 5, ref_stride,
0x7fffffff);
sad_array[6] = vp9_sad8x16(src_ptr, src_stride,
ref_ptr + 6, ref_stride,
0x7fffffff);
sad_array[7] = vp9_sad8x16(src_ptr, src_stride,
ref_ptr + 7, ref_stride,
0x7fffffff);
} }
void vp9_sad4x4x3_c(const uint8_t *src_ptr, void vp9_sad4x4x3_c(const uint8_t *src_ptr, int src_stride,
int src_stride, const uint8_t *ref_ptr, int ref_stride,
const uint8_t *ref_ptr,
int ref_stride,
unsigned int *sad_array) { unsigned int *sad_array) {
sad_array[0] = vp9_sad4x4(src_ptr, src_stride, int i;
ref_ptr, ref_stride, 0x7fffffff); for (i = 0; i < 3; ++i)
sad_array[1] = vp9_sad4x4(src_ptr, src_stride, sad_array[i] = vp9_sad4x4(src_ptr, src_stride, ref_ptr + i, ref_stride,
ref_ptr + 1, ref_stride, 0x7fffffff); 0x7fffffff);
sad_array[2] = vp9_sad4x4(src_ptr, src_stride,
ref_ptr + 2, ref_stride, 0x7fffffff);
} }
void vp9_sad4x4x8_c(const uint8_t *src_ptr, void vp9_sad4x4x8_c(const uint8_t *src_ptr, int src_stride,
int src_stride, const uint8_t *ref_ptr, int ref_stride,
const uint8_t *ref_ptr,
int ref_stride,
uint32_t *sad_array) { uint32_t *sad_array) {
sad_array[0] = vp9_sad4x4(src_ptr, src_stride, int i;
ref_ptr, ref_stride, for (i = 0; i < 8; ++i)
0x7fffffff); sad_array[i] = vp9_sad4x4(src_ptr, src_stride, ref_ptr + i, ref_stride,
sad_array[1] = vp9_sad4x4(src_ptr, src_stride, 0x7fffffff);
ref_ptr + 1, ref_stride,
0x7fffffff);
sad_array[2] = vp9_sad4x4(src_ptr, src_stride,
ref_ptr + 2, ref_stride,
0x7fffffff);
sad_array[3] = vp9_sad4x4(src_ptr, src_stride,
ref_ptr + 3, ref_stride,
0x7fffffff);
sad_array[4] = vp9_sad4x4(src_ptr, src_stride,
ref_ptr + 4, ref_stride,
0x7fffffff);
sad_array[5] = vp9_sad4x4(src_ptr, src_stride,
ref_ptr + 5, ref_stride,
0x7fffffff);
sad_array[6] = vp9_sad4x4(src_ptr, src_stride,
ref_ptr + 6, ref_stride,
0x7fffffff);
sad_array[7] = vp9_sad4x4(src_ptr, src_stride,
ref_ptr + 7, ref_stride,
0x7fffffff);
} }
void vp9_sad64x64x4d_c(const uint8_t *src_ptr, void vp9_sad64x64x4d_c(const uint8_t *src_ptr, int src_stride,
int src_stride, const uint8_t* const ref_ptr[], int ref_stride,
const uint8_t* const ref_ptr[],
int ref_stride,
unsigned int *sad_array) { unsigned int *sad_array) {
sad_array[0] = vp9_sad64x64(src_ptr, src_stride, int i;
ref_ptr[0], ref_stride, 0x7fffffff); for (i = 0; i < 4; ++i)
sad_array[1] = vp9_sad64x64(src_ptr, src_stride, sad_array[i] = vp9_sad64x64(src_ptr, src_stride, ref_ptr[i], ref_stride,
ref_ptr[1], ref_stride, 0x7fffffff); 0x7fffffff);
sad_array[2] = vp9_sad64x64(src_ptr, src_stride,
ref_ptr[2], ref_stride, 0x7fffffff);
sad_array[3] = vp9_sad64x64(src_ptr, src_stride,
ref_ptr[3], ref_stride, 0x7fffffff);
} }
void vp9_sad32x32x4d_c(const uint8_t *src_ptr, void vp9_sad32x32x4d_c(const uint8_t *src_ptr, int src_stride,
int src_stride, const uint8_t* const ref_ptr[], int ref_stride,
const uint8_t* const ref_ptr[],
int ref_stride,
unsigned int *sad_array) { unsigned int *sad_array) {
sad_array[0] = vp9_sad32x32(src_ptr, src_stride, int i;
ref_ptr[0], ref_stride, 0x7fffffff); for (i = 0; i < 4; ++i)
sad_array[1] = vp9_sad32x32(src_ptr, src_stride, sad_array[i] = vp9_sad32x32(src_ptr, src_stride, ref_ptr[i], ref_stride,
ref_ptr[1], ref_stride, 0x7fffffff); 0x7fffffff);
sad_array[2] = vp9_sad32x32(src_ptr, src_stride,
ref_ptr[2], ref_stride, 0x7fffffff);
sad_array[3] = vp9_sad32x32(src_ptr, src_stride,
ref_ptr[3], ref_stride, 0x7fffffff);
} }
void vp9_sad16x16x4d_c(const uint8_t *src_ptr, void vp9_sad16x16x4d_c(const uint8_t *src_ptr, int src_stride,
int src_stride, const uint8_t* const ref_ptr[], int ref_stride,
const uint8_t* const ref_ptr[],
int ref_stride,
unsigned int *sad_array) { unsigned int *sad_array) {
sad_array[0] = vp9_sad16x16(src_ptr, src_stride, int i;
ref_ptr[0], ref_stride, 0x7fffffff); for (i = 0; i < 4; ++i)
sad_array[1] = vp9_sad16x16(src_ptr, src_stride, sad_array[i] = vp9_sad16x16(src_ptr, src_stride, ref_ptr[i], ref_stride,
ref_ptr[1], ref_stride, 0x7fffffff); 0x7fffffff);
sad_array[2] = vp9_sad16x16(src_ptr, src_stride,
ref_ptr[2], ref_stride, 0x7fffffff);
sad_array[3] = vp9_sad16x16(src_ptr, src_stride,
ref_ptr[3], ref_stride, 0x7fffffff);
} }
void vp9_sad16x8x4d_c(const uint8_t *src_ptr, void vp9_sad16x8x4d_c(const uint8_t *src_ptr, int src_stride,
int src_stride, const uint8_t* const ref_ptr[], int ref_stride,
const uint8_t* const ref_ptr[],
int ref_stride,
unsigned int *sad_array) { unsigned int *sad_array) {
sad_array[0] = vp9_sad16x8(src_ptr, src_stride, int i;
ref_ptr[0], ref_stride, 0x7fffffff); for (i = 0; i < 4; ++i)
sad_array[1] = vp9_sad16x8(src_ptr, src_stride, sad_array[i] = vp9_sad16x8(src_ptr, src_stride, ref_ptr[i], ref_stride,
ref_ptr[1], ref_stride, 0x7fffffff); 0x7fffffff);
sad_array[2] = vp9_sad16x8(src_ptr, src_stride,
ref_ptr[2], ref_stride, 0x7fffffff);
sad_array[3] = vp9_sad16x8(src_ptr, src_stride,
ref_ptr[3], ref_stride, 0x7fffffff);
} }
void vp9_sad8x8x4d_c(const uint8_t *src_ptr, void vp9_sad8x8x4d_c(const uint8_t *src_ptr, int src_stride,
int src_stride, const uint8_t* const ref_ptr[], int ref_stride,
const uint8_t* const ref_ptr[],
int ref_stride,
unsigned int *sad_array) { unsigned int *sad_array) {
sad_array[0] = vp9_sad8x8(src_ptr, src_stride, int i;
ref_ptr[0], ref_stride, 0x7fffffff); for (i = 0; i < 4; ++i)
sad_array[1] = vp9_sad8x8(src_ptr, src_stride, sad_array[i] = vp9_sad8x8(src_ptr, src_stride, ref_ptr[i], ref_stride,
ref_ptr[1], ref_stride, 0x7fffffff); 0x7fffffff);
sad_array[2] = vp9_sad8x8(src_ptr, src_stride,
ref_ptr[2], ref_stride, 0x7fffffff);
sad_array[3] = vp9_sad8x8(src_ptr, src_stride,
ref_ptr[3], ref_stride, 0x7fffffff);
} }
void vp9_sad8x16x4d_c(const uint8_t *src_ptr, void vp9_sad8x16x4d_c(const uint8_t *src_ptr, int src_stride,
int src_stride, const uint8_t* const ref_ptr[], int ref_stride,
const uint8_t* const ref_ptr[],
int ref_stride,
unsigned int *sad_array) { unsigned int *sad_array) {
sad_array[0] = vp9_sad8x16(src_ptr, src_stride, int i;
ref_ptr[0], ref_stride, 0x7fffffff); for (i = 0; i < 4; ++i)
sad_array[1] = vp9_sad8x16(src_ptr, src_stride, sad_array[i] = vp9_sad8x16(src_ptr, src_stride, ref_ptr[i], ref_stride,
ref_ptr[1], ref_stride, 0x7fffffff); 0x7fffffff);
sad_array[2] = vp9_sad8x16(src_ptr, src_stride,
ref_ptr[2], ref_stride, 0x7fffffff);
sad_array[3] = vp9_sad8x16(src_ptr, src_stride,
ref_ptr[3], ref_stride, 0x7fffffff);
} }
void vp9_sad8x4x4d_c(const uint8_t *src_ptr, void vp9_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride,
int src_stride, const uint8_t* const ref_ptr[], int ref_stride,
const uint8_t* const ref_ptr[],
int ref_stride,
unsigned int *sad_array) { unsigned int *sad_array) {
sad_array[0] = vp9_sad8x4(src_ptr, src_stride, int i;
ref_ptr[0], ref_stride, 0x7fffffff); for (i = 0; i < 4; ++i)
sad_array[1] = vp9_sad8x4(src_ptr, src_stride, sad_array[i] = vp9_sad8x4(src_ptr, src_stride, ref_ptr[i], ref_stride,
ref_ptr[1], ref_stride, 0x7fffffff); 0x7fffffff);
sad_array[2] = vp9_sad8x4(src_ptr, src_stride,
ref_ptr[2], ref_stride, 0x7fffffff);
sad_array[3] = vp9_sad8x4(src_ptr, src_stride,
ref_ptr[3], ref_stride, 0x7fffffff);
} }
void vp9_sad8x4x8_c(const uint8_t *src_ptr, void vp9_sad8x4x8_c(const uint8_t *src_ptr, int src_stride,
int src_stride, const uint8_t *ref_ptr, int ref_stride,
const uint8_t *ref_ptr, uint32_t *sad_array) {
int ref_stride, int i;
uint32_t *sad_array) { for (i = 0; i < 8; ++i)
sad_array[0] = vp9_sad8x4(src_ptr, src_stride, sad_array[i] = vp9_sad8x4(src_ptr, src_stride, ref_ptr + i, ref_stride,
ref_ptr, ref_stride, 0x7fffffff);
0x7fffffff);
sad_array[1] = vp9_sad8x4(src_ptr, src_stride,
ref_ptr + 1, ref_stride,
0x7fffffff);
sad_array[2] = vp9_sad8x4(src_ptr, src_stride,
ref_ptr + 2, ref_stride,
0x7fffffff);
sad_array[3] = vp9_sad8x4(src_ptr, src_stride,
ref_ptr + 3, ref_stride,
0x7fffffff);
sad_array[4] = vp9_sad8x4(src_ptr, src_stride,
ref_ptr + 4, ref_stride,
0x7fffffff);
sad_array[5] = vp9_sad8x4(src_ptr, src_stride,
ref_ptr + 5, ref_stride,
0x7fffffff);
sad_array[6] = vp9_sad8x4(src_ptr, src_stride,
ref_ptr + 6, ref_stride,
0x7fffffff);
sad_array[7] = vp9_sad8x4(src_ptr, src_stride,
ref_ptr + 7, ref_stride,
0x7fffffff);
} }
void vp9_sad4x8x4d_c(const uint8_t *src_ptr, void vp9_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride,
int src_stride, const uint8_t* const ref_ptr[], int ref_stride,
const uint8_t* const ref_ptr[],
int ref_stride,
unsigned int *sad_array) { unsigned int *sad_array) {
sad_array[0] = vp9_sad4x8(src_ptr, src_stride, int i;
ref_ptr[0], ref_stride, 0x7fffffff); for (i = 0; i < 4; ++i)
sad_array[1] = vp9_sad4x8(src_ptr, src_stride, sad_array[i] = vp9_sad4x8(src_ptr, src_stride, ref_ptr[i], ref_stride,
ref_ptr[1], ref_stride, 0x7fffffff); 0x7fffffff);
sad_array[2] = vp9_sad4x8(src_ptr, src_stride,
ref_ptr[2], ref_stride, 0x7fffffff);
sad_array[3] = vp9_sad4x8(src_ptr, src_stride,
ref_ptr[3], ref_stride, 0x7fffffff);
} }
void vp9_sad4x8x8_c(const uint8_t *src_ptr, void vp9_sad4x8x8_c(const uint8_t *src_ptr, int src_stride,
int src_stride, const uint8_t *ref_ptr, int ref_stride,
const uint8_t *ref_ptr, uint32_t *sad_array) {
int ref_stride, int i;
uint32_t *sad_array) { for (i = 0; i < 8; ++i)
sad_array[0] = vp9_sad4x8(src_ptr, src_stride, sad_array[i] = vp9_sad4x8(src_ptr, src_stride, ref_ptr + i, ref_stride,
ref_ptr, ref_stride, 0x7fffffff);
0x7fffffff);
sad_array[1] = vp9_sad4x8(src_ptr, src_stride,
ref_ptr + 1, ref_stride,
0x7fffffff);
sad_array[2] = vp9_sad4x8(src_ptr, src_stride,
ref_ptr + 2, ref_stride,
0x7fffffff);
sad_array[3] = vp9_sad4x8(src_ptr, src_stride,
ref_ptr + 3, ref_stride,
0x7fffffff);
sad_array[4] = vp9_sad4x8(src_ptr, src_stride,
ref_ptr + 4, ref_stride,
0x7fffffff);
sad_array[5] = vp9_sad4x8(src_ptr, src_stride,
ref_ptr + 5, ref_stride,
0x7fffffff);
sad_array[6] = vp9_sad4x8(src_ptr, src_stride,
ref_ptr + 6, ref_stride,
0x7fffffff);
sad_array[7] = vp9_sad4x8(src_ptr, src_stride,
ref_ptr + 7, ref_stride,
0x7fffffff);
} }
void vp9_sad4x4x4d_c(const uint8_t *src_ptr, void vp9_sad4x4x4d_c(const uint8_t *src_ptr, int src_stride,
int src_stride, const uint8_t* const ref_ptr[], int ref_stride,
const uint8_t* const ref_ptr[],
int ref_stride,
unsigned int *sad_array) { unsigned int *sad_array) {
sad_array[0] = vp9_sad4x4(src_ptr, src_stride, int i;
ref_ptr[0], ref_stride, 0x7fffffff); for (i = 0; i < 4; ++i)
sad_array[1] = vp9_sad4x4(src_ptr, src_stride, sad_array[i] = vp9_sad4x4(src_ptr, src_stride, ref_ptr[i], ref_stride,
ref_ptr[1], ref_stride, 0x7fffffff); 0x7fffffff);
sad_array[2] = vp9_sad4x4(src_ptr, src_stride,
ref_ptr[2], ref_stride, 0x7fffffff);
sad_array[3] = vp9_sad4x4(src_ptr, src_stride,
ref_ptr[3], ref_stride, 0x7fffffff);
} }

Просмотреть файл

@ -1,38 +0,0 @@
/*
* Copyright (c) 2010 The WebM project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP9_ENCODER_VP9_SADMXN_H_
#define VP9_ENCODER_VP9_SADMXN_H_
#include "./vpx_config.h"
#include "vpx/vpx_integer.h"
static INLINE unsigned int sad_mx_n_c(const uint8_t *src_ptr,
int src_stride,
const uint8_t *ref_ptr,
int ref_stride,
int m,
int n) {
int r, c;
unsigned int sad = 0;
for (r = 0; r < n; r++) {
for (c = 0; c < m; c++) {
sad += abs(src_ptr[c] - ref_ptr[c]);
}
src_ptr += src_stride;
ref_ptr += ref_stride;
}
return sad;
}
#endif // VP9_ENCODER_VP9_SADMXN_H_

Просмотреть файл

@ -44,7 +44,6 @@ VP9_CX_SRCS-yes += encoder/vp9_quantize.h
VP9_CX_SRCS-yes += encoder/vp9_ratectrl.h VP9_CX_SRCS-yes += encoder/vp9_ratectrl.h
VP9_CX_SRCS-yes += encoder/vp9_rdopt.h VP9_CX_SRCS-yes += encoder/vp9_rdopt.h
VP9_CX_SRCS-yes += encoder/vp9_pickmode.h VP9_CX_SRCS-yes += encoder/vp9_pickmode.h
VP9_CX_SRCS-yes += encoder/vp9_sadmxn.h
VP9_CX_SRCS-yes += encoder/vp9_tokenize.h VP9_CX_SRCS-yes += encoder/vp9_tokenize.h
VP9_CX_SRCS-yes += encoder/vp9_treewriter.h VP9_CX_SRCS-yes += encoder/vp9_treewriter.h
VP9_CX_SRCS-yes += encoder/vp9_variance.h VP9_CX_SRCS-yes += encoder/vp9_variance.h