diff options
Diffstat (limited to 'chromium/third_party/libvpx/source/config/nacl/vpx_dsp_rtcd.h')
| -rw-r--r-- | chromium/third_party/libvpx/source/config/nacl/vpx_dsp_rtcd.h | 1123 |
1 files changed, 569 insertions, 554 deletions
diff --git a/chromium/third_party/libvpx/source/config/nacl/vpx_dsp_rtcd.h b/chromium/third_party/libvpx/source/config/nacl/vpx_dsp_rtcd.h index 29706b564b5..f8a910d67cc 100644 --- a/chromium/third_party/libvpx/source/config/nacl/vpx_dsp_rtcd.h +++ b/chromium/third_party/libvpx/source/config/nacl/vpx_dsp_rtcd.h @@ -139,253 +139,253 @@ void vpx_convolve_copy_c(const uint8_t* src, #define vpx_convolve_copy vpx_convolve_copy_c void vpx_d117_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_d117_predictor_16x16 vpx_d117_predictor_16x16_c void vpx_d117_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_d117_predictor_32x32 vpx_d117_predictor_32x32_c void vpx_d117_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_d117_predictor_4x4 vpx_d117_predictor_4x4_c void vpx_d117_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_d117_predictor_8x8 vpx_d117_predictor_8x8_c void vpx_d135_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_d135_predictor_16x16 vpx_d135_predictor_16x16_c void vpx_d135_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_d135_predictor_32x32 vpx_d135_predictor_32x32_c void vpx_d135_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_d135_predictor_4x4 vpx_d135_predictor_4x4_c void vpx_d135_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_d135_predictor_8x8 vpx_d135_predictor_8x8_c void vpx_d153_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_d153_predictor_16x16 vpx_d153_predictor_16x16_c void vpx_d153_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_d153_predictor_32x32 vpx_d153_predictor_32x32_c void vpx_d153_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_d153_predictor_4x4 vpx_d153_predictor_4x4_c void vpx_d153_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_d153_predictor_8x8 vpx_d153_predictor_8x8_c void vpx_d207_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_d207_predictor_16x16 vpx_d207_predictor_16x16_c void vpx_d207_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_d207_predictor_32x32 vpx_d207_predictor_32x32_c void vpx_d207_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_d207_predictor_4x4 vpx_d207_predictor_4x4_c void vpx_d207_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_d207_predictor_8x8 vpx_d207_predictor_8x8_c void vpx_d45_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_d45_predictor_16x16 vpx_d45_predictor_16x16_c void vpx_d45_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_d45_predictor_32x32 vpx_d45_predictor_32x32_c void vpx_d45_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_d45_predictor_4x4 vpx_d45_predictor_4x4_c void vpx_d45_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_d45_predictor_8x8 vpx_d45_predictor_8x8_c void vpx_d45e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_d45e_predictor_4x4 vpx_d45e_predictor_4x4_c void vpx_d63_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_d63_predictor_16x16 vpx_d63_predictor_16x16_c void vpx_d63_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_d63_predictor_32x32 vpx_d63_predictor_32x32_c void vpx_d63_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_d63_predictor_4x4 vpx_d63_predictor_4x4_c void vpx_d63_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_d63_predictor_8x8 vpx_d63_predictor_8x8_c void vpx_d63e_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_d63e_predictor_4x4 vpx_d63e_predictor_4x4_c void vpx_dc_128_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_dc_128_predictor_16x16 vpx_dc_128_predictor_16x16_c void vpx_dc_128_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_dc_128_predictor_32x32 vpx_dc_128_predictor_32x32_c void vpx_dc_128_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_dc_128_predictor_4x4 vpx_dc_128_predictor_4x4_c void vpx_dc_128_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_dc_128_predictor_8x8 vpx_dc_128_predictor_8x8_c void vpx_dc_left_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_dc_left_predictor_16x16 vpx_dc_left_predictor_16x16_c void vpx_dc_left_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_dc_left_predictor_32x32 vpx_dc_left_predictor_32x32_c void vpx_dc_left_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_dc_left_predictor_4x4 vpx_dc_left_predictor_4x4_c void vpx_dc_left_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_dc_left_predictor_8x8 vpx_dc_left_predictor_8x8_c void vpx_dc_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_dc_predictor_16x16 vpx_dc_predictor_16x16_c void vpx_dc_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_dc_predictor_32x32 vpx_dc_predictor_32x32_c void vpx_dc_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_dc_predictor_4x4 vpx_dc_predictor_4x4_c void vpx_dc_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_dc_predictor_8x8 vpx_dc_predictor_8x8_c void vpx_dc_top_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_dc_top_predictor_16x16 vpx_dc_top_predictor_16x16_c void vpx_dc_top_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_dc_top_predictor_32x32 vpx_dc_top_predictor_32x32_c void vpx_dc_top_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_dc_top_predictor_4x4 vpx_dc_top_predictor_4x4_c void vpx_dc_top_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_dc_top_predictor_8x8 vpx_dc_top_predictor_8x8_c @@ -418,7 +418,7 @@ void vpx_fdct8x8_1_c(const int16_t* input, tran_low_t* output, int stride); #define vpx_fdct8x8_1 vpx_fdct8x8_1_c void vpx_get16x16var_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse, @@ -426,13 +426,13 @@ void vpx_get16x16var_c(const uint8_t* src_ptr, #define vpx_get16x16var vpx_get16x16var_c unsigned int vpx_get4x4sse_cs_c(const unsigned char* src_ptr, - int source_stride, + int src_stride, const unsigned char* ref_ptr, int ref_stride); #define vpx_get4x4sse_cs vpx_get4x4sse_cs_c void vpx_get8x8var_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse, @@ -443,25 +443,25 @@ unsigned int vpx_get_mb_ss_c(const int16_t*); #define vpx_get_mb_ss vpx_get_mb_ss_c void vpx_h_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_h_predictor_16x16 vpx_h_predictor_16x16_c void vpx_h_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_h_predictor_32x32 vpx_h_predictor_32x32_c void vpx_h_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_h_predictor_4x4 vpx_h_predictor_4x4_c void vpx_h_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_h_predictor_8x8 vpx_h_predictor_8x8_c @@ -482,13 +482,13 @@ void vpx_hadamard_8x8_c(const int16_t* src_diff, #define vpx_hadamard_8x8 vpx_hadamard_8x8_c void vpx_he_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_he_predictor_4x4 vpx_he_predictor_4x4_c void vpx_highbd_10_get16x16var_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse, @@ -496,7 +496,7 @@ void vpx_highbd_10_get16x16var_c(const uint8_t* src_ptr, #define vpx_highbd_10_get16x16var vpx_highbd_10_get16x16var_c void vpx_highbd_10_get8x8var_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse, @@ -504,38 +504,38 @@ void vpx_highbd_10_get8x8var_c(const uint8_t* src_ptr, #define vpx_highbd_10_get8x8var vpx_highbd_10_get8x8var_c unsigned int vpx_highbd_10_mse16x16_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, - int recon_stride, + int ref_stride, unsigned int* sse); #define vpx_highbd_10_mse16x16 vpx_highbd_10_mse16x16_c unsigned int vpx_highbd_10_mse16x8_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, - int recon_stride, + int ref_stride, unsigned int* sse); #define vpx_highbd_10_mse16x8 vpx_highbd_10_mse16x8_c unsigned int vpx_highbd_10_mse8x16_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, - int recon_stride, + int ref_stride, unsigned int* sse); #define vpx_highbd_10_mse8x16 vpx_highbd_10_mse8x16_c unsigned int vpx_highbd_10_mse8x8_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, - int recon_stride, + int ref_stride, unsigned int* sse); #define vpx_highbd_10_mse8x8 vpx_highbd_10_mse8x8_c uint32_t vpx_highbd_10_sub_pixel_avg_variance16x16_c( const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -545,9 +545,9 @@ uint32_t vpx_highbd_10_sub_pixel_avg_variance16x16_c( uint32_t vpx_highbd_10_sub_pixel_avg_variance16x32_c( const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -556,9 +556,9 @@ uint32_t vpx_highbd_10_sub_pixel_avg_variance16x32_c( vpx_highbd_10_sub_pixel_avg_variance16x32_c uint32_t vpx_highbd_10_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -568,9 +568,9 @@ uint32_t vpx_highbd_10_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, uint32_t vpx_highbd_10_sub_pixel_avg_variance32x16_c( const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -580,9 +580,9 @@ uint32_t vpx_highbd_10_sub_pixel_avg_variance32x16_c( uint32_t vpx_highbd_10_sub_pixel_avg_variance32x32_c( const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -592,9 +592,9 @@ uint32_t vpx_highbd_10_sub_pixel_avg_variance32x32_c( uint32_t vpx_highbd_10_sub_pixel_avg_variance32x64_c( const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -603,9 +603,9 @@ uint32_t vpx_highbd_10_sub_pixel_avg_variance32x64_c( vpx_highbd_10_sub_pixel_avg_variance32x64_c uint32_t vpx_highbd_10_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -614,9 +614,9 @@ uint32_t vpx_highbd_10_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, vpx_highbd_10_sub_pixel_avg_variance4x4_c uint32_t vpx_highbd_10_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -626,9 +626,9 @@ uint32_t vpx_highbd_10_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, uint32_t vpx_highbd_10_sub_pixel_avg_variance64x32_c( const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -638,9 +638,9 @@ uint32_t vpx_highbd_10_sub_pixel_avg_variance64x32_c( uint32_t vpx_highbd_10_sub_pixel_avg_variance64x64_c( const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -649,9 +649,9 @@ uint32_t vpx_highbd_10_sub_pixel_avg_variance64x64_c( vpx_highbd_10_sub_pixel_avg_variance64x64_c uint32_t vpx_highbd_10_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -660,9 +660,9 @@ uint32_t vpx_highbd_10_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, vpx_highbd_10_sub_pixel_avg_variance8x16_c uint32_t vpx_highbd_10_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -671,9 +671,9 @@ uint32_t vpx_highbd_10_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, vpx_highbd_10_sub_pixel_avg_variance8x4_c uint32_t vpx_highbd_10_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -682,9 +682,9 @@ uint32_t vpx_highbd_10_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, vpx_highbd_10_sub_pixel_avg_variance8x8_c uint32_t vpx_highbd_10_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -692,9 +692,9 @@ uint32_t vpx_highbd_10_sub_pixel_variance16x16_c(const uint8_t* src_ptr, vpx_highbd_10_sub_pixel_variance16x16_c uint32_t vpx_highbd_10_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -702,9 +702,9 @@ uint32_t vpx_highbd_10_sub_pixel_variance16x32_c(const uint8_t* src_ptr, vpx_highbd_10_sub_pixel_variance16x32_c uint32_t vpx_highbd_10_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -712,9 +712,9 @@ uint32_t vpx_highbd_10_sub_pixel_variance16x8_c(const uint8_t* src_ptr, vpx_highbd_10_sub_pixel_variance16x8_c uint32_t vpx_highbd_10_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -722,9 +722,9 @@ uint32_t vpx_highbd_10_sub_pixel_variance32x16_c(const uint8_t* src_ptr, vpx_highbd_10_sub_pixel_variance32x16_c uint32_t vpx_highbd_10_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -732,9 +732,9 @@ uint32_t vpx_highbd_10_sub_pixel_variance32x32_c(const uint8_t* src_ptr, vpx_highbd_10_sub_pixel_variance32x32_c uint32_t vpx_highbd_10_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -742,9 +742,9 @@ uint32_t vpx_highbd_10_sub_pixel_variance32x64_c(const uint8_t* src_ptr, vpx_highbd_10_sub_pixel_variance32x64_c uint32_t vpx_highbd_10_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -752,9 +752,9 @@ uint32_t vpx_highbd_10_sub_pixel_variance4x4_c(const uint8_t* src_ptr, vpx_highbd_10_sub_pixel_variance4x4_c uint32_t vpx_highbd_10_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -762,9 +762,9 @@ uint32_t vpx_highbd_10_sub_pixel_variance4x8_c(const uint8_t* src_ptr, vpx_highbd_10_sub_pixel_variance4x8_c uint32_t vpx_highbd_10_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -772,9 +772,9 @@ uint32_t vpx_highbd_10_sub_pixel_variance64x32_c(const uint8_t* src_ptr, vpx_highbd_10_sub_pixel_variance64x32_c uint32_t vpx_highbd_10_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -782,9 +782,9 @@ uint32_t vpx_highbd_10_sub_pixel_variance64x64_c(const uint8_t* src_ptr, vpx_highbd_10_sub_pixel_variance64x64_c uint32_t vpx_highbd_10_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -792,9 +792,9 @@ uint32_t vpx_highbd_10_sub_pixel_variance8x16_c(const uint8_t* src_ptr, vpx_highbd_10_sub_pixel_variance8x16_c uint32_t vpx_highbd_10_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -802,9 +802,9 @@ uint32_t vpx_highbd_10_sub_pixel_variance8x4_c(const uint8_t* src_ptr, vpx_highbd_10_sub_pixel_variance8x4_c uint32_t vpx_highbd_10_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -812,98 +812,98 @@ uint32_t vpx_highbd_10_sub_pixel_variance8x8_c(const uint8_t* src_ptr, vpx_highbd_10_sub_pixel_variance8x8_c unsigned int vpx_highbd_10_variance16x16_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_10_variance16x16 vpx_highbd_10_variance16x16_c unsigned int vpx_highbd_10_variance16x32_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_10_variance16x32 vpx_highbd_10_variance16x32_c unsigned int vpx_highbd_10_variance16x8_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_10_variance16x8 vpx_highbd_10_variance16x8_c unsigned int vpx_highbd_10_variance32x16_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_10_variance32x16 vpx_highbd_10_variance32x16_c unsigned int vpx_highbd_10_variance32x32_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_10_variance32x32 vpx_highbd_10_variance32x32_c unsigned int vpx_highbd_10_variance32x64_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_10_variance32x64 vpx_highbd_10_variance32x64_c unsigned int vpx_highbd_10_variance4x4_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_10_variance4x4 vpx_highbd_10_variance4x4_c unsigned int vpx_highbd_10_variance4x8_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_10_variance4x8 vpx_highbd_10_variance4x8_c unsigned int vpx_highbd_10_variance64x32_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_10_variance64x32 vpx_highbd_10_variance64x32_c unsigned int vpx_highbd_10_variance64x64_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_10_variance64x64 vpx_highbd_10_variance64x64_c unsigned int vpx_highbd_10_variance8x16_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_10_variance8x16 vpx_highbd_10_variance8x16_c unsigned int vpx_highbd_10_variance8x4_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_10_variance8x4 vpx_highbd_10_variance8x4_c unsigned int vpx_highbd_10_variance8x8_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_10_variance8x8 vpx_highbd_10_variance8x8_c void vpx_highbd_12_get16x16var_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse, @@ -911,7 +911,7 @@ void vpx_highbd_12_get16x16var_c(const uint8_t* src_ptr, #define vpx_highbd_12_get16x16var vpx_highbd_12_get16x16var_c void vpx_highbd_12_get8x8var_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse, @@ -919,38 +919,38 @@ void vpx_highbd_12_get8x8var_c(const uint8_t* src_ptr, #define vpx_highbd_12_get8x8var vpx_highbd_12_get8x8var_c unsigned int vpx_highbd_12_mse16x16_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, - int recon_stride, + int ref_stride, unsigned int* sse); #define vpx_highbd_12_mse16x16 vpx_highbd_12_mse16x16_c unsigned int vpx_highbd_12_mse16x8_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, - int recon_stride, + int ref_stride, unsigned int* sse); #define vpx_highbd_12_mse16x8 vpx_highbd_12_mse16x8_c unsigned int vpx_highbd_12_mse8x16_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, - int recon_stride, + int ref_stride, unsigned int* sse); #define vpx_highbd_12_mse8x16 vpx_highbd_12_mse8x16_c unsigned int vpx_highbd_12_mse8x8_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, - int recon_stride, + int ref_stride, unsigned int* sse); #define vpx_highbd_12_mse8x8 vpx_highbd_12_mse8x8_c uint32_t vpx_highbd_12_sub_pixel_avg_variance16x16_c( const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -960,9 +960,9 @@ uint32_t vpx_highbd_12_sub_pixel_avg_variance16x16_c( uint32_t vpx_highbd_12_sub_pixel_avg_variance16x32_c( const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -971,9 +971,9 @@ uint32_t vpx_highbd_12_sub_pixel_avg_variance16x32_c( vpx_highbd_12_sub_pixel_avg_variance16x32_c uint32_t vpx_highbd_12_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -983,9 +983,9 @@ uint32_t vpx_highbd_12_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, uint32_t vpx_highbd_12_sub_pixel_avg_variance32x16_c( const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -995,9 +995,9 @@ uint32_t vpx_highbd_12_sub_pixel_avg_variance32x16_c( uint32_t vpx_highbd_12_sub_pixel_avg_variance32x32_c( const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -1007,9 +1007,9 @@ uint32_t vpx_highbd_12_sub_pixel_avg_variance32x32_c( uint32_t vpx_highbd_12_sub_pixel_avg_variance32x64_c( const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -1018,9 +1018,9 @@ uint32_t vpx_highbd_12_sub_pixel_avg_variance32x64_c( vpx_highbd_12_sub_pixel_avg_variance32x64_c uint32_t vpx_highbd_12_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -1029,9 +1029,9 @@ uint32_t vpx_highbd_12_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, vpx_highbd_12_sub_pixel_avg_variance4x4_c uint32_t vpx_highbd_12_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -1041,9 +1041,9 @@ uint32_t vpx_highbd_12_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, uint32_t vpx_highbd_12_sub_pixel_avg_variance64x32_c( const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -1053,9 +1053,9 @@ uint32_t vpx_highbd_12_sub_pixel_avg_variance64x32_c( uint32_t vpx_highbd_12_sub_pixel_avg_variance64x64_c( const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -1064,9 +1064,9 @@ uint32_t vpx_highbd_12_sub_pixel_avg_variance64x64_c( vpx_highbd_12_sub_pixel_avg_variance64x64_c uint32_t vpx_highbd_12_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -1075,9 +1075,9 @@ uint32_t vpx_highbd_12_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, vpx_highbd_12_sub_pixel_avg_variance8x16_c uint32_t vpx_highbd_12_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -1086,9 +1086,9 @@ uint32_t vpx_highbd_12_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, vpx_highbd_12_sub_pixel_avg_variance8x4_c uint32_t vpx_highbd_12_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -1097,9 +1097,9 @@ uint32_t vpx_highbd_12_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, vpx_highbd_12_sub_pixel_avg_variance8x8_c uint32_t vpx_highbd_12_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -1107,9 +1107,9 @@ uint32_t vpx_highbd_12_sub_pixel_variance16x16_c(const uint8_t* src_ptr, vpx_highbd_12_sub_pixel_variance16x16_c uint32_t vpx_highbd_12_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -1117,9 +1117,9 @@ uint32_t vpx_highbd_12_sub_pixel_variance16x32_c(const uint8_t* src_ptr, vpx_highbd_12_sub_pixel_variance16x32_c uint32_t vpx_highbd_12_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -1127,9 +1127,9 @@ uint32_t vpx_highbd_12_sub_pixel_variance16x8_c(const uint8_t* src_ptr, vpx_highbd_12_sub_pixel_variance16x8_c uint32_t vpx_highbd_12_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -1137,9 +1137,9 @@ uint32_t vpx_highbd_12_sub_pixel_variance32x16_c(const uint8_t* src_ptr, vpx_highbd_12_sub_pixel_variance32x16_c uint32_t vpx_highbd_12_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -1147,9 +1147,9 @@ uint32_t vpx_highbd_12_sub_pixel_variance32x32_c(const uint8_t* src_ptr, vpx_highbd_12_sub_pixel_variance32x32_c uint32_t vpx_highbd_12_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -1157,9 +1157,9 @@ uint32_t vpx_highbd_12_sub_pixel_variance32x64_c(const uint8_t* src_ptr, vpx_highbd_12_sub_pixel_variance32x64_c uint32_t vpx_highbd_12_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -1167,9 +1167,9 @@ uint32_t vpx_highbd_12_sub_pixel_variance4x4_c(const uint8_t* src_ptr, vpx_highbd_12_sub_pixel_variance4x4_c uint32_t vpx_highbd_12_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -1177,9 +1177,9 @@ uint32_t vpx_highbd_12_sub_pixel_variance4x8_c(const uint8_t* src_ptr, vpx_highbd_12_sub_pixel_variance4x8_c uint32_t vpx_highbd_12_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -1187,9 +1187,9 @@ uint32_t vpx_highbd_12_sub_pixel_variance64x32_c(const uint8_t* src_ptr, vpx_highbd_12_sub_pixel_variance64x32_c uint32_t vpx_highbd_12_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -1197,9 +1197,9 @@ uint32_t vpx_highbd_12_sub_pixel_variance64x64_c(const uint8_t* src_ptr, vpx_highbd_12_sub_pixel_variance64x64_c uint32_t vpx_highbd_12_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -1207,9 +1207,9 @@ uint32_t vpx_highbd_12_sub_pixel_variance8x16_c(const uint8_t* src_ptr, vpx_highbd_12_sub_pixel_variance8x16_c uint32_t vpx_highbd_12_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -1217,9 +1217,9 @@ uint32_t vpx_highbd_12_sub_pixel_variance8x4_c(const uint8_t* src_ptr, vpx_highbd_12_sub_pixel_variance8x4_c uint32_t vpx_highbd_12_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -1227,98 +1227,98 @@ uint32_t vpx_highbd_12_sub_pixel_variance8x8_c(const uint8_t* src_ptr, vpx_highbd_12_sub_pixel_variance8x8_c unsigned int vpx_highbd_12_variance16x16_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_12_variance16x16 vpx_highbd_12_variance16x16_c unsigned int vpx_highbd_12_variance16x32_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_12_variance16x32 vpx_highbd_12_variance16x32_c unsigned int vpx_highbd_12_variance16x8_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_12_variance16x8 vpx_highbd_12_variance16x8_c unsigned int vpx_highbd_12_variance32x16_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_12_variance32x16 vpx_highbd_12_variance32x16_c unsigned int vpx_highbd_12_variance32x32_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_12_variance32x32 vpx_highbd_12_variance32x32_c unsigned int vpx_highbd_12_variance32x64_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_12_variance32x64 vpx_highbd_12_variance32x64_c unsigned int vpx_highbd_12_variance4x4_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_12_variance4x4 vpx_highbd_12_variance4x4_c unsigned int vpx_highbd_12_variance4x8_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_12_variance4x8 vpx_highbd_12_variance4x8_c unsigned int vpx_highbd_12_variance64x32_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_12_variance64x32 vpx_highbd_12_variance64x32_c unsigned int vpx_highbd_12_variance64x64_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_12_variance64x64 vpx_highbd_12_variance64x64_c unsigned int vpx_highbd_12_variance8x16_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_12_variance8x16 vpx_highbd_12_variance8x16_c unsigned int vpx_highbd_12_variance8x4_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_12_variance8x4 vpx_highbd_12_variance8x4_c unsigned int vpx_highbd_12_variance8x8_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_12_variance8x8 vpx_highbd_12_variance8x8_c void vpx_highbd_8_get16x16var_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse, @@ -1326,7 +1326,7 @@ void vpx_highbd_8_get16x16var_c(const uint8_t* src_ptr, #define vpx_highbd_8_get16x16var vpx_highbd_8_get16x16var_c void vpx_highbd_8_get8x8var_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse, @@ -1334,37 +1334,37 @@ void vpx_highbd_8_get8x8var_c(const uint8_t* src_ptr, #define vpx_highbd_8_get8x8var vpx_highbd_8_get8x8var_c unsigned int vpx_highbd_8_mse16x16_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, - int recon_stride, + int ref_stride, unsigned int* sse); #define vpx_highbd_8_mse16x16 vpx_highbd_8_mse16x16_c unsigned int vpx_highbd_8_mse16x8_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, - int recon_stride, + int ref_stride, unsigned int* sse); #define vpx_highbd_8_mse16x8 vpx_highbd_8_mse16x8_c unsigned int vpx_highbd_8_mse8x16_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, - int recon_stride, + int ref_stride, unsigned int* sse); #define vpx_highbd_8_mse8x16 vpx_highbd_8_mse8x16_c unsigned int vpx_highbd_8_mse8x8_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, - int recon_stride, + int ref_stride, unsigned int* sse); #define vpx_highbd_8_mse8x8 vpx_highbd_8_mse8x8_c uint32_t vpx_highbd_8_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -1373,9 +1373,9 @@ uint32_t vpx_highbd_8_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr, vpx_highbd_8_sub_pixel_avg_variance16x16_c uint32_t vpx_highbd_8_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -1384,9 +1384,9 @@ uint32_t vpx_highbd_8_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr, vpx_highbd_8_sub_pixel_avg_variance16x32_c uint32_t vpx_highbd_8_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -1395,9 +1395,9 @@ uint32_t vpx_highbd_8_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, vpx_highbd_8_sub_pixel_avg_variance16x8_c uint32_t vpx_highbd_8_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -1406,9 +1406,9 @@ uint32_t vpx_highbd_8_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr, vpx_highbd_8_sub_pixel_avg_variance32x16_c uint32_t vpx_highbd_8_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -1417,9 +1417,9 @@ uint32_t vpx_highbd_8_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr, vpx_highbd_8_sub_pixel_avg_variance32x32_c uint32_t vpx_highbd_8_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -1428,9 +1428,9 @@ uint32_t vpx_highbd_8_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr, vpx_highbd_8_sub_pixel_avg_variance32x64_c uint32_t vpx_highbd_8_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -1439,9 +1439,9 @@ uint32_t vpx_highbd_8_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, vpx_highbd_8_sub_pixel_avg_variance4x4_c uint32_t vpx_highbd_8_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -1450,9 +1450,9 @@ uint32_t vpx_highbd_8_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, vpx_highbd_8_sub_pixel_avg_variance4x8_c uint32_t vpx_highbd_8_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -1461,9 +1461,9 @@ uint32_t vpx_highbd_8_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr, vpx_highbd_8_sub_pixel_avg_variance64x32_c uint32_t vpx_highbd_8_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -1472,9 +1472,9 @@ uint32_t vpx_highbd_8_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr, vpx_highbd_8_sub_pixel_avg_variance64x64_c uint32_t vpx_highbd_8_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -1483,9 +1483,9 @@ uint32_t vpx_highbd_8_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, vpx_highbd_8_sub_pixel_avg_variance8x16_c uint32_t vpx_highbd_8_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -1494,9 +1494,9 @@ uint32_t vpx_highbd_8_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, vpx_highbd_8_sub_pixel_avg_variance8x4_c uint32_t vpx_highbd_8_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -1505,9 +1505,9 @@ uint32_t vpx_highbd_8_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, vpx_highbd_8_sub_pixel_avg_variance8x8_c uint32_t vpx_highbd_8_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -1515,9 +1515,9 @@ uint32_t vpx_highbd_8_sub_pixel_variance16x16_c(const uint8_t* src_ptr, vpx_highbd_8_sub_pixel_variance16x16_c uint32_t vpx_highbd_8_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -1525,9 +1525,9 @@ uint32_t vpx_highbd_8_sub_pixel_variance16x32_c(const uint8_t* src_ptr, vpx_highbd_8_sub_pixel_variance16x32_c uint32_t vpx_highbd_8_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -1535,9 +1535,9 @@ uint32_t vpx_highbd_8_sub_pixel_variance16x8_c(const uint8_t* src_ptr, vpx_highbd_8_sub_pixel_variance16x8_c uint32_t vpx_highbd_8_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -1545,9 +1545,9 @@ uint32_t vpx_highbd_8_sub_pixel_variance32x16_c(const uint8_t* src_ptr, vpx_highbd_8_sub_pixel_variance32x16_c uint32_t vpx_highbd_8_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -1555,9 +1555,9 @@ uint32_t vpx_highbd_8_sub_pixel_variance32x32_c(const uint8_t* src_ptr, vpx_highbd_8_sub_pixel_variance32x32_c uint32_t vpx_highbd_8_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -1565,27 +1565,27 @@ uint32_t vpx_highbd_8_sub_pixel_variance32x64_c(const uint8_t* src_ptr, vpx_highbd_8_sub_pixel_variance32x64_c uint32_t vpx_highbd_8_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); #define vpx_highbd_8_sub_pixel_variance4x4 vpx_highbd_8_sub_pixel_variance4x4_c uint32_t vpx_highbd_8_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); #define vpx_highbd_8_sub_pixel_variance4x8 vpx_highbd_8_sub_pixel_variance4x8_c uint32_t vpx_highbd_8_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -1593,9 +1593,9 @@ uint32_t vpx_highbd_8_sub_pixel_variance64x32_c(const uint8_t* src_ptr, vpx_highbd_8_sub_pixel_variance64x32_c uint32_t vpx_highbd_8_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -1603,9 +1603,9 @@ uint32_t vpx_highbd_8_sub_pixel_variance64x64_c(const uint8_t* src_ptr, vpx_highbd_8_sub_pixel_variance64x64_c uint32_t vpx_highbd_8_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -1613,118 +1613,118 @@ uint32_t vpx_highbd_8_sub_pixel_variance8x16_c(const uint8_t* src_ptr, vpx_highbd_8_sub_pixel_variance8x16_c uint32_t vpx_highbd_8_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); #define vpx_highbd_8_sub_pixel_variance8x4 vpx_highbd_8_sub_pixel_variance8x4_c uint32_t vpx_highbd_8_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); #define vpx_highbd_8_sub_pixel_variance8x8 vpx_highbd_8_sub_pixel_variance8x8_c unsigned int vpx_highbd_8_variance16x16_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_8_variance16x16 vpx_highbd_8_variance16x16_c unsigned int vpx_highbd_8_variance16x32_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_8_variance16x32 vpx_highbd_8_variance16x32_c unsigned int vpx_highbd_8_variance16x8_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_8_variance16x8 vpx_highbd_8_variance16x8_c unsigned int vpx_highbd_8_variance32x16_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_8_variance32x16 vpx_highbd_8_variance32x16_c unsigned int vpx_highbd_8_variance32x32_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_8_variance32x32 vpx_highbd_8_variance32x32_c unsigned int vpx_highbd_8_variance32x64_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_8_variance32x64 vpx_highbd_8_variance32x64_c unsigned int vpx_highbd_8_variance4x4_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_8_variance4x4 vpx_highbd_8_variance4x4_c unsigned int vpx_highbd_8_variance4x8_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_8_variance4x8 vpx_highbd_8_variance4x8_c unsigned int vpx_highbd_8_variance64x32_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_8_variance64x32 vpx_highbd_8_variance64x32_c unsigned int vpx_highbd_8_variance64x64_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_8_variance64x64 vpx_highbd_8_variance64x64_c unsigned int vpx_highbd_8_variance8x16_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_8_variance8x16 vpx_highbd_8_variance8x16_c unsigned int vpx_highbd_8_variance8x4_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_8_variance8x4 vpx_highbd_8_variance8x4_c unsigned int vpx_highbd_8_variance8x8_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_highbd_8_variance8x8 vpx_highbd_8_variance8x8_c -unsigned int vpx_highbd_avg_4x4_c(const uint8_t*, int p); +unsigned int vpx_highbd_avg_4x4_c(const uint8_t* s8, int p); #define vpx_highbd_avg_4x4 vpx_highbd_avg_4x4_c -unsigned int vpx_highbd_avg_8x8_c(const uint8_t*, int p); +unsigned int vpx_highbd_avg_8x8_c(const uint8_t* s8, int p); #define vpx_highbd_avg_8x8 vpx_highbd_avg_8x8_c void vpx_highbd_comp_avg_pred_c(uint16_t* comp_pred, @@ -1746,7 +1746,7 @@ void vpx_highbd_convolve8_c(const uint16_t* src, int y_step_q4, int w, int h, - int bps); + int bd); #define vpx_highbd_convolve8 vpx_highbd_convolve8_c void vpx_highbd_convolve8_avg_c(const uint16_t* src, @@ -1760,7 +1760,7 @@ void vpx_highbd_convolve8_avg_c(const uint16_t* src, int y_step_q4, int w, int h, - int bps); + int bd); #define vpx_highbd_convolve8_avg vpx_highbd_convolve8_avg_c void vpx_highbd_convolve8_avg_horiz_c(const uint16_t* src, @@ -1774,7 +1774,7 @@ void vpx_highbd_convolve8_avg_horiz_c(const uint16_t* src, int y_step_q4, int w, int h, - int bps); + int bd); #define vpx_highbd_convolve8_avg_horiz vpx_highbd_convolve8_avg_horiz_c void vpx_highbd_convolve8_avg_vert_c(const uint16_t* src, @@ -1788,7 +1788,7 @@ void vpx_highbd_convolve8_avg_vert_c(const uint16_t* src, int y_step_q4, int w, int h, - int bps); + int bd); #define vpx_highbd_convolve8_avg_vert vpx_highbd_convolve8_avg_vert_c void vpx_highbd_convolve8_horiz_c(const uint16_t* src, @@ -1802,7 +1802,7 @@ void vpx_highbd_convolve8_horiz_c(const uint16_t* src, int y_step_q4, int w, int h, - int bps); + int bd); #define vpx_highbd_convolve8_horiz vpx_highbd_convolve8_horiz_c void vpx_highbd_convolve8_vert_c(const uint16_t* src, @@ -1816,7 +1816,7 @@ void vpx_highbd_convolve8_vert_c(const uint16_t* src, int y_step_q4, int w, int h, - int bps); + int bd); #define vpx_highbd_convolve8_vert vpx_highbd_convolve8_vert_c void vpx_highbd_convolve_avg_c(const uint16_t* src, @@ -1830,7 +1830,7 @@ void vpx_highbd_convolve_avg_c(const uint16_t* src, int y_step_q4, int w, int h, - int bps); + int bd); #define vpx_highbd_convolve_avg vpx_highbd_convolve_avg_c void vpx_highbd_convolve_copy_c(const uint16_t* src, @@ -1844,284 +1844,284 @@ void vpx_highbd_convolve_copy_c(const uint16_t* src, int y_step_q4, int w, int h, - int bps); + int bd); #define vpx_highbd_convolve_copy vpx_highbd_convolve_copy_c void vpx_highbd_d117_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_d117_predictor_16x16 vpx_highbd_d117_predictor_16x16_c void vpx_highbd_d117_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_d117_predictor_32x32 vpx_highbd_d117_predictor_32x32_c void vpx_highbd_d117_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_d117_predictor_4x4 vpx_highbd_d117_predictor_4x4_c void vpx_highbd_d117_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_d117_predictor_8x8 vpx_highbd_d117_predictor_8x8_c void vpx_highbd_d135_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_d135_predictor_16x16 vpx_highbd_d135_predictor_16x16_c void vpx_highbd_d135_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_d135_predictor_32x32 vpx_highbd_d135_predictor_32x32_c void vpx_highbd_d135_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_d135_predictor_4x4 vpx_highbd_d135_predictor_4x4_c void vpx_highbd_d135_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_d135_predictor_8x8 vpx_highbd_d135_predictor_8x8_c void vpx_highbd_d153_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_d153_predictor_16x16 vpx_highbd_d153_predictor_16x16_c void vpx_highbd_d153_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_d153_predictor_32x32 vpx_highbd_d153_predictor_32x32_c void vpx_highbd_d153_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_d153_predictor_4x4 vpx_highbd_d153_predictor_4x4_c void vpx_highbd_d153_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_d153_predictor_8x8 vpx_highbd_d153_predictor_8x8_c void vpx_highbd_d207_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_d207_predictor_16x16 vpx_highbd_d207_predictor_16x16_c void vpx_highbd_d207_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_d207_predictor_32x32 vpx_highbd_d207_predictor_32x32_c void vpx_highbd_d207_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_d207_predictor_4x4 vpx_highbd_d207_predictor_4x4_c void vpx_highbd_d207_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_d207_predictor_8x8 vpx_highbd_d207_predictor_8x8_c void vpx_highbd_d45_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_d45_predictor_16x16 vpx_highbd_d45_predictor_16x16_c void vpx_highbd_d45_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_d45_predictor_32x32 vpx_highbd_d45_predictor_32x32_c void vpx_highbd_d45_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_d45_predictor_4x4 vpx_highbd_d45_predictor_4x4_c void vpx_highbd_d45_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_d45_predictor_8x8 vpx_highbd_d45_predictor_8x8_c void vpx_highbd_d63_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_d63_predictor_16x16 vpx_highbd_d63_predictor_16x16_c void vpx_highbd_d63_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_d63_predictor_32x32 vpx_highbd_d63_predictor_32x32_c void vpx_highbd_d63_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_d63_predictor_4x4 vpx_highbd_d63_predictor_4x4_c void vpx_highbd_d63_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_d63_predictor_8x8 vpx_highbd_d63_predictor_8x8_c void vpx_highbd_dc_128_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_dc_128_predictor_16x16 vpx_highbd_dc_128_predictor_16x16_c void vpx_highbd_dc_128_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_dc_128_predictor_32x32 vpx_highbd_dc_128_predictor_32x32_c void vpx_highbd_dc_128_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_dc_128_predictor_4x4 vpx_highbd_dc_128_predictor_4x4_c void vpx_highbd_dc_128_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_dc_128_predictor_8x8 vpx_highbd_dc_128_predictor_8x8_c void vpx_highbd_dc_left_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_dc_left_predictor_16x16 vpx_highbd_dc_left_predictor_16x16_c void vpx_highbd_dc_left_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_dc_left_predictor_32x32 vpx_highbd_dc_left_predictor_32x32_c void vpx_highbd_dc_left_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_dc_left_predictor_4x4 vpx_highbd_dc_left_predictor_4x4_c void vpx_highbd_dc_left_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_dc_left_predictor_8x8 vpx_highbd_dc_left_predictor_8x8_c void vpx_highbd_dc_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_dc_predictor_16x16 vpx_highbd_dc_predictor_16x16_c void vpx_highbd_dc_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_dc_predictor_32x32 vpx_highbd_dc_predictor_32x32_c void vpx_highbd_dc_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_dc_predictor_4x4 vpx_highbd_dc_predictor_4x4_c void vpx_highbd_dc_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_dc_predictor_8x8 vpx_highbd_dc_predictor_8x8_c void vpx_highbd_dc_top_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_dc_top_predictor_16x16 vpx_highbd_dc_top_predictor_16x16_c void vpx_highbd_dc_top_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_dc_top_predictor_32x32 vpx_highbd_dc_top_predictor_32x32_c void vpx_highbd_dc_top_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_dc_top_predictor_4x4 vpx_highbd_dc_top_predictor_4x4_c void vpx_highbd_dc_top_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); @@ -2164,33 +2164,48 @@ void vpx_highbd_fdct8x8_1_c(const int16_t* input, #define vpx_highbd_fdct8x8_1 vpx_highbd_fdct8x8_1_c void vpx_highbd_h_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_h_predictor_16x16 vpx_highbd_h_predictor_16x16_c void vpx_highbd_h_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_h_predictor_32x32 vpx_highbd_h_predictor_32x32_c void vpx_highbd_h_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_h_predictor_4x4 vpx_highbd_h_predictor_4x4_c void vpx_highbd_h_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_h_predictor_8x8 vpx_highbd_h_predictor_8x8_c +void vpx_highbd_hadamard_16x16_c(const int16_t* src_diff, + ptrdiff_t src_stride, + tran_low_t* coeff); +#define vpx_highbd_hadamard_16x16 vpx_highbd_hadamard_16x16_c + +void vpx_highbd_hadamard_32x32_c(const int16_t* src_diff, + ptrdiff_t src_stride, + tran_low_t* coeff); +#define vpx_highbd_hadamard_32x32 vpx_highbd_hadamard_32x32_c + +void vpx_highbd_hadamard_8x8_c(const int16_t* src_diff, + ptrdiff_t src_stride, + tran_low_t* coeff); +#define vpx_highbd_hadamard_8x8 vpx_highbd_hadamard_8x8_c + void vpx_highbd_idct16x16_10_add_c(const tran_low_t* input, uint16_t* dest, int stride, @@ -2389,9 +2404,9 @@ void vpx_highbd_lpf_vertical_8_dual_c(uint16_t* s, int bd); #define vpx_highbd_lpf_vertical_8_dual vpx_highbd_lpf_vertical_8_dual_c -void vpx_highbd_minmax_8x8_c(const uint8_t* s, +void vpx_highbd_minmax_8x8_c(const uint8_t* s8, int p, - const uint8_t* d, + const uint8_t* d8, int dp, int* min, int* max); @@ -2442,7 +2457,7 @@ unsigned int vpx_highbd_sad16x16_avg_c(const uint8_t* src_ptr, void vpx_highbd_sad16x16x4d_c(const uint8_t* src_ptr, int src_stride, - const uint8_t* const ref_ptr[], + const uint8_t* const ref_array[], int ref_stride, uint32_t* sad_array); #define vpx_highbd_sad16x16x4d vpx_highbd_sad16x16x4d_c @@ -2462,7 +2477,7 @@ unsigned int vpx_highbd_sad16x32_avg_c(const uint8_t* src_ptr, void vpx_highbd_sad16x32x4d_c(const uint8_t* src_ptr, int src_stride, - const uint8_t* const ref_ptr[], + const uint8_t* const ref_array[], int ref_stride, uint32_t* sad_array); #define vpx_highbd_sad16x32x4d vpx_highbd_sad16x32x4d_c @@ -2482,7 +2497,7 @@ unsigned int vpx_highbd_sad16x8_avg_c(const uint8_t* src_ptr, void vpx_highbd_sad16x8x4d_c(const uint8_t* src_ptr, int src_stride, - const uint8_t* const ref_ptr[], + const uint8_t* const ref_array[], int ref_stride, uint32_t* sad_array); #define vpx_highbd_sad16x8x4d vpx_highbd_sad16x8x4d_c @@ -2502,7 +2517,7 @@ unsigned int vpx_highbd_sad32x16_avg_c(const uint8_t* src_ptr, void vpx_highbd_sad32x16x4d_c(const uint8_t* src_ptr, int src_stride, - const uint8_t* const ref_ptr[], + const uint8_t* const ref_array[], int ref_stride, uint32_t* sad_array); #define vpx_highbd_sad32x16x4d vpx_highbd_sad32x16x4d_c @@ -2522,7 +2537,7 @@ unsigned int vpx_highbd_sad32x32_avg_c(const uint8_t* src_ptr, void vpx_highbd_sad32x32x4d_c(const uint8_t* src_ptr, int src_stride, - const uint8_t* const ref_ptr[], + const uint8_t* const ref_array[], int ref_stride, uint32_t* sad_array); #define vpx_highbd_sad32x32x4d vpx_highbd_sad32x32x4d_c @@ -2542,7 +2557,7 @@ unsigned int vpx_highbd_sad32x64_avg_c(const uint8_t* src_ptr, void vpx_highbd_sad32x64x4d_c(const uint8_t* src_ptr, int src_stride, - const uint8_t* const ref_ptr[], + const uint8_t* const ref_array[], int ref_stride, uint32_t* sad_array); #define vpx_highbd_sad32x64x4d vpx_highbd_sad32x64x4d_c @@ -2562,7 +2577,7 @@ unsigned int vpx_highbd_sad4x4_avg_c(const uint8_t* src_ptr, void vpx_highbd_sad4x4x4d_c(const uint8_t* src_ptr, int src_stride, - const uint8_t* const ref_ptr[], + const uint8_t* const ref_array[], int ref_stride, uint32_t* sad_array); #define vpx_highbd_sad4x4x4d vpx_highbd_sad4x4x4d_c @@ -2582,7 +2597,7 @@ unsigned int vpx_highbd_sad4x8_avg_c(const uint8_t* src_ptr, void vpx_highbd_sad4x8x4d_c(const uint8_t* src_ptr, int src_stride, - const uint8_t* const ref_ptr[], + const uint8_t* const ref_array[], int ref_stride, uint32_t* sad_array); #define vpx_highbd_sad4x8x4d vpx_highbd_sad4x8x4d_c @@ -2602,7 +2617,7 @@ unsigned int vpx_highbd_sad64x32_avg_c(const uint8_t* src_ptr, void vpx_highbd_sad64x32x4d_c(const uint8_t* src_ptr, int src_stride, - const uint8_t* const ref_ptr[], + const uint8_t* const ref_array[], int ref_stride, uint32_t* sad_array); #define vpx_highbd_sad64x32x4d vpx_highbd_sad64x32x4d_c @@ -2622,7 +2637,7 @@ unsigned int vpx_highbd_sad64x64_avg_c(const uint8_t* src_ptr, void vpx_highbd_sad64x64x4d_c(const uint8_t* src_ptr, int src_stride, - const uint8_t* const ref_ptr[], + const uint8_t* const ref_array[], int ref_stride, uint32_t* sad_array); #define vpx_highbd_sad64x64x4d vpx_highbd_sad64x64x4d_c @@ -2642,7 +2657,7 @@ unsigned int vpx_highbd_sad8x16_avg_c(const uint8_t* src_ptr, void vpx_highbd_sad8x16x4d_c(const uint8_t* src_ptr, int src_stride, - const uint8_t* const ref_ptr[], + const uint8_t* const ref_array[], int ref_stride, uint32_t* sad_array); #define vpx_highbd_sad8x16x4d vpx_highbd_sad8x16x4d_c @@ -2662,7 +2677,7 @@ unsigned int vpx_highbd_sad8x4_avg_c(const uint8_t* src_ptr, void vpx_highbd_sad8x4x4d_c(const uint8_t* src_ptr, int src_stride, - const uint8_t* const ref_ptr[], + const uint8_t* const ref_array[], int ref_stride, uint32_t* sad_array); #define vpx_highbd_sad8x4x4d vpx_highbd_sad8x4x4d_c @@ -2682,7 +2697,7 @@ unsigned int vpx_highbd_sad8x8_avg_c(const uint8_t* src_ptr, void vpx_highbd_sad8x8x4d_c(const uint8_t* src_ptr, int src_stride, - const uint8_t* const ref_ptr[], + const uint8_t* const ref_array[], int ref_stride, uint32_t* sad_array); #define vpx_highbd_sad8x8x4d vpx_highbd_sad8x8x4d_c @@ -2691,64 +2706,64 @@ void vpx_highbd_subtract_block_c(int rows, int cols, int16_t* diff_ptr, ptrdiff_t diff_stride, - const uint8_t* src_ptr, + const uint8_t* src8_ptr, ptrdiff_t src_stride, - const uint8_t* pred_ptr, + const uint8_t* pred8_ptr, ptrdiff_t pred_stride, int bd); #define vpx_highbd_subtract_block vpx_highbd_subtract_block_c void vpx_highbd_tm_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_tm_predictor_16x16 vpx_highbd_tm_predictor_16x16_c void vpx_highbd_tm_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_tm_predictor_32x32 vpx_highbd_tm_predictor_32x32_c void vpx_highbd_tm_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_tm_predictor_4x4 vpx_highbd_tm_predictor_4x4_c void vpx_highbd_tm_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_tm_predictor_8x8 vpx_highbd_tm_predictor_8x8_c void vpx_highbd_v_predictor_16x16_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_v_predictor_16x16 vpx_highbd_v_predictor_16x16_c void vpx_highbd_v_predictor_32x32_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_v_predictor_32x32 vpx_highbd_v_predictor_32x32_c void vpx_highbd_v_predictor_4x4_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); #define vpx_highbd_v_predictor_4x4 vpx_highbd_v_predictor_4x4_c void vpx_highbd_v_predictor_8x8_c(uint16_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint16_t* above, const uint16_t* left, int bd); @@ -2910,7 +2925,7 @@ void vpx_lpf_vertical_8_dual_c(uint8_t* s, const uint8_t* thresh1); #define vpx_lpf_vertical_8_dual vpx_lpf_vertical_8_dual_c -void vpx_mbpost_proc_across_ip_c(unsigned char* dst, +void vpx_mbpost_proc_across_ip_c(unsigned char* src, int pitch, int rows, int cols, @@ -2933,30 +2948,30 @@ void vpx_minmax_8x8_c(const uint8_t* s, #define vpx_minmax_8x8 vpx_minmax_8x8_c unsigned int vpx_mse16x16_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, - int recon_stride, + int ref_stride, unsigned int* sse); #define vpx_mse16x16 vpx_mse16x16_c unsigned int vpx_mse16x8_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, - int recon_stride, + int ref_stride, unsigned int* sse); #define vpx_mse16x8 vpx_mse16x8_c unsigned int vpx_mse8x16_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, - int recon_stride, + int ref_stride, unsigned int* sse); #define vpx_mse8x16 vpx_mse8x16_c unsigned int vpx_mse8x8_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, - int recon_stride, + int ref_stride, unsigned int* sse); #define vpx_mse8x8 vpx_mse8x8_c @@ -3031,7 +3046,7 @@ void vpx_sad16x16x3_c(const uint8_t* src_ptr, void vpx_sad16x16x4d_c(const uint8_t* src_ptr, int src_stride, - const uint8_t* const ref_ptr[], + const uint8_t* const ref_array[], int ref_stride, uint32_t* sad_array); #define vpx_sad16x16x4d vpx_sad16x16x4d_c @@ -3058,7 +3073,7 @@ unsigned int vpx_sad16x32_avg_c(const uint8_t* src_ptr, void vpx_sad16x32x4d_c(const uint8_t* src_ptr, int src_stride, - const uint8_t* const ref_ptr[], + const uint8_t* const ref_array[], int ref_stride, uint32_t* sad_array); #define vpx_sad16x32x4d vpx_sad16x32x4d_c @@ -3085,7 +3100,7 @@ void vpx_sad16x8x3_c(const uint8_t* src_ptr, void vpx_sad16x8x4d_c(const uint8_t* src_ptr, int src_stride, - const uint8_t* const ref_ptr[], + const uint8_t* const ref_array[], int ref_stride, uint32_t* sad_array); #define vpx_sad16x8x4d vpx_sad16x8x4d_c @@ -3112,7 +3127,7 @@ unsigned int vpx_sad32x16_avg_c(const uint8_t* src_ptr, void vpx_sad32x16x4d_c(const uint8_t* src_ptr, int src_stride, - const uint8_t* const ref_ptr[], + const uint8_t* const ref_array[], int ref_stride, uint32_t* sad_array); #define vpx_sad32x16x4d vpx_sad32x16x4d_c @@ -3132,7 +3147,7 @@ unsigned int vpx_sad32x32_avg_c(const uint8_t* src_ptr, void vpx_sad32x32x4d_c(const uint8_t* src_ptr, int src_stride, - const uint8_t* const ref_ptr[], + const uint8_t* const ref_array[], int ref_stride, uint32_t* sad_array); #define vpx_sad32x32x4d vpx_sad32x32x4d_c @@ -3152,7 +3167,7 @@ unsigned int vpx_sad32x64_avg_c(const uint8_t* src_ptr, void vpx_sad32x64x4d_c(const uint8_t* src_ptr, int src_stride, - const uint8_t* const ref_ptr[], + const uint8_t* const ref_array[], int ref_stride, uint32_t* sad_array); #define vpx_sad32x64x4d vpx_sad32x64x4d_c @@ -3179,7 +3194,7 @@ void vpx_sad4x4x3_c(const uint8_t* src_ptr, void vpx_sad4x4x4d_c(const uint8_t* src_ptr, int src_stride, - const uint8_t* const ref_ptr[], + const uint8_t* const ref_array[], int ref_stride, uint32_t* sad_array); #define vpx_sad4x4x4d vpx_sad4x4x4d_c @@ -3206,7 +3221,7 @@ unsigned int vpx_sad4x8_avg_c(const uint8_t* src_ptr, void vpx_sad4x8x4d_c(const uint8_t* src_ptr, int src_stride, - const uint8_t* const ref_ptr[], + const uint8_t* const ref_array[], int ref_stride, uint32_t* sad_array); #define vpx_sad4x8x4d vpx_sad4x8x4d_c @@ -3226,7 +3241,7 @@ unsigned int vpx_sad64x32_avg_c(const uint8_t* src_ptr, void vpx_sad64x32x4d_c(const uint8_t* src_ptr, int src_stride, - const uint8_t* const ref_ptr[], + const uint8_t* const ref_array[], int ref_stride, uint32_t* sad_array); #define vpx_sad64x32x4d vpx_sad64x32x4d_c @@ -3246,7 +3261,7 @@ unsigned int vpx_sad64x64_avg_c(const uint8_t* src_ptr, void vpx_sad64x64x4d_c(const uint8_t* src_ptr, int src_stride, - const uint8_t* const ref_ptr[], + const uint8_t* const ref_array[], int ref_stride, uint32_t* sad_array); #define vpx_sad64x64x4d vpx_sad64x64x4d_c @@ -3273,7 +3288,7 @@ void vpx_sad8x16x3_c(const uint8_t* src_ptr, void vpx_sad8x16x4d_c(const uint8_t* src_ptr, int src_stride, - const uint8_t* const ref_ptr[], + const uint8_t* const ref_array[], int ref_stride, uint32_t* sad_array); #define vpx_sad8x16x4d vpx_sad8x16x4d_c @@ -3300,7 +3315,7 @@ unsigned int vpx_sad8x4_avg_c(const uint8_t* src_ptr, void vpx_sad8x4x4d_c(const uint8_t* src_ptr, int src_stride, - const uint8_t* const ref_ptr[], + const uint8_t* const ref_array[], int ref_stride, uint32_t* sad_array); #define vpx_sad8x4x4d vpx_sad8x4x4d_c @@ -3327,7 +3342,7 @@ void vpx_sad8x8x3_c(const uint8_t* src_ptr, void vpx_sad8x8x4d_c(const uint8_t* src_ptr, int src_stride, - const uint8_t* const ref_ptr[], + const uint8_t* const ref_array[], int ref_stride, uint32_t* sad_array); #define vpx_sad8x8x4d vpx_sad8x8x4d_c @@ -3421,9 +3436,9 @@ void vpx_scaled_vert_c(const uint8_t* src, #define vpx_scaled_vert vpx_scaled_vert_c uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -3431,9 +3446,9 @@ uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr, #define vpx_sub_pixel_avg_variance16x16 vpx_sub_pixel_avg_variance16x16_c uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -3441,9 +3456,9 @@ uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr, #define vpx_sub_pixel_avg_variance16x32 vpx_sub_pixel_avg_variance16x32_c uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -3451,9 +3466,9 @@ uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr, #define vpx_sub_pixel_avg_variance16x8 vpx_sub_pixel_avg_variance16x8_c uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -3461,9 +3476,9 @@ uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr, #define vpx_sub_pixel_avg_variance32x16 vpx_sub_pixel_avg_variance32x16_c uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -3471,9 +3486,9 @@ uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr, #define vpx_sub_pixel_avg_variance32x32 vpx_sub_pixel_avg_variance32x32_c uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -3481,9 +3496,9 @@ uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr, #define vpx_sub_pixel_avg_variance32x64 vpx_sub_pixel_avg_variance32x64_c uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -3491,9 +3506,9 @@ uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr, #define vpx_sub_pixel_avg_variance4x4 vpx_sub_pixel_avg_variance4x4_c uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -3501,9 +3516,9 @@ uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr, #define vpx_sub_pixel_avg_variance4x8 vpx_sub_pixel_avg_variance4x8_c uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -3511,9 +3526,9 @@ uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr, #define vpx_sub_pixel_avg_variance64x32 vpx_sub_pixel_avg_variance64x32_c uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -3521,9 +3536,9 @@ uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr, #define vpx_sub_pixel_avg_variance64x64 vpx_sub_pixel_avg_variance64x64_c uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -3531,9 +3546,9 @@ uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr, #define vpx_sub_pixel_avg_variance8x16 vpx_sub_pixel_avg_variance8x16_c uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -3541,9 +3556,9 @@ uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr, #define vpx_sub_pixel_avg_variance8x4 vpx_sub_pixel_avg_variance8x4_c uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse, @@ -3551,117 +3566,117 @@ uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr, #define vpx_sub_pixel_avg_variance8x8 vpx_sub_pixel_avg_variance8x8_c uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); #define vpx_sub_pixel_variance16x16 vpx_sub_pixel_variance16x16_c uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); #define vpx_sub_pixel_variance16x32 vpx_sub_pixel_variance16x32_c uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); #define vpx_sub_pixel_variance16x8 vpx_sub_pixel_variance16x8_c uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); #define vpx_sub_pixel_variance32x16 vpx_sub_pixel_variance32x16_c uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); #define vpx_sub_pixel_variance32x32 vpx_sub_pixel_variance32x32_c uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); #define vpx_sub_pixel_variance32x64 vpx_sub_pixel_variance32x64_c uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); #define vpx_sub_pixel_variance4x4 vpx_sub_pixel_variance4x4_c uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); #define vpx_sub_pixel_variance4x8 vpx_sub_pixel_variance4x8_c uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); #define vpx_sub_pixel_variance64x32 vpx_sub_pixel_variance64x32_c uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); #define vpx_sub_pixel_variance64x64 vpx_sub_pixel_variance64x64_c uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); #define vpx_sub_pixel_variance8x16 vpx_sub_pixel_variance8x16_c uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); #define vpx_sub_pixel_variance8x4 vpx_sub_pixel_variance8x4_c uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t* src_ptr, - int source_stride, - int xoffset, - int yoffset, + int src_stride, + int x_offset, + int y_offset, const uint8_t* ref_ptr, int ref_stride, uint32_t* sse); @@ -3681,146 +3696,146 @@ uint64_t vpx_sum_squares_2d_i16_c(const int16_t* src, int stride, int size); #define vpx_sum_squares_2d_i16 vpx_sum_squares_2d_i16_c void vpx_tm_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_tm_predictor_16x16 vpx_tm_predictor_16x16_c void vpx_tm_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_tm_predictor_32x32 vpx_tm_predictor_32x32_c void vpx_tm_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_tm_predictor_4x4 vpx_tm_predictor_4x4_c void vpx_tm_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_tm_predictor_8x8 vpx_tm_predictor_8x8_c void vpx_v_predictor_16x16_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_v_predictor_16x16 vpx_v_predictor_16x16_c void vpx_v_predictor_32x32_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_v_predictor_32x32 vpx_v_predictor_32x32_c void vpx_v_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_v_predictor_4x4 vpx_v_predictor_4x4_c void vpx_v_predictor_8x8_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_v_predictor_8x8 vpx_v_predictor_8x8_c unsigned int vpx_variance16x16_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_variance16x16 vpx_variance16x16_c unsigned int vpx_variance16x32_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_variance16x32 vpx_variance16x32_c unsigned int vpx_variance16x8_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_variance16x8 vpx_variance16x8_c unsigned int vpx_variance32x16_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_variance32x16 vpx_variance32x16_c unsigned int vpx_variance32x32_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_variance32x32 vpx_variance32x32_c unsigned int vpx_variance32x64_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_variance32x64 vpx_variance32x64_c unsigned int vpx_variance4x4_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_variance4x4 vpx_variance4x4_c unsigned int vpx_variance4x8_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_variance4x8 vpx_variance4x8_c unsigned int vpx_variance64x32_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_variance64x32 vpx_variance64x32_c unsigned int vpx_variance64x64_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_variance64x64 vpx_variance64x64_c unsigned int vpx_variance8x16_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_variance8x16 vpx_variance8x16_c unsigned int vpx_variance8x4_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_variance8x4 vpx_variance8x4_c unsigned int vpx_variance8x8_c(const uint8_t* src_ptr, - int source_stride, + int src_stride, const uint8_t* ref_ptr, int ref_stride, unsigned int* sse); #define vpx_variance8x8 vpx_variance8x8_c void vpx_ve_predictor_4x4_c(uint8_t* dst, - ptrdiff_t y_stride, + ptrdiff_t stride, const uint8_t* above, const uint8_t* left); #define vpx_ve_predictor_4x4 vpx_ve_predictor_4x4_c |