shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Adding const to vp9_quantize_b_{32x32,} parameters."

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

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

@@ -672,10 +672,10 @@

 prototype void vp9_subtract_block "int rows, int cols, int16_t *diff_ptr, ptrdiff_t diff_stride, const uint8_t *src_ptr, ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride"

 specialize vp9_subtract_block $sse2_x86inc

-prototype void vp9_quantize_b "int16_t *coeff_ptr, intptr_t n_coeffs, int skip_block, int16_t *zbin_ptr, int16_t *round_ptr, int16_t *quant_ptr, int16_t *quant_shift_ptr, int16_t *qcoeff_ptr, int16_t *dqcoeff_ptr, int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan"

+prototype void vp9_quantize_b "const int16_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, int16_t *qcoeff_ptr, int16_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan"

 specialize vp9_quantize_b $ssse3_x86_64

-prototype void vp9_quantize_b_32x32 "int16_t *coeff_ptr, intptr_t n_coeffs, int skip_block, int16_t *zbin_ptr, int16_t *round_ptr, int16_t *quant_ptr, int16_t *quant_shift_ptr, int16_t *qcoeff_ptr, int16_t *dqcoeff_ptr, int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan"

+prototype void vp9_quantize_b_32x32 "const int16_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, int16_t *qcoeff_ptr, int16_t *dqcoeff_ptr, const int16_t *dequant_ptr, int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan"

 specialize vp9_quantize_b_32x32 $ssse3_x86_64

 #

--- a/vp9/encoder/vp9_quantize.c

+++ b/vp9/encoder/vp9_quantize.c

@@ -22,12 +22,14 @@

 extern int enc_debug;

 #endif

-void vp9_quantize_b_c(int16_t *coeff_ptr, intptr_t n_coeffs, int skip_block,

-                      int16_t *zbin_ptr, int16_t *round_ptr, int16_t *quant_ptr,

-                      int16_t *quant_shift_ptr, int16_t *qcoeff_ptr,

-                      int16_t *dqcoeff_ptr, int16_t *dequant_ptr,

-                      int zbin_oq_value, uint16_t *eob_ptr, const int16_t *scan,

-                      const int16_t *iscan) {

+void vp9_quantize_b_c(const int16_t *coeff_ptr, intptr_t n_coeffs,

+                      int skip_block,

+                      const int16_t *zbin_ptr, const int16_t *round_ptr,

+                      const int16_t *quant_ptr, const int16_t *quant_shift_ptr,

+                      int16_t *qcoeff_ptr, int16_t *dqcoeff_ptr,

+                      const int16_t *dequant_ptr,

+                      int zbin_oq_value, uint16_t *eob_ptr,

+                      const int16_t *scan, const int16_t *iscan) {

   int i, rc, eob;

   int zbins[2], nzbins[2], zbin;

   int x, y, z, sz;

@@ -86,14 +88,15 @@

   *eob_ptr = eob + 1;

 }

-void vp9_quantize_b_32x32_c(int16_t *coeff_ptr, intptr_t n_coeffs,

+void vp9_quantize_b_32x32_c(const int16_t *coeff_ptr, intptr_t n_coeffs,

                             int skip_block,

-                            int16_t *zbin_ptr, int16_t *round_ptr,

-                            int16_t *quant_ptr, int16_t *quant_shift_ptr,

+                            const int16_t *zbin_ptr, const int16_t *round_ptr,

+                            const int16_t *quant_ptr,

+                            const int16_t *quant_shift_ptr,

                             int16_t *qcoeff_ptr, int16_t *dqcoeff_ptr,

-                            int16_t *dequant_ptr, int zbin_oq_value,

-                            uint16_t *eob_ptr, const int16_t *scan,

-                            const int16_t *iscan) {

+                            const int16_t *dequant_ptr,

+                            int zbin_oq_value, uint16_t *eob_ptr,

+                            const int16_t *scan, const int16_t *iscan) {

   int i, rc, eob;

   int zbins[2], nzbins[2];

   int x, y, z, sz;