Merge "Support measure distortion in the pixel domain"

diff --cc vpx_dsp/vpx_dsp.mk
Simple merge

diff --cc vpx_dsp/vpx_dsp_rtcd_defs.pl
index 7b61415,38fc097..66d466a
--- 1/vpx_dsp/vpx_dsp_rtcd_defs.pl
--- 2/vpx_dsp/vpx_dsp_rtcd_defs.pl
+++ b/vpx_dsp/vpx_dsp_rtcd_defs.pl
@@@ -1108,44 -1131,47 +1108,47 @@@ specialize qw/vpx_sad4x4x8 sse4_1 msa/
  # Multi-block SAD, comparing a reference to N independent blocks
  #
  add_proto qw/void vpx_sad64x64x4d/, "const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array";
 -specialize qw/vpx_sad64x64x4d avx2 neon msa/, "$sse2_x86inc";
 +specialize qw/vpx_sad64x64x4d avx2 neon msa sse2/;
  
  add_proto qw/void vpx_sad64x32x4d/, "const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array";
 -specialize qw/vpx_sad64x32x4d msa/, "$sse2_x86inc";
 +specialize qw/vpx_sad64x32x4d msa sse2/;
  
  add_proto qw/void vpx_sad32x64x4d/, "const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array";
 -specialize qw/vpx_sad32x64x4d msa/, "$sse2_x86inc";
 +specialize qw/vpx_sad32x64x4d msa sse2/;
  
  add_proto qw/void vpx_sad32x32x4d/, "const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array";
 -specialize qw/vpx_sad32x32x4d avx2 neon msa/, "$sse2_x86inc";
 +specialize qw/vpx_sad32x32x4d avx2 neon msa sse2/;
  
  add_proto qw/void vpx_sad32x16x4d/, "const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array";
 -specialize qw/vpx_sad32x16x4d msa/, "$sse2_x86inc";
 +specialize qw/vpx_sad32x16x4d msa sse2/;
  
  add_proto qw/void vpx_sad16x32x4d/, "const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array";
 -specialize qw/vpx_sad16x32x4d msa/, "$sse2_x86inc";
 +specialize qw/vpx_sad16x32x4d msa sse2/;
  
  add_proto qw/void vpx_sad16x16x4d/, "const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array";
 -specialize qw/vpx_sad16x16x4d neon msa/, "$sse2_x86inc";
 +specialize qw/vpx_sad16x16x4d neon msa sse2/;
  
  add_proto qw/void vpx_sad16x8x4d/, "const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array";
 -specialize qw/vpx_sad16x8x4d msa/, "$sse2_x86inc";
 +specialize qw/vpx_sad16x8x4d msa sse2/;
  
  add_proto qw/void vpx_sad8x16x4d/, "const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array";
 -specialize qw/vpx_sad8x16x4d msa/, "$sse2_x86inc";
 +specialize qw/vpx_sad8x16x4d msa sse2/;
  
  add_proto qw/void vpx_sad8x8x4d/, "const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array";
 -specialize qw/vpx_sad8x8x4d msa/, "$sse2_x86inc";
 +specialize qw/vpx_sad8x8x4d msa sse2/;
  
  add_proto qw/void vpx_sad8x4x4d/, "const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array";
 -specialize qw/vpx_sad8x4x4d msa/, "$sse2_x86inc";
 +specialize qw/vpx_sad8x4x4d msa sse2/;
  
  add_proto qw/void vpx_sad4x8x4d/, "const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array";
 -specialize qw/vpx_sad4x8x4d msa/, "$sse2_x86inc";
 +specialize qw/vpx_sad4x8x4d msa sse2/;
  
  add_proto qw/void vpx_sad4x4x4d/, "const uint8_t *src_ptr, int src_stride, const uint8_t * const ref_ptr[], int ref_stride, uint32_t *sad_array";
 -specialize qw/vpx_sad4x4x4d msa/, "$sse2_x86inc";
 +specialize qw/vpx_sad4x4x4d msa sse2/;
  
+ add_proto qw/uint64_t vpx_sum_squares_2d_i16/, "const int16_t *src, int stride, int size";
+ specialize qw/vpx_sum_squares_2d_i16 sse2/;
+ 
  #
  # Structured Similarity (SSIM)
  #