shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Use the RTC optimizations when in high bitdepth mode."

--- a/vp9/common/vp9_rtcd_defs.pl

+++ b/vp9/common/vp9_rtcd_defs.pl

@@ -1158,9 +1158,6 @@

   specialize qw/vp9_denoiser_filter sse2/;

 }

-  add_proto qw/void vp9_fdct8x8_quant/, "const int16_t *input, int stride, tran_low_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, tran_low_t *qcoeff_ptr, tran_low_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 qw/vp9_fdct8x8_quant sse2 ssse3/;

-

 if (vpx_config("CONFIG_VP9_HIGHBITDEPTH") eq "yes") {

 # the transform coefficients are held in 32-bit

 # values, so the assembler code for  vp9_block_error can no longer be used.

@@ -1178,6 +1175,9 @@

   add_proto qw/void vp9_quantize_b_32x32/, "const tran_low_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, tran_low_t *qcoeff_ptr, tran_low_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 qw/vp9_quantize_b_32x32/;

+

+  add_proto qw/void vp9_fdct8x8_quant/, "const int16_t *input, int stride, tran_low_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, tran_low_t *qcoeff_ptr, tran_low_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 qw/vp9_fdct8x8_quant/;

 } else {

   add_proto qw/int64_t vp9_block_error/, "const tran_low_t *coeff, const tran_low_t *dqcoeff, intptr_t block_size, int64_t *ssz";

   specialize qw/vp9_block_error avx2/, "$sse2_x86inc";

@@ -1193,6 +1193,9 @@

   add_proto qw/void vp9_quantize_b_32x32/, "const tran_low_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, tran_low_t *qcoeff_ptr, tran_low_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 qw/vp9_quantize_b_32x32/, "$ssse3_x86_64";

+

+  add_proto qw/void vp9_fdct8x8_quant/, "const int16_t *input, int stride, tran_low_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, tran_low_t *qcoeff_ptr, tran_low_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 qw/vp9_fdct8x8_quant sse2 ssse3/;

 }

 #

--- a/vp9/encoder/vp9_encodemb.c

+++ b/vp9/encoder/vp9_encodemb.c

@@ -652,10 +652,6 @@

     return;

   }

-#if CONFIG_VP9_HIGHBITDEPTH

-  if (!x->skip_recode)

-    vp9_xform_quant(x, plane, block, plane_bsize, tx_size);

-#else

   if (!x->skip_recode) {

     if (x->quant_fp) {

       // Encoding process for rtc mode

@@ -687,7 +683,6 @@

       }

     }

   }

-#endif

   if (x->optimize && (!x->skip_recode || !x->skip_optimize)) {

     const int ctx = combine_entropy_contexts(*a, *l);