shithub: libvpx

Info  •  Files  •  Log  •  Branches

a couple of minor fixes

fixed a function prototypes to prevent compiler warnings;
removed a function not in use;
un-capitialize "Refstride" to ref_stride

Change-Id: Ib4472b6084f357d96328c6a06e795b6813a9edba

--- a/vp9/common/vp9_idctllm.c

+++ b/vp9/common/vp9_idctllm.c

@@ -590,28 +590,6 @@

 }

 #endif

-void vp9_dc_only_idct_add_8x8_c(short input_dc,

-                                uint8_t *pred_ptr,

-                                uint8_t *dst_ptr,

-                                int pitch, int stride) {

-  int a1 = ((input_dc + 16) >> 5);

-  int r, c, b;

-  uint8_t *orig_pred = pred_ptr;

-  uint8_t *orig_dst = dst_ptr;

-  for (b = 0; b < 4; b++) {

-    for (r = 0; r < 4; r++) {

-      for (c = 0; c < 4; c++) {

-        dst_ptr[c] = clip_pixel(a1 + pred_ptr[c]);

-      }

-

-      dst_ptr += stride;

-      pred_ptr += pitch;

-    }

-    dst_ptr = orig_dst + (b + 1) % 2 * 4 + (b + 1) / 2 * 4 * stride;

-    pred_ptr = orig_pred + (b + 1) % 2 * 4 + (b + 1) / 2 * 4 * pitch;

-  }

-}

-

 #define W1 2841                 /* 2048*sqrt(2)*cos(1*pi/16) */

 #define W2 2676                 /* 2048*sqrt(2)*cos(2*pi/16) */

 #define W3 2408                 /* 2048*sqrt(2)*cos(3*pi/16) */

--- a/vp9/common/vp9_rtcd_defs.sh

+++ b/vp9/common/vp9_rtcd_defs.sh

@@ -263,7 +263,7 @@

 prototype unsigned int vp9_sad3x16 "const uint8_t *src_ptr, int  src_stride, const uint8_t *ref_ptr, int ref_stride"

 specialize vp9_sad3x16 sse2

-prototype unsigned int vp9_sub_pixel_variance16x2 "const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int Refstride, unsigned int *sse"

+prototype unsigned int vp9_sub_pixel_variance16x2 "const uint8_t *src_ptr, const int source_stride, const int xoffset, const int  yoffset, const uint8_t *ref_ptr, const int ref_stride, unsigned int *sse"

 specialize vp9_sub_pixel_variance16x2 sse2

 #

@@ -419,8 +419,6 @@

 # dct and add

-prototype void vp9_dc_only_idct_add_8x8 "int input_dc, uint8_t *pred_ptr, uint8_t *dst_ptr, int pitch, int stride"

-specialize vp9_dc_only_idct_add_8x8

 prototype void vp9_dc_only_idct_add "int input_dc, uint8_t *pred_ptr, uint8_t *dst_ptr, int pitch, int stride"

 specialize vp9_dc_only_idct_add

@@ -479,30 +477,30 @@

 vp9_variance4x4_sse2=vp9_variance4x4_wmt

 vp9_variance4x4_mmx=vp9_variance4x4_mmx

-prototype unsigned int vp9_sub_pixel_variance64x64 "const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int Refstride, unsigned int *sse"

+prototype unsigned int vp9_sub_pixel_variance64x64 "const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse"

 specialize vp9_sub_pixel_variance64x64

-prototype unsigned int vp9_sub_pixel_variance32x32 "const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int Refstride, unsigned int *sse"

+prototype unsigned int vp9_sub_pixel_variance32x32 "const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse"

 specialize vp9_sub_pixel_variance32x32

-prototype unsigned int vp9_sub_pixel_variance16x16 "const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int Refstride, unsigned int *sse"

+prototype unsigned int vp9_sub_pixel_variance16x16 "const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse"

 specialize vp9_sub_pixel_variance16x16 sse2 mmx ssse3

 vp9_sub_pixel_variance16x16_sse2=vp9_sub_pixel_variance16x16_wmt

-prototype unsigned int vp9_sub_pixel_variance8x16 "const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int Refstride, unsigned int *sse"

+prototype unsigned int vp9_sub_pixel_variance8x16 "const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse"

 specialize vp9_sub_pixel_variance8x16 sse2 mmx

 vp9_sub_pixel_variance8x16_sse2=vp9_sub_pixel_variance8x16_wmt

-prototype unsigned int vp9_sub_pixel_variance16x8 "const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int Refstride, unsigned int *sse"

+prototype unsigned int vp9_sub_pixel_variance16x8 "const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse"

 specialize vp9_sub_pixel_variance16x8 sse2 mmx ssse3

 vp9_sub_pixel_variance16x8_sse2=vp9_sub_pixel_variance16x8_ssse3;

 vp9_sub_pixel_variance16x8_sse2=vp9_sub_pixel_variance16x8_wmt

-prototype unsigned int vp9_sub_pixel_variance8x8 "const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int Refstride, unsigned int *sse"

+prototype unsigned int vp9_sub_pixel_variance8x8 "const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse"

 specialize vp9_sub_pixel_variance8x8 sse2 mmx

 vp9_sub_pixel_variance8x8_sse2=vp9_sub_pixel_variance8x8_wmt

-prototype unsigned int vp9_sub_pixel_variance4x4 "const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int Refstride, unsigned int *sse"

+prototype unsigned int vp9_sub_pixel_variance4x4 "const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse"

 specialize vp9_sub_pixel_variance4x4 sse2 mmx

 vp9_sub_pixel_variance4x4_sse2=vp9_sub_pixel_variance4x4_wmt

@@ -643,10 +641,10 @@

 specialize vp9_mse16x16 mmx sse2

 vp9_mse16x16_sse2=vp9_mse16x16_wmt

-prototype unsigned int vp9_sub_pixel_mse64x64 "const uint8_t *src_ptr, int  source_stride, int  xoffset, int  yoffset, const uint8_t *ref_ptr, int Refstride, unsigned int *sse"

+prototype unsigned int vp9_sub_pixel_mse64x64 "const uint8_t *src_ptr, int  source_stride, int  xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse"

 specialize vp9_sub_pixel_mse64x64

-prototype unsigned int vp9_sub_pixel_mse32x32 "const uint8_t *src_ptr, int  source_stride, int  xoffset, int  yoffset, const uint8_t *ref_ptr, int Refstride, unsigned int *sse"

+prototype unsigned int vp9_sub_pixel_mse32x32 "const uint8_t *src_ptr, int  source_stride, int  xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse"

 specialize vp9_sub_pixel_mse32x32

 prototype unsigned int vp9_get_mb_ss "const int16_t *"