source/libvpx/vp9/encoder/vp9_variance_c.c - Issue 23600008: libvpx: Pull from upstream

Unified Diff: source/libvpx/vp9/encoder/vp9_variance_c.c

Issue 23600008: libvpx: Pull from upstream (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libvpx/

Patch Set: Created 7 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: source/libvpx/vp9/encoder/vp9_variance_c.c

===================================================================

--- source/libvpx/vp9/encoder/vp9_variance_c.c (revision 219822)

+++ source/libvpx/vp9/encoder/vp9_variance_c.c (working copy)

@@ -46,12 +46,12 @@

const uint8_t *dst_ptr,

int dst_pixels_per_line,

unsigned int *sse) {

- uint16_t fdata3[65 * 64]; // Temp data bufffer used in filtering

+ uint16_t fdata3[65 * 64]; // Temp data buffer used in filtering

uint8_t temp2[68 * 64];

const int16_t *hfilter, *vfilter;

- hfilter = VP9_BILINEAR_FILTERS_2TAP(xoffset);

- vfilter = VP9_BILINEAR_FILTERS_2TAP(yoffset);

+ hfilter = BILINEAR_FILTERS_2TAP(xoffset);

+ vfilter = BILINEAR_FILTERS_2TAP(yoffset);

var_filter_block2d_bil_first_pass(src_ptr, fdata3, src_pixels_per_line,

1, 33, 64, hfilter);

@@ -68,13 +68,13 @@

int dst_pixels_per_line,

unsigned int *sse,

const uint8_t *second_pred) {

- uint16_t fdata3[65 * 64]; // Temp data bufffer used in filtering

+ uint16_t fdata3[65 * 64]; // Temp data buffer used in filtering

uint8_t temp2[68 * 64];

DECLARE_ALIGNED_ARRAY(16, uint8_t, temp3, 64 * 64); // compound pred buffer

const int16_t *hfilter, *vfilter;

- hfilter = VP9_BILINEAR_FILTERS_2TAP(xoffset);

- vfilter = VP9_BILINEAR_FILTERS_2TAP(yoffset);

+ hfilter = BILINEAR_FILTERS_2TAP(xoffset);

+ vfilter = BILINEAR_FILTERS_2TAP(yoffset);

var_filter_block2d_bil_first_pass(src_ptr, fdata3, src_pixels_per_line,

1, 33, 64, hfilter);

@@ -103,12 +103,12 @@

const uint8_t *dst_ptr,

int dst_pixels_per_line,

unsigned int *sse) {

- uint16_t fdata3[65 * 64]; // Temp data bufffer used in filtering

+ uint16_t fdata3[65 * 64]; // Temp data buffer used in filtering

uint8_t temp2[68 * 64];

const int16_t *hfilter, *vfilter;

- hfilter = VP9_BILINEAR_FILTERS_2TAP(xoffset);

- vfilter = VP9_BILINEAR_FILTERS_2TAP(yoffset);

+ hfilter = BILINEAR_FILTERS_2TAP(xoffset);

+ vfilter = BILINEAR_FILTERS_2TAP(yoffset);

var_filter_block2d_bil_first_pass(src_ptr, fdata3, src_pixels_per_line,

1, 65, 32, hfilter);

@@ -125,13 +125,13 @@

int dst_pixels_per_line,

unsigned int *sse,

const uint8_t *second_pred) {

- uint16_t fdata3[65 * 64]; // Temp data bufffer used in filtering

+ uint16_t fdata3[65 * 64]; // Temp data buffer used in filtering

uint8_t temp2[68 * 64];

DECLARE_ALIGNED_ARRAY(16, uint8_t, temp3, 32 * 64); // compound pred buffer

const int16_t *hfilter, *vfilter;

- hfilter = VP9_BILINEAR_FILTERS_2TAP(xoffset);

- vfilter = VP9_BILINEAR_FILTERS_2TAP(yoffset);

+ hfilter = BILINEAR_FILTERS_2TAP(xoffset);

+ vfilter = BILINEAR_FILTERS_2TAP(yoffset);

var_filter_block2d_bil_first_pass(src_ptr, fdata3, src_pixels_per_line,

1, 65, 32, hfilter);

@@ -160,12 +160,12 @@

const uint8_t *dst_ptr,

int dst_pixels_per_line,

unsigned int *sse) {

- uint16_t fdata3[33 * 32]; // Temp data bufffer used in filtering

+ uint16_t fdata3[33 * 32]; // Temp data buffer used in filtering

uint8_t temp2[36 * 32];

const int16_t *hfilter, *vfilter;

- hfilter = VP9_BILINEAR_FILTERS_2TAP(xoffset);

- vfilter = VP9_BILINEAR_FILTERS_2TAP(yoffset);

+ hfilter = BILINEAR_FILTERS_2TAP(xoffset);

+ vfilter = BILINEAR_FILTERS_2TAP(yoffset);

var_filter_block2d_bil_first_pass(src_ptr, fdata3, src_pixels_per_line,

1, 17, 32, hfilter);

@@ -182,13 +182,13 @@

int dst_pixels_per_line,

unsigned int *sse,

const uint8_t *second_pred) {

- uint16_t fdata3[33 * 32]; // Temp data bufffer used in filtering

+ uint16_t fdata3[33 * 32]; // Temp data buffer used in filtering

uint8_t temp2[36 * 32];

DECLARE_ALIGNED_ARRAY(16, uint8_t, temp3, 32 * 16); // compound pred buffer

const int16_t *hfilter, *vfilter;

- hfilter = VP9_BILINEAR_FILTERS_2TAP(xoffset);

- vfilter = VP9_BILINEAR_FILTERS_2TAP(yoffset);

+ hfilter = BILINEAR_FILTERS_2TAP(xoffset);

+ vfilter = BILINEAR_FILTERS_2TAP(yoffset);

var_filter_block2d_bil_first_pass(src_ptr, fdata3, src_pixels_per_line,

1, 17, 32, hfilter);

@@ -217,12 +217,12 @@

const uint8_t *dst_ptr,

int dst_pixels_per_line,

unsigned int *sse) {

- uint16_t fdata3[33 * 32]; // Temp data bufffer used in filtering

+ uint16_t fdata3[33 * 32]; // Temp data buffer used in filtering

uint8_t temp2[36 * 32];

const int16_t *hfilter, *vfilter;

- hfilter = VP9_BILINEAR_FILTERS_2TAP(xoffset);

- vfilter = VP9_BILINEAR_FILTERS_2TAP(yoffset);

+ hfilter = BILINEAR_FILTERS_2TAP(xoffset);

+ vfilter = BILINEAR_FILTERS_2TAP(yoffset);

var_filter_block2d_bil_first_pass(src_ptr, fdata3, src_pixels_per_line,

1, 33, 16, hfilter);

@@ -239,13 +239,13 @@

int dst_pixels_per_line,

unsigned int *sse,

const uint8_t *second_pred) {

- uint16_t fdata3[33 * 32]; // Temp data bufffer used in filtering

+ uint16_t fdata3[33 * 32]; // Temp data buffer used in filtering

uint8_t temp2[36 * 32];

DECLARE_ALIGNED_ARRAY(16, uint8_t, temp3, 16 * 32); // compound pred buffer

const int16_t *hfilter, *vfilter;

- hfilter = VP9_BILINEAR_FILTERS_2TAP(xoffset);

- vfilter = VP9_BILINEAR_FILTERS_2TAP(yoffset);

+ hfilter = BILINEAR_FILTERS_2TAP(xoffset);

+ vfilter = BILINEAR_FILTERS_2TAP(yoffset);

var_filter_block2d_bil_first_pass(src_ptr, fdata3, src_pixels_per_line,

1, 33, 16, hfilter);

@@ -440,10 +440,10 @@

unsigned int *sse) {

uint8_t temp2[20 * 16];

const int16_t *hfilter, *vfilter;

- uint16_t fdata3[5 * 4]; // Temp data bufffer used in filtering

+ uint16_t fdata3[5 * 4]; // Temp data buffer used in filtering

- hfilter = VP9_BILINEAR_FILTERS_2TAP(xoffset);

- vfilter = VP9_BILINEAR_FILTERS_2TAP(yoffset);

+ hfilter = BILINEAR_FILTERS_2TAP(xoffset);

+ vfilter = BILINEAR_FILTERS_2TAP(yoffset);

// First filter 1d Horizontal

var_filter_block2d_bil_first_pass(src_ptr, fdata3, src_pixels_per_line,

@@ -466,10 +466,10 @@

uint8_t temp2[20 * 16];

const int16_t *hfilter, *vfilter;

DECLARE_ALIGNED_ARRAY(16, uint8_t, temp3, 4 * 4); // compound pred buffer

- uint16_t fdata3[5 * 4]; // Temp data bufffer used in filtering

+ uint16_t fdata3[5 * 4]; // Temp data buffer used in filtering

- hfilter = VP9_BILINEAR_FILTERS_2TAP(xoffset);

- vfilter = VP9_BILINEAR_FILTERS_2TAP(yoffset);

+ hfilter = BILINEAR_FILTERS_2TAP(xoffset);

+ vfilter = BILINEAR_FILTERS_2TAP(yoffset);

// First filter 1d Horizontal

var_filter_block2d_bil_first_pass(src_ptr, fdata3, src_pixels_per_line,

@@ -488,12 +488,12 @@

const uint8_t *dst_ptr,

int dst_pixels_per_line,

unsigned int *sse) {

- uint16_t fdata3[9 * 8]; // Temp data bufffer used in filtering

+ uint16_t fdata3[9 * 8]; // Temp data buffer used in filtering

uint8_t temp2[20 * 16];

const int16_t *hfilter, *vfilter;

- hfilter = VP9_BILINEAR_FILTERS_2TAP(xoffset);

- vfilter = VP9_BILINEAR_FILTERS_2TAP(yoffset);

+ hfilter = BILINEAR_FILTERS_2TAP(xoffset);

+ vfilter = BILINEAR_FILTERS_2TAP(yoffset);

var_filter_block2d_bil_first_pass(src_ptr, fdata3, src_pixels_per_line,

1, 9, 8, hfilter);

@@ -510,13 +510,13 @@

int dst_pixels_per_line,

unsigned int *sse,

const uint8_t *second_pred) {

- uint16_t fdata3[9 * 8]; // Temp data bufffer used in filtering

+ uint16_t fdata3[9 * 8]; // Temp data buffer used in filtering

uint8_t temp2[20 * 16];

DECLARE_ALIGNED_ARRAY(16, uint8_t, temp3, 8 * 8); // compound pred buffer

const int16_t *hfilter, *vfilter;

- hfilter = VP9_BILINEAR_FILTERS_2TAP(xoffset);

- vfilter = VP9_BILINEAR_FILTERS_2TAP(yoffset);

+ hfilter = BILINEAR_FILTERS_2TAP(xoffset);

+ vfilter = BILINEAR_FILTERS_2TAP(yoffset);

var_filter_block2d_bil_first_pass(src_ptr, fdata3, src_pixels_per_line,

1, 9, 8, hfilter);

@@ -532,12 +532,12 @@

const uint8_t *dst_ptr,

int dst_pixels_per_line,

unsigned int *sse) {

- uint16_t fdata3[17 * 16]; // Temp data bufffer used in filtering

+ uint16_t fdata3[17 * 16]; // Temp data buffer used in filtering

uint8_t temp2[20 * 16];

const int16_t *hfilter, *vfilter;

- hfilter = VP9_BILINEAR_FILTERS_2TAP(xoffset);

- vfilter = VP9_BILINEAR_FILTERS_2TAP(yoffset);

+ hfilter = BILINEAR_FILTERS_2TAP(xoffset);

+ vfilter = BILINEAR_FILTERS_2TAP(yoffset);

var_filter_block2d_bil_first_pass(src_ptr, fdata3, src_pixels_per_line,

1, 17, 16, hfilter);

@@ -559,8 +559,8 @@

DECLARE_ALIGNED_ARRAY(16, uint8_t, temp3, 16 * 16); // compound pred buffer

const int16_t *hfilter, *vfilter;

- hfilter = VP9_BILINEAR_FILTERS_2TAP(xoffset);

- vfilter = VP9_BILINEAR_FILTERS_2TAP(yoffset);

+ hfilter = BILINEAR_FILTERS_2TAP(xoffset);

+ vfilter = BILINEAR_FILTERS_2TAP(yoffset);

var_filter_block2d_bil_first_pass(src_ptr, fdata3, src_pixels_per_line,

1, 17, 16, hfilter);

@@ -577,12 +577,12 @@

const uint8_t *dst_ptr,

int dst_pixels_per_line,

unsigned int *sse) {

- uint16_t fdata3[65 * 64]; // Temp data bufffer used in filtering

+ uint16_t fdata3[65 * 64]; // Temp data buffer used in filtering

uint8_t temp2[68 * 64];

const int16_t *hfilter, *vfilter;

- hfilter = VP9_BILINEAR_FILTERS_2TAP(xoffset);

- vfilter = VP9_BILINEAR_FILTERS_2TAP(yoffset);

+ hfilter = BILINEAR_FILTERS_2TAP(xoffset);

+ vfilter = BILINEAR_FILTERS_2TAP(yoffset);

var_filter_block2d_bil_first_pass(src_ptr, fdata3, src_pixels_per_line,

1, 65, 64, hfilter);

@@ -599,13 +599,13 @@

int dst_pixels_per_line,

unsigned int *sse,

const uint8_t *second_pred) {

- uint16_t fdata3[65 * 64]; // Temp data bufffer used in filtering

+ uint16_t fdata3[65 * 64]; // Temp data buffer used in filtering

uint8_t temp2[68 * 64];

DECLARE_ALIGNED_ARRAY(16, uint8_t, temp3, 64 * 64); // compound pred buffer

const int16_t *hfilter, *vfilter;

- hfilter = VP9_BILINEAR_FILTERS_2TAP(xoffset);

- vfilter = VP9_BILINEAR_FILTERS_2TAP(yoffset);

+ hfilter = BILINEAR_FILTERS_2TAP(xoffset);

+ vfilter = BILINEAR_FILTERS_2TAP(yoffset);

var_filter_block2d_bil_first_pass(src_ptr, fdata3, src_pixels_per_line,

1, 65, 64, hfilter);

@@ -621,12 +621,12 @@

const uint8_t *dst_ptr,

int dst_pixels_per_line,

unsigned int *sse) {

- uint16_t fdata3[33 * 32]; // Temp data bufffer used in filtering

+ uint16_t fdata3[33 * 32]; // Temp data buffer used in filtering

uint8_t temp2[36 * 32];

const int16_t *hfilter, *vfilter;

- hfilter = VP9_BILINEAR_FILTERS_2TAP(xoffset);

- vfilter = VP9_BILINEAR_FILTERS_2TAP(yoffset);

+ hfilter = BILINEAR_FILTERS_2TAP(xoffset);

+ vfilter = BILINEAR_FILTERS_2TAP(yoffset);

var_filter_block2d_bil_first_pass(src_ptr, fdata3, src_pixels_per_line,

1, 33, 32, hfilter);

@@ -643,13 +643,13 @@

int dst_pixels_per_line,

unsigned int *sse,

const uint8_t *second_pred) {

- uint16_t fdata3[33 * 32]; // Temp data bufffer used in filtering

+ uint16_t fdata3[33 * 32]; // Temp data buffer used in filtering

uint8_t temp2[36 * 32];

DECLARE_ALIGNED_ARRAY(16, uint8_t, temp3, 32 * 32); // compound pred buffer

const int16_t *hfilter, *vfilter;

- hfilter = VP9_BILINEAR_FILTERS_2TAP(xoffset);

- vfilter = VP9_BILINEAR_FILTERS_2TAP(yoffset);

+ hfilter = BILINEAR_FILTERS_2TAP(xoffset);

+ vfilter = BILINEAR_FILTERS_2TAP(yoffset);

var_filter_block2d_bil_first_pass(src_ptr, fdata3, src_pixels_per_line,

1, 33, 32, hfilter);

@@ -785,12 +785,12 @@

const uint8_t *dst_ptr,

int dst_pixels_per_line,

unsigned int *sse) {

- uint16_t fdata3[16 * 9]; // Temp data bufffer used in filtering

+ uint16_t fdata3[16 * 9]; // Temp data buffer used in filtering

uint8_t temp2[20 * 16];

const int16_t *hfilter, *vfilter;

- hfilter = VP9_BILINEAR_FILTERS_2TAP(xoffset);

- vfilter = VP9_BILINEAR_FILTERS_2TAP(yoffset);

+ hfilter = BILINEAR_FILTERS_2TAP(xoffset);

+ vfilter = BILINEAR_FILTERS_2TAP(yoffset);

var_filter_block2d_bil_first_pass(src_ptr, fdata3, src_pixels_per_line,

1, 9, 16, hfilter);

@@ -807,13 +807,13 @@

int dst_pixels_per_line,

unsigned int *sse,

const uint8_t *second_pred) {

- uint16_t fdata3[16 * 9]; // Temp data bufffer used in filtering

+ uint16_t fdata3[16 * 9]; // Temp data buffer used in filtering

uint8_t temp2[20 * 16];

DECLARE_ALIGNED_ARRAY(16, uint8_t, temp3, 16 * 8); // compound pred buffer

const int16_t *hfilter, *vfilter;

- hfilter = VP9_BILINEAR_FILTERS_2TAP(xoffset);

- vfilter = VP9_BILINEAR_FILTERS_2TAP(yoffset);

+ hfilter = BILINEAR_FILTERS_2TAP(xoffset);

+ vfilter = BILINEAR_FILTERS_2TAP(yoffset);

var_filter_block2d_bil_first_pass(src_ptr, fdata3, src_pixels_per_line,

1, 9, 16, hfilter);

@@ -829,12 +829,12 @@

const uint8_t *dst_ptr,

int dst_pixels_per_line,

unsigned int *sse) {

- uint16_t fdata3[9 * 16]; // Temp data bufffer used in filtering

+ uint16_t fdata3[9 * 16]; // Temp data buffer used in filtering

uint8_t temp2[20 * 16];

const int16_t *hfilter, *vfilter;

- hfilter = VP9_BILINEAR_FILTERS_2TAP(xoffset);

- vfilter = VP9_BILINEAR_FILTERS_2TAP(yoffset);

+ hfilter = BILINEAR_FILTERS_2TAP(xoffset);

+ vfilter = BILINEAR_FILTERS_2TAP(yoffset);

var_filter_block2d_bil_first_pass(src_ptr, fdata3, src_pixels_per_line,

1, 17, 8, hfilter);

@@ -851,13 +851,13 @@

int dst_pixels_per_line,

unsigned int *sse,

const uint8_t *second_pred) {

- uint16_t fdata3[9 * 16]; // Temp data bufffer used in filtering

+ uint16_t fdata3[9 * 16]; // Temp data buffer used in filtering

uint8_t temp2[20 * 16];

DECLARE_ALIGNED_ARRAY(16, uint8_t, temp3, 8 * 16); // compound pred buffer

const int16_t *hfilter, *vfilter;

- hfilter = VP9_BILINEAR_FILTERS_2TAP(xoffset);

- vfilter = VP9_BILINEAR_FILTERS_2TAP(yoffset);

+ hfilter = BILINEAR_FILTERS_2TAP(xoffset);

+ vfilter = BILINEAR_FILTERS_2TAP(yoffset);

var_filter_block2d_bil_first_pass(src_ptr, fdata3, src_pixels_per_line,

1, 17, 8, hfilter);

@@ -873,12 +873,12 @@

const uint8_t *dst_ptr,

int dst_pixels_per_line,

unsigned int *sse) {

- uint16_t fdata3[8 * 5]; // Temp data bufffer used in filtering

+ uint16_t fdata3[8 * 5]; // Temp data buffer used in filtering

uint8_t temp2[20 * 16];

const int16_t *hfilter, *vfilter;

- hfilter = VP9_BILINEAR_FILTERS_2TAP(xoffset);

- vfilter = VP9_BILINEAR_FILTERS_2TAP(yoffset);

+ hfilter = BILINEAR_FILTERS_2TAP(xoffset);

+ vfilter = BILINEAR_FILTERS_2TAP(yoffset);

var_filter_block2d_bil_first_pass(src_ptr, fdata3, src_pixels_per_line,

1, 5, 8, hfilter);

@@ -895,13 +895,13 @@

int dst_pixels_per_line,

unsigned int *sse,

const uint8_t *second_pred) {

- uint16_t fdata3[8 * 5]; // Temp data bufffer used in filtering

+ uint16_t fdata3[8 * 5]; // Temp data buffer used in filtering

uint8_t temp2[20 * 16];

DECLARE_ALIGNED_ARRAY(16, uint8_t, temp3, 8 * 4); // compound pred buffer

const int16_t *hfilter, *vfilter;

- hfilter = VP9_BILINEAR_FILTERS_2TAP(xoffset);

- vfilter = VP9_BILINEAR_FILTERS_2TAP(yoffset);

+ hfilter = BILINEAR_FILTERS_2TAP(xoffset);

+ vfilter = BILINEAR_FILTERS_2TAP(yoffset);

var_filter_block2d_bil_first_pass(src_ptr, fdata3, src_pixels_per_line,

1, 5, 8, hfilter);

@@ -917,14 +917,14 @@

const uint8_t *dst_ptr,

int dst_pixels_per_line,

unsigned int *sse) {

- uint16_t fdata3[5 * 8]; // Temp data bufffer used in filtering

+ uint16_t fdata3[5 * 8]; // Temp data buffer used in filtering

// FIXME(jingning,rbultje): this temp2 buffer probably doesn't need to be

// of this big? same issue appears in all other block size settings.

uint8_t temp2[20 * 16];

const int16_t *hfilter, *vfilter;

- hfilter = VP9_BILINEAR_FILTERS_2TAP(xoffset);

- vfilter = VP9_BILINEAR_FILTERS_2TAP(yoffset);

+ hfilter = BILINEAR_FILTERS_2TAP(xoffset);

+ vfilter = BILINEAR_FILTERS_2TAP(yoffset);

var_filter_block2d_bil_first_pass(src_ptr, fdata3, src_pixels_per_line,

1, 9, 4, hfilter);

@@ -941,13 +941,13 @@

int dst_pixels_per_line,

unsigned int *sse,

const uint8_t *second_pred) {

- uint16_t fdata3[5 * 8]; // Temp data bufffer used in filtering

+ uint16_t fdata3[5 * 8]; // Temp data buffer used in filtering

uint8_t temp2[20 * 16];

DECLARE_ALIGNED_ARRAY(16, uint8_t, temp3, 4 * 8); // compound pred buffer

const int16_t *hfilter, *vfilter;

- hfilter = VP9_BILINEAR_FILTERS_2TAP(xoffset);

- vfilter = VP9_BILINEAR_FILTERS_2TAP(yoffset);

+ hfilter = BILINEAR_FILTERS_2TAP(xoffset);

+ vfilter = BILINEAR_FILTERS_2TAP(yoffset);

var_filter_block2d_bil_first_pass(src_ptr, fdata3, src_pixels_per_line,

1, 9, 4, hfilter);

« no previous file with comments | « source/libvpx/vp9/encoder/vp9_tokenize.c ('k') | source/libvpx/vp9/encoder/x86/vp9_dct32x32_sse2.c » ('j') | no next file with comments »