Index: source/libvpx/vp9/encoder/vp9_sad_c.c |
=================================================================== |
--- source/libvpx/vp9/encoder/vp9_sad_c.c (revision 177019) |
+++ source/libvpx/vp9/encoder/vp9_sad_c.c (working copy) |
@@ -11,65 +11,85 @@ |
#include <stdlib.h> |
#include "vp9/common/vp9_sadmxn.h" |
-#include "vpx_ports/config.h" |
+#include "./vpx_config.h" |
#include "vpx/vpx_integer.h" |
-unsigned int vp9_sad32x32_c(const unsigned char *src_ptr, |
+unsigned int vp9_sad64x64_c(const uint8_t *src_ptr, |
int src_stride, |
- const unsigned char *ref_ptr, |
+ const uint8_t *ref_ptr, |
int ref_stride, |
int max_sad) { |
+ return sad_mx_n_c(src_ptr, src_stride, ref_ptr, ref_stride, 64, 64); |
+} |
+ |
+unsigned int vp9_sad32x32_c(const uint8_t *src_ptr, |
+ int src_stride, |
+ const uint8_t *ref_ptr, |
+ int ref_stride, |
+ int max_sad) { |
return sad_mx_n_c(src_ptr, src_stride, ref_ptr, ref_stride, 32, 32); |
} |
-unsigned int vp9_sad16x16_c(const unsigned char *src_ptr, |
+unsigned int vp9_sad16x16_c(const uint8_t *src_ptr, |
int src_stride, |
- const unsigned char *ref_ptr, |
+ const uint8_t *ref_ptr, |
int ref_stride, |
int max_sad) { |
return sad_mx_n_c(src_ptr, src_stride, ref_ptr, ref_stride, 16, 16); |
} |
-unsigned int vp9_sad8x8_c(const unsigned char *src_ptr, |
+unsigned int vp9_sad8x8_c(const uint8_t *src_ptr, |
int src_stride, |
- const unsigned char *ref_ptr, |
+ const uint8_t *ref_ptr, |
int ref_stride, |
int max_sad) { |
return sad_mx_n_c(src_ptr, src_stride, ref_ptr, ref_stride, 8, 8); |
} |
-unsigned int vp9_sad16x8_c(const unsigned char *src_ptr, |
+unsigned int vp9_sad16x8_c(const uint8_t *src_ptr, |
int src_stride, |
- const unsigned char *ref_ptr, |
+ const uint8_t *ref_ptr, |
int ref_stride, |
int max_sad) { |
return sad_mx_n_c(src_ptr, src_stride, ref_ptr, ref_stride, 16, 8); |
} |
-unsigned int vp9_sad8x16_c(const unsigned char *src_ptr, |
+unsigned int vp9_sad8x16_c(const uint8_t *src_ptr, |
int src_stride, |
- const unsigned char *ref_ptr, |
+ const uint8_t *ref_ptr, |
int ref_stride, |
int max_sad) { |
return sad_mx_n_c(src_ptr, src_stride, ref_ptr, ref_stride, 8, 16); |
} |
-unsigned int vp9_sad4x4_c(const unsigned char *src_ptr, |
+unsigned int vp9_sad4x4_c(const uint8_t *src_ptr, |
int src_stride, |
- const unsigned char *ref_ptr, |
+ const uint8_t *ref_ptr, |
int ref_stride, |
int max_sad) { |
return sad_mx_n_c(src_ptr, src_stride, ref_ptr, ref_stride, 4, 4); |
} |
-void vp9_sad32x32x3_c(const unsigned char *src_ptr, |
+void vp9_sad64x64x3_c(const uint8_t *src_ptr, |
int src_stride, |
- const unsigned char *ref_ptr, |
+ const uint8_t *ref_ptr, |
int ref_stride, |
- unsigned int *sad_array |
- ) { |
+ unsigned int *sad_array) { |
+ sad_array[0] = vp9_sad64x64_c(src_ptr, src_stride, |
+ ref_ptr, ref_stride, 0x7fffffff); |
+ sad_array[1] = vp9_sad64x64_c(src_ptr, src_stride, |
+ ref_ptr + 1, ref_stride, 0x7fffffff); |
+ sad_array[2] = vp9_sad64x64_c(src_ptr, src_stride, |
+ ref_ptr + 2, ref_stride, 0x7fffffff); |
+} |
+ |
+void vp9_sad32x32x3_c(const uint8_t *src_ptr, |
+ int src_stride, |
+ const uint8_t *ref_ptr, |
+ int ref_stride, |
+ unsigned int *sad_array) { |
sad_array[0] = vp9_sad32x32_c(src_ptr, src_stride, |
ref_ptr, ref_stride, 0x7fffffff); |
sad_array[1] = vp9_sad32x32_c(src_ptr, src_stride, |
@@ -78,42 +98,72 @@ |
ref_ptr + 2, ref_stride, 0x7fffffff); |
} |
-void vp9_sad32x32x8_c(const unsigned char *src_ptr, |
+void vp9_sad64x64x8_c(const uint8_t *src_ptr, |
int src_stride, |
- const unsigned char *ref_ptr, |
+ const uint8_t *ref_ptr, |
int ref_stride, |
- unsigned short *sad_array |
- ) { |
- sad_array[0] = (unsigned short)vp9_sad32x32_c(src_ptr, src_stride, |
- ref_ptr, ref_stride, |
- 0x7fffffff); |
- sad_array[1] = (unsigned short)vp9_sad32x32_c(src_ptr, src_stride, |
- ref_ptr + 1, ref_stride, |
- 0x7fffffff); |
- sad_array[2] = (unsigned short)vp9_sad32x32_c(src_ptr, src_stride, |
- ref_ptr + 2, ref_stride, |
- 0x7fffffff); |
- sad_array[3] = (unsigned short)vp9_sad32x32_c(src_ptr, src_stride, |
- ref_ptr + 3, ref_stride, |
- 0x7fffffff); |
- sad_array[4] = (unsigned short)vp9_sad32x32_c(src_ptr, src_stride, |
- ref_ptr + 4, ref_stride, |
- 0x7fffffff); |
- sad_array[5] = (unsigned short)vp9_sad32x32_c(src_ptr, src_stride, |
- ref_ptr + 5, ref_stride, |
- 0x7fffffff); |
- sad_array[6] = (unsigned short)vp9_sad32x32_c(src_ptr, src_stride, |
- ref_ptr + 6, ref_stride, |
- 0x7fffffff); |
- sad_array[7] = (unsigned short)vp9_sad32x32_c(src_ptr, src_stride, |
- ref_ptr + 7, ref_stride, |
- 0x7fffffff); |
+ uint16_t *sad_array) { |
+ sad_array[0] = (uint16_t)vp9_sad64x64_c(src_ptr, src_stride, |
+ ref_ptr, ref_stride, |
+ 0x7fffffff); |
+ sad_array[1] = (uint16_t)vp9_sad64x64_c(src_ptr, src_stride, |
+ ref_ptr + 1, ref_stride, |
+ 0x7fffffff); |
+ sad_array[2] = (uint16_t)vp9_sad64x64_c(src_ptr, src_stride, |
+ ref_ptr + 2, ref_stride, |
+ 0x7fffffff); |
+ sad_array[3] = (uint16_t)vp9_sad64x64_c(src_ptr, src_stride, |
+ ref_ptr + 3, ref_stride, |
+ 0x7fffffff); |
+ sad_array[4] = (uint16_t)vp9_sad64x64_c(src_ptr, src_stride, |
+ ref_ptr + 4, ref_stride, |
+ 0x7fffffff); |
+ sad_array[5] = (uint16_t)vp9_sad64x64_c(src_ptr, src_stride, |
+ ref_ptr + 5, ref_stride, |
+ 0x7fffffff); |
+ sad_array[6] = (uint16_t)vp9_sad64x64_c(src_ptr, src_stride, |
+ ref_ptr + 6, ref_stride, |
+ 0x7fffffff); |
+ sad_array[7] = (uint16_t)vp9_sad64x64_c(src_ptr, src_stride, |
+ ref_ptr + 7, ref_stride, |
+ 0x7fffffff); |
} |
-void vp9_sad16x16x3_c(const unsigned char *src_ptr, |
+void vp9_sad32x32x8_c(const uint8_t *src_ptr, |
int src_stride, |
- const unsigned char *ref_ptr, |
+ const uint8_t *ref_ptr, |
int ref_stride, |
+ uint16_t *sad_array) { |
+ sad_array[0] = (uint16_t)vp9_sad32x32_c(src_ptr, src_stride, |
+ ref_ptr, ref_stride, |
+ 0x7fffffff); |
+ sad_array[1] = (uint16_t)vp9_sad32x32_c(src_ptr, src_stride, |
+ ref_ptr + 1, ref_stride, |
+ 0x7fffffff); |
+ sad_array[2] = (uint16_t)vp9_sad32x32_c(src_ptr, src_stride, |
+ ref_ptr + 2, ref_stride, |
+ 0x7fffffff); |
+ sad_array[3] = (uint16_t)vp9_sad32x32_c(src_ptr, src_stride, |
+ ref_ptr + 3, ref_stride, |
+ 0x7fffffff); |
+ sad_array[4] = (uint16_t)vp9_sad32x32_c(src_ptr, src_stride, |
+ ref_ptr + 4, ref_stride, |
+ 0x7fffffff); |
+ sad_array[5] = (uint16_t)vp9_sad32x32_c(src_ptr, src_stride, |
+ ref_ptr + 5, ref_stride, |
+ 0x7fffffff); |
+ sad_array[6] = (uint16_t)vp9_sad32x32_c(src_ptr, src_stride, |
+ ref_ptr + 6, ref_stride, |
+ 0x7fffffff); |
+ sad_array[7] = (uint16_t)vp9_sad32x32_c(src_ptr, src_stride, |
+ ref_ptr + 7, ref_stride, |
+ 0x7fffffff); |
+} |
+ |
+void vp9_sad16x16x3_c(const uint8_t *src_ptr, |
+ int src_stride, |
+ const uint8_t *ref_ptr, |
+ int ref_stride, |
unsigned int *sad_array) { |
sad_array[0] = vp9_sad16x16_c(src_ptr, src_stride, |
ref_ptr, ref_stride, 0x7fffffff); |
@@ -123,40 +173,40 @@ |
ref_ptr + 2, ref_stride, 0x7fffffff); |
} |
-void vp9_sad16x16x8_c(const unsigned char *src_ptr, |
+void vp9_sad16x16x8_c(const uint8_t *src_ptr, |
int src_stride, |
- const unsigned char *ref_ptr, |
+ const uint8_t *ref_ptr, |
int ref_stride, |
- unsigned short *sad_array) { |
- sad_array[0] = (unsigned short)vp9_sad16x16_c(src_ptr, src_stride, |
- ref_ptr, ref_stride, |
- 0x7fffffff); |
- sad_array[1] = (unsigned short)vp9_sad16x16_c(src_ptr, src_stride, |
- ref_ptr + 1, ref_stride, |
- 0x7fffffff); |
- sad_array[2] = (unsigned short)vp9_sad16x16_c(src_ptr, src_stride, |
- ref_ptr + 2, ref_stride, |
- 0x7fffffff); |
- sad_array[3] = (unsigned short)vp9_sad16x16_c(src_ptr, src_stride, |
- ref_ptr + 3, ref_stride, |
- 0x7fffffff); |
- sad_array[4] = (unsigned short)vp9_sad16x16_c(src_ptr, src_stride, |
- ref_ptr + 4, ref_stride, |
- 0x7fffffff); |
- sad_array[5] = (unsigned short)vp9_sad16x16_c(src_ptr, src_stride, |
- ref_ptr + 5, ref_stride, |
- 0x7fffffff); |
- sad_array[6] = (unsigned short)vp9_sad16x16_c(src_ptr, src_stride, |
- ref_ptr + 6, ref_stride, |
- 0x7fffffff); |
- sad_array[7] = (unsigned short)vp9_sad16x16_c(src_ptr, src_stride, |
- ref_ptr + 7, ref_stride, |
- 0x7fffffff); |
+ uint16_t *sad_array) { |
+ sad_array[0] = (uint16_t)vp9_sad16x16_c(src_ptr, src_stride, |
+ ref_ptr, ref_stride, |
+ 0x7fffffff); |
+ sad_array[1] = (uint16_t)vp9_sad16x16_c(src_ptr, src_stride, |
+ ref_ptr + 1, ref_stride, |
+ 0x7fffffff); |
+ sad_array[2] = (uint16_t)vp9_sad16x16_c(src_ptr, src_stride, |
+ ref_ptr + 2, ref_stride, |
+ 0x7fffffff); |
+ sad_array[3] = (uint16_t)vp9_sad16x16_c(src_ptr, src_stride, |
+ ref_ptr + 3, ref_stride, |
+ 0x7fffffff); |
+ sad_array[4] = (uint16_t)vp9_sad16x16_c(src_ptr, src_stride, |
+ ref_ptr + 4, ref_stride, |
+ 0x7fffffff); |
+ sad_array[5] = (uint16_t)vp9_sad16x16_c(src_ptr, src_stride, |
+ ref_ptr + 5, ref_stride, |
+ 0x7fffffff); |
+ sad_array[6] = (uint16_t)vp9_sad16x16_c(src_ptr, src_stride, |
+ ref_ptr + 6, ref_stride, |
+ 0x7fffffff); |
+ sad_array[7] = (uint16_t)vp9_sad16x16_c(src_ptr, src_stride, |
+ ref_ptr + 7, ref_stride, |
+ 0x7fffffff); |
} |
-void vp9_sad16x8x3_c(const unsigned char *src_ptr, |
+void vp9_sad16x8x3_c(const uint8_t *src_ptr, |
int src_stride, |
- const unsigned char *ref_ptr, |
+ const uint8_t *ref_ptr, |
int ref_stride, |
unsigned int *sad_array) { |
sad_array[0] = vp9_sad16x8_c(src_ptr, src_stride, |
@@ -167,40 +217,40 @@ |
ref_ptr + 2, ref_stride, 0x7fffffff); |
} |
-void vp9_sad16x8x8_c(const unsigned char *src_ptr, |
+void vp9_sad16x8x8_c(const uint8_t *src_ptr, |
int src_stride, |
- const unsigned char *ref_ptr, |
+ const uint8_t *ref_ptr, |
int ref_stride, |
- unsigned short *sad_array) { |
- sad_array[0] = (unsigned short)vp9_sad16x8_c(src_ptr, src_stride, |
- ref_ptr, ref_stride, |
- 0x7fffffff); |
- sad_array[1] = (unsigned short)vp9_sad16x8_c(src_ptr, src_stride, |
- ref_ptr + 1, ref_stride, |
- 0x7fffffff); |
- sad_array[2] = (unsigned short)vp9_sad16x8_c(src_ptr, src_stride, |
- ref_ptr + 2, ref_stride, |
- 0x7fffffff); |
- sad_array[3] = (unsigned short)vp9_sad16x8_c(src_ptr, src_stride, |
- ref_ptr + 3, ref_stride, |
- 0x7fffffff); |
- sad_array[4] = (unsigned short)vp9_sad16x8_c(src_ptr, src_stride, |
- ref_ptr + 4, ref_stride, |
- 0x7fffffff); |
- sad_array[5] = (unsigned short)vp9_sad16x8_c(src_ptr, src_stride, |
- ref_ptr + 5, ref_stride, |
- 0x7fffffff); |
- sad_array[6] = (unsigned short)vp9_sad16x8_c(src_ptr, src_stride, |
- ref_ptr + 6, ref_stride, |
- 0x7fffffff); |
- sad_array[7] = (unsigned short)vp9_sad16x8_c(src_ptr, src_stride, |
- ref_ptr + 7, ref_stride, |
- 0x7fffffff); |
+ uint16_t *sad_array) { |
+ sad_array[0] = (uint16_t)vp9_sad16x8_c(src_ptr, src_stride, |
+ ref_ptr, ref_stride, |
+ 0x7fffffff); |
+ sad_array[1] = (uint16_t)vp9_sad16x8_c(src_ptr, src_stride, |
+ ref_ptr + 1, ref_stride, |
+ 0x7fffffff); |
+ sad_array[2] = (uint16_t)vp9_sad16x8_c(src_ptr, src_stride, |
+ ref_ptr + 2, ref_stride, |
+ 0x7fffffff); |
+ sad_array[3] = (uint16_t)vp9_sad16x8_c(src_ptr, src_stride, |
+ ref_ptr + 3, ref_stride, |
+ 0x7fffffff); |
+ sad_array[4] = (uint16_t)vp9_sad16x8_c(src_ptr, src_stride, |
+ ref_ptr + 4, ref_stride, |
+ 0x7fffffff); |
+ sad_array[5] = (uint16_t)vp9_sad16x8_c(src_ptr, src_stride, |
+ ref_ptr + 5, ref_stride, |
+ 0x7fffffff); |
+ sad_array[6] = (uint16_t)vp9_sad16x8_c(src_ptr, src_stride, |
+ ref_ptr + 6, ref_stride, |
+ 0x7fffffff); |
+ sad_array[7] = (uint16_t)vp9_sad16x8_c(src_ptr, src_stride, |
+ ref_ptr + 7, ref_stride, |
+ 0x7fffffff); |
} |
-void vp9_sad8x8x3_c(const unsigned char *src_ptr, |
+void vp9_sad8x8x3_c(const uint8_t *src_ptr, |
int src_stride, |
- const unsigned char *ref_ptr, |
+ const uint8_t *ref_ptr, |
int ref_stride, |
unsigned int *sad_array) { |
sad_array[0] = vp9_sad8x8_c(src_ptr, src_stride, |
@@ -211,40 +261,40 @@ |
ref_ptr + 2, ref_stride, 0x7fffffff); |
} |
-void vp9_sad8x8x8_c(const unsigned char *src_ptr, |
+void vp9_sad8x8x8_c(const uint8_t *src_ptr, |
int src_stride, |
- const unsigned char *ref_ptr, |
+ const uint8_t *ref_ptr, |
int ref_stride, |
- unsigned short *sad_array) { |
- sad_array[0] = (unsigned short)vp9_sad8x8_c(src_ptr, src_stride, |
- ref_ptr, ref_stride, |
- 0x7fffffff); |
- sad_array[1] = (unsigned short)vp9_sad8x8_c(src_ptr, src_stride, |
- ref_ptr + 1, ref_stride, |
- 0x7fffffff); |
- sad_array[2] = (unsigned short)vp9_sad8x8_c(src_ptr, src_stride, |
- ref_ptr + 2, ref_stride, |
- 0x7fffffff); |
- sad_array[3] = (unsigned short)vp9_sad8x8_c(src_ptr, src_stride, |
- ref_ptr + 3, ref_stride, |
- 0x7fffffff); |
- sad_array[4] = (unsigned short)vp9_sad8x8_c(src_ptr, src_stride, |
- ref_ptr + 4, ref_stride, |
- 0x7fffffff); |
- sad_array[5] = (unsigned short)vp9_sad8x8_c(src_ptr, src_stride, |
- ref_ptr + 5, ref_stride, |
- 0x7fffffff); |
- sad_array[6] = (unsigned short)vp9_sad8x8_c(src_ptr, src_stride, |
- ref_ptr + 6, ref_stride, |
- 0x7fffffff); |
- sad_array[7] = (unsigned short)vp9_sad8x8_c(src_ptr, src_stride, |
- ref_ptr + 7, ref_stride, |
- 0x7fffffff); |
+ uint16_t *sad_array) { |
+ sad_array[0] = (uint16_t)vp9_sad8x8_c(src_ptr, src_stride, |
+ ref_ptr, ref_stride, |
+ 0x7fffffff); |
+ sad_array[1] = (uint16_t)vp9_sad8x8_c(src_ptr, src_stride, |
+ ref_ptr + 1, ref_stride, |
+ 0x7fffffff); |
+ sad_array[2] = (uint16_t)vp9_sad8x8_c(src_ptr, src_stride, |
+ ref_ptr + 2, ref_stride, |
+ 0x7fffffff); |
+ sad_array[3] = (uint16_t)vp9_sad8x8_c(src_ptr, src_stride, |
+ ref_ptr + 3, ref_stride, |
+ 0x7fffffff); |
+ sad_array[4] = (uint16_t)vp9_sad8x8_c(src_ptr, src_stride, |
+ ref_ptr + 4, ref_stride, |
+ 0x7fffffff); |
+ sad_array[5] = (uint16_t)vp9_sad8x8_c(src_ptr, src_stride, |
+ ref_ptr + 5, ref_stride, |
+ 0x7fffffff); |
+ sad_array[6] = (uint16_t)vp9_sad8x8_c(src_ptr, src_stride, |
+ ref_ptr + 6, ref_stride, |
+ 0x7fffffff); |
+ sad_array[7] = (uint16_t)vp9_sad8x8_c(src_ptr, src_stride, |
+ ref_ptr + 7, ref_stride, |
+ 0x7fffffff); |
} |
-void vp9_sad8x16x3_c(const unsigned char *src_ptr, |
+void vp9_sad8x16x3_c(const uint8_t *src_ptr, |
int src_stride, |
- const unsigned char *ref_ptr, |
+ const uint8_t *ref_ptr, |
int ref_stride, |
unsigned int *sad_array) { |
sad_array[0] = vp9_sad8x16_c(src_ptr, src_stride, |
@@ -255,40 +305,40 @@ |
ref_ptr + 2, ref_stride, 0x7fffffff); |
} |
-void vp9_sad8x16x8_c(const unsigned char *src_ptr, |
+void vp9_sad8x16x8_c(const uint8_t *src_ptr, |
int src_stride, |
- const unsigned char *ref_ptr, |
+ const uint8_t *ref_ptr, |
int ref_stride, |
- unsigned short *sad_array) { |
- sad_array[0] = (unsigned short)vp9_sad8x16_c(src_ptr, src_stride, |
- ref_ptr, ref_stride, |
- 0x7fffffff); |
- sad_array[1] = (unsigned short)vp9_sad8x16_c(src_ptr, src_stride, |
- ref_ptr + 1, ref_stride, |
- 0x7fffffff); |
- sad_array[2] = (unsigned short)vp9_sad8x16_c(src_ptr, src_stride, |
- ref_ptr + 2, ref_stride, |
- 0x7fffffff); |
- sad_array[3] = (unsigned short)vp9_sad8x16_c(src_ptr, src_stride, |
- ref_ptr + 3, ref_stride, |
- 0x7fffffff); |
- sad_array[4] = (unsigned short)vp9_sad8x16_c(src_ptr, src_stride, |
- ref_ptr + 4, ref_stride, |
- 0x7fffffff); |
- sad_array[5] = (unsigned short)vp9_sad8x16_c(src_ptr, src_stride, |
- ref_ptr + 5, ref_stride, |
- 0x7fffffff); |
- sad_array[6] = (unsigned short)vp9_sad8x16_c(src_ptr, src_stride, |
- ref_ptr + 6, ref_stride, |
- 0x7fffffff); |
- sad_array[7] = (unsigned short)vp9_sad8x16_c(src_ptr, src_stride, |
- ref_ptr + 7, ref_stride, |
- 0x7fffffff); |
+ uint16_t *sad_array) { |
+ sad_array[0] = (uint16_t)vp9_sad8x16_c(src_ptr, src_stride, |
+ ref_ptr, ref_stride, |
+ 0x7fffffff); |
+ sad_array[1] = (uint16_t)vp9_sad8x16_c(src_ptr, src_stride, |
+ ref_ptr + 1, ref_stride, |
+ 0x7fffffff); |
+ sad_array[2] = (uint16_t)vp9_sad8x16_c(src_ptr, src_stride, |
+ ref_ptr + 2, ref_stride, |
+ 0x7fffffff); |
+ sad_array[3] = (uint16_t)vp9_sad8x16_c(src_ptr, src_stride, |
+ ref_ptr + 3, ref_stride, |
+ 0x7fffffff); |
+ sad_array[4] = (uint16_t)vp9_sad8x16_c(src_ptr, src_stride, |
+ ref_ptr + 4, ref_stride, |
+ 0x7fffffff); |
+ sad_array[5] = (uint16_t)vp9_sad8x16_c(src_ptr, src_stride, |
+ ref_ptr + 5, ref_stride, |
+ 0x7fffffff); |
+ sad_array[6] = (uint16_t)vp9_sad8x16_c(src_ptr, src_stride, |
+ ref_ptr + 6, ref_stride, |
+ 0x7fffffff); |
+ sad_array[7] = (uint16_t)vp9_sad8x16_c(src_ptr, src_stride, |
+ ref_ptr + 7, ref_stride, |
+ 0x7fffffff); |
} |
-void vp9_sad4x4x3_c(const unsigned char *src_ptr, |
+void vp9_sad4x4x3_c(const uint8_t *src_ptr, |
int src_stride, |
- const unsigned char *ref_ptr, |
+ const uint8_t *ref_ptr, |
int ref_stride, |
unsigned int *sad_array) { |
sad_array[0] = vp9_sad4x4_c(src_ptr, src_stride, |
@@ -299,43 +349,57 @@ |
ref_ptr + 2, ref_stride, 0x7fffffff); |
} |
-void vp9_sad4x4x8_c(const unsigned char *src_ptr, |
+void vp9_sad4x4x8_c(const uint8_t *src_ptr, |
int src_stride, |
- const unsigned char *ref_ptr, |
+ const uint8_t *ref_ptr, |
int ref_stride, |
- unsigned short *sad_array) { |
- sad_array[0] = (unsigned short)vp9_sad4x4_c(src_ptr, src_stride, |
- ref_ptr, ref_stride, |
- 0x7fffffff); |
- sad_array[1] = (unsigned short)vp9_sad4x4_c(src_ptr, src_stride, |
- ref_ptr + 1, ref_stride, |
- 0x7fffffff); |
- sad_array[2] = (unsigned short)vp9_sad4x4_c(src_ptr, src_stride, |
- ref_ptr + 2, ref_stride, |
- 0x7fffffff); |
- sad_array[3] = (unsigned short)vp9_sad4x4_c(src_ptr, src_stride, |
- ref_ptr + 3, ref_stride, |
- 0x7fffffff); |
- sad_array[4] = (unsigned short)vp9_sad4x4_c(src_ptr, src_stride, |
- ref_ptr + 4, ref_stride, |
- 0x7fffffff); |
- sad_array[5] = (unsigned short)vp9_sad4x4_c(src_ptr, src_stride, |
- ref_ptr + 5, ref_stride, |
- 0x7fffffff); |
- sad_array[6] = (unsigned short)vp9_sad4x4_c(src_ptr, src_stride, |
- ref_ptr + 6, ref_stride, |
- 0x7fffffff); |
- sad_array[7] = (unsigned short)vp9_sad4x4_c(src_ptr, src_stride, |
- ref_ptr + 7, ref_stride, |
- 0x7fffffff); |
+ uint16_t *sad_array) { |
+ sad_array[0] = (uint16_t)vp9_sad4x4_c(src_ptr, src_stride, |
+ ref_ptr, ref_stride, |
+ 0x7fffffff); |
+ sad_array[1] = (uint16_t)vp9_sad4x4_c(src_ptr, src_stride, |
+ ref_ptr + 1, ref_stride, |
+ 0x7fffffff); |
+ sad_array[2] = (uint16_t)vp9_sad4x4_c(src_ptr, src_stride, |
+ ref_ptr + 2, ref_stride, |
+ 0x7fffffff); |
+ sad_array[3] = (uint16_t)vp9_sad4x4_c(src_ptr, src_stride, |
+ ref_ptr + 3, ref_stride, |
+ 0x7fffffff); |
+ sad_array[4] = (uint16_t)vp9_sad4x4_c(src_ptr, src_stride, |
+ ref_ptr + 4, ref_stride, |
+ 0x7fffffff); |
+ sad_array[5] = (uint16_t)vp9_sad4x4_c(src_ptr, src_stride, |
+ ref_ptr + 5, ref_stride, |
+ 0x7fffffff); |
+ sad_array[6] = (uint16_t)vp9_sad4x4_c(src_ptr, src_stride, |
+ ref_ptr + 6, ref_stride, |
+ 0x7fffffff); |
+ sad_array[7] = (uint16_t)vp9_sad4x4_c(src_ptr, src_stride, |
+ ref_ptr + 7, ref_stride, |
+ 0x7fffffff); |
} |
-void vp9_sad32x32x4d_c(const unsigned char *src_ptr, |
+void vp9_sad64x64x4d_c(const uint8_t *src_ptr, |
int src_stride, |
- unsigned char *ref_ptr[], |
+ uint8_t *ref_ptr[], |
int ref_stride, |
- unsigned int *sad_array |
- ) { |
+ unsigned int *sad_array) { |
+ sad_array[0] = vp9_sad64x64_c(src_ptr, src_stride, |
+ ref_ptr[0], ref_stride, 0x7fffffff); |
+ sad_array[1] = vp9_sad64x64_c(src_ptr, src_stride, |
+ ref_ptr[1], ref_stride, 0x7fffffff); |
+ sad_array[2] = vp9_sad64x64_c(src_ptr, src_stride, |
+ ref_ptr[2], ref_stride, 0x7fffffff); |
+ sad_array[3] = vp9_sad64x64_c(src_ptr, src_stride, |
+ ref_ptr[3], ref_stride, 0x7fffffff); |
+} |
+ |
+void vp9_sad32x32x4d_c(const uint8_t *src_ptr, |
+ int src_stride, |
+ uint8_t *ref_ptr[], |
+ int ref_stride, |
+ unsigned int *sad_array) { |
sad_array[0] = vp9_sad32x32_c(src_ptr, src_stride, |
ref_ptr[0], ref_stride, 0x7fffffff); |
sad_array[1] = vp9_sad32x32_c(src_ptr, src_stride, |
@@ -346,9 +410,9 @@ |
ref_ptr[3], ref_stride, 0x7fffffff); |
} |
-void vp9_sad16x16x4d_c(const unsigned char *src_ptr, |
+void vp9_sad16x16x4d_c(const uint8_t *src_ptr, |
int src_stride, |
- unsigned char *ref_ptr[], |
+ uint8_t *ref_ptr[], |
int ref_stride, |
unsigned int *sad_array) { |
sad_array[0] = vp9_sad16x16_c(src_ptr, src_stride, |
@@ -361,9 +425,9 @@ |
ref_ptr[3], ref_stride, 0x7fffffff); |
} |
-void vp9_sad16x8x4d_c(const unsigned char *src_ptr, |
+void vp9_sad16x8x4d_c(const uint8_t *src_ptr, |
int src_stride, |
- unsigned char *ref_ptr[], |
+ uint8_t *ref_ptr[], |
int ref_stride, |
unsigned int *sad_array) { |
sad_array[0] = vp9_sad16x8_c(src_ptr, src_stride, |
@@ -376,9 +440,9 @@ |
ref_ptr[3], ref_stride, 0x7fffffff); |
} |
-void vp9_sad8x8x4d_c(const unsigned char *src_ptr, |
+void vp9_sad8x8x4d_c(const uint8_t *src_ptr, |
int src_stride, |
- unsigned char *ref_ptr[], |
+ uint8_t *ref_ptr[], |
int ref_stride, |
unsigned int *sad_array) { |
sad_array[0] = vp9_sad8x8_c(src_ptr, src_stride, |
@@ -391,9 +455,9 @@ |
ref_ptr[3], ref_stride, 0x7fffffff); |
} |
-void vp9_sad8x16x4d_c(const unsigned char *src_ptr, |
+void vp9_sad8x16x4d_c(const uint8_t *src_ptr, |
int src_stride, |
- unsigned char *ref_ptr[], |
+ uint8_t *ref_ptr[], |
int ref_stride, |
unsigned int *sad_array) { |
sad_array[0] = vp9_sad8x16_c(src_ptr, src_stride, |
@@ -406,9 +470,9 @@ |
ref_ptr[3], ref_stride, 0x7fffffff); |
} |
-void vp9_sad4x4x4d_c(const unsigned char *src_ptr, |
+void vp9_sad4x4x4d_c(const uint8_t *src_ptr, |
int src_stride, |
- unsigned char *ref_ptr[], |
+ uint8_t *ref_ptr[], |
int ref_stride, |
unsigned int *sad_array) { |
sad_array[0] = vp9_sad4x4_c(src_ptr, src_stride, |
@@ -422,9 +486,9 @@ |
} |
/* Copy 2 macroblocks to a buffer */ |
-void vp9_copy32xn_c(unsigned char *src_ptr, |
+void vp9_copy32xn_c(uint8_t *src_ptr, |
int src_stride, |
- unsigned char *dst_ptr, |
+ uint8_t *dst_ptr, |
int dst_stride, |
int height) { |
int r; |