Commit 1e4136d3 authored by Deb Mukherjee's avatar Deb Mukherjee

Adds high bit depth sad and variance functions

Moves high bit depth sad/var functions from highbitdepth
branch to master.

Change-Id: If03845d8ef9c9c494e13350e7a587c289306b94d
parent ac2f2e78
This diff is collapsed.
......@@ -14,6 +14,9 @@
#include "./vpx_config.h"
#include "vpx/vpx_integer.h"
#if CONFIG_VP9_HIGHBITDEPTH
#include "vp9/common/vp9_common.h"
#endif
#include "vp9/encoder/vp9_variance.h"
static INLINE unsigned int sad(const uint8_t *a, int a_stride,
......@@ -131,3 +134,138 @@ sadMxN(4, 4)
sadMxNxK(4, 4, 3)
sadMxNxK(4, 4, 8)
sadMxNx4D(4, 4)
#if CONFIG_VP9_HIGHBITDEPTH
static INLINE unsigned int high_sad(const uint8_t *a8, int a_stride,
const uint8_t *b8, int b_stride,
int width, int height) {
int y, x;
unsigned int sad = 0;
const uint16_t *a = CONVERT_TO_SHORTPTR(a8);
const uint16_t *b = CONVERT_TO_SHORTPTR(b8);
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;
}
static INLINE unsigned int high_sadb(const uint8_t *a8, int a_stride,
const uint16_t *b, int b_stride,
int width, int height) {
int y, x;
unsigned int sad = 0;
const uint16_t *a = CONVERT_TO_SHORTPTR(a8);
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 high_sadMxN(m, n) \
unsigned int vp9_high_sad##m##x##n##_c(const uint8_t *src, int src_stride, \
const uint8_t *ref, int ref_stride) { \
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, int src_stride, \
const uint8_t *ref, int ref_stride, \
const uint8_t *second_pred) { \
uint16_t comp_pred[m * n]; \
vp9_high_comp_avg_pred(comp_pred, second_pred, m, n, ref, ref_stride); \
return high_sadb(src, src_stride, comp_pred, m, m, n); \
}
#define high_sadMxNxK(m, n, k) \
void vp9_high_sad##m##x##n##x##k##_c(const uint8_t *src, int src_stride, \
const uint8_t *ref, int ref_stride, \
unsigned int *sads) { \
int i; \
for (i = 0; i < k; ++i) \
sads[i] = vp9_high_sad##m##x##n##_c(src, src_stride, &ref[i], ref_stride); \
}
#define high_sadMxNx4D(m, n) \
void vp9_high_sad##m##x##n##x4d_c(const uint8_t *src, int src_stride, \
const uint8_t *const refs[], \
int ref_stride, unsigned int *sads) { \
int i; \
for (i = 0; i < 4; ++i) \
sads[i] = vp9_high_sad##m##x##n##_c(src, src_stride, refs[i], ref_stride); \
}
// 64x64
high_sadMxN(64, 64)
high_sadMxNxK(64, 64, 3)
high_sadMxNxK(64, 64, 8)
high_sadMxNx4D(64, 64)
// 64x32
high_sadMxN(64, 32)
high_sadMxNx4D(64, 32)
// 32x64
high_sadMxN(32, 64)
high_sadMxNx4D(32, 64)
// 32x32
high_sadMxN(32, 32)
high_sadMxNxK(32, 32, 3)
high_sadMxNxK(32, 32, 8)
high_sadMxNx4D(32, 32)
// 32x16
high_sadMxN(32, 16)
high_sadMxNx4D(32, 16)
// 16x32
high_sadMxN(16, 32)
high_sadMxNx4D(16, 32)
// 16x16
high_sadMxN(16, 16)
high_sadMxNxK(16, 16, 3)
high_sadMxNxK(16, 16, 8)
high_sadMxNx4D(16, 16)
// 16x8
high_sadMxN(16, 8)
high_sadMxNxK(16, 8, 3)
high_sadMxNxK(16, 8, 8)
high_sadMxNx4D(16, 8)
// 8x16
high_sadMxN(8, 16)
high_sadMxNxK(8, 16, 3)
high_sadMxNxK(8, 16, 8)
high_sadMxNx4D(8, 16)
// 8x8
high_sadMxN(8, 8)
high_sadMxNxK(8, 8, 3)
high_sadMxNxK(8, 8, 8)
high_sadMxNx4D(8, 8)
// 8x4
high_sadMxN(8, 4)
high_sadMxNxK(8, 4, 8)
high_sadMxNx4D(8, 4)
// 4x8
high_sadMxN(4, 8)
high_sadMxNxK(4, 8, 8)
high_sadMxNx4D(4, 8)
// 4x4
high_sadMxN(4, 4)
high_sadMxNxK(4, 4, 3)
high_sadMxNxK(4, 4, 8)
high_sadMxNx4D(4, 4)
#endif // CONFIG_VP9_HIGHBITDEPTH
This diff is collapsed.
......@@ -22,6 +22,23 @@ void variance(const uint8_t *a, int a_stride,
int w, int h,
unsigned int *sse, int *sum);
#if CONFIG_VP9_HIGHBITDEPTH
void high_variance(const uint8_t *a8, int a_stride,
const uint8_t *b8, int b_stride,
int w, int h,
unsigned int *sse, int *sum);
void high_10_variance(const uint8_t *a8, int a_stride,
const uint8_t *b8, int b_stride,
int w, int h,
unsigned int *sse, int *sum);
void high_12_variance(const uint8_t *a8, int a_stride,
const uint8_t *b8, int b_stride,
int w, int h,
unsigned int *sse, int *sum);
#endif
typedef unsigned int(*vp9_sad_fn_t)(const uint8_t *src_ptr,
int source_stride,
const uint8_t *ref_ptr,
......@@ -81,6 +98,11 @@ typedef struct vp9_variance_vtable {
void vp9_comp_avg_pred(uint8_t *comp_pred, const uint8_t *pred, int width,
int height, const uint8_t *ref, int ref_stride);
#if CONFIG_VP9_HIGHBITDEPTH
void vp9_high_comp_avg_pred(uint16_t *comp_pred, const uint8_t *pred, int width,
int height, const uint8_t *ref, int ref_stride);
#endif
#ifdef __cplusplus
} // extern "C"
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment