diff options
| author | Jingning Han <jingning@google.com> | 2015-08-05 19:00:31 -0700 |
|---|---|---|
| committer | Jingning Han <jingning@google.com> | 2015-08-11 17:05:28 -0700 |
| commit | 3ee6db6c8110680c051fe7a4dca97bb27474ca00 (patch) | |
| tree | e05e37dfc10ed26a4fdaee5551b13e2d85a7a1b2 /vpx_dsp/vpx_dsp_rtcd_defs.pl | |
| parent | b04dad328c33874ae1eda72c73079519935a3feb (diff) | |
| download | libvpx-3ee6db6c8110680c051fe7a4dca97bb27474ca00.tar libvpx-3ee6db6c8110680c051fe7a4dca97bb27474ca00.tar.gz libvpx-3ee6db6c8110680c051fe7a4dca97bb27474ca00.tar.bz2 libvpx-3ee6db6c8110680c051fe7a4dca97bb27474ca00.zip | |
Fork VP9 and VP10 codebase
This commit folks the VP9 and VP10 codebase and makes libvpx
support VP8, VP9, and VP10.
Change-Id: I81782e0b809acb3c9844bee8c8ec8f4d5e8fa356
Diffstat (limited to 'vpx_dsp/vpx_dsp_rtcd_defs.pl')
| -rw-r--r-- | vpx_dsp/vpx_dsp_rtcd_defs.pl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vpx_dsp/vpx_dsp_rtcd_defs.pl b/vpx_dsp/vpx_dsp_rtcd_defs.pl index a9cc80cca..ae544eb64 100644 --- a/vpx_dsp/vpx_dsp_rtcd_defs.pl +++ b/vpx_dsp/vpx_dsp_rtcd_defs.pl @@ -54,7 +54,7 @@ if ($opts{arch} eq "x86_64") { # Intra prediction # -if (vpx_config("CONFIG_VP9") eq "yes") { +if ((vpx_config("CONFIG_VP9") eq "yes") || (vpx_config("CONFIG_VP10") eq "yes")) { add_proto qw/void vpx_d207_predictor_4x4/, "uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"; specialize qw/vpx_d207_predictor_4x4/, "$ssse3_x86inc"; @@ -369,7 +369,7 @@ if (vpx_config("CONFIG_VP9") eq "yes") { add_proto qw/void vpx_highbd_dc_128_predictor_32x32/, "uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd"; specialize qw/vpx_highbd_dc_128_predictor_32x32/; } # CONFIG_VP9_HIGHBITDEPTH -} # CONFIG_VP9 +} # CONFIG_VP9 || CONFIG_VP10 # # Sub Pixel Filters @@ -528,7 +528,7 @@ if (vpx_config("CONFIG_VP9_HIGHBITDEPTH") eq "yes") { # # Forward transform # -if (vpx_config("CONFIG_VP9_ENCODER") eq "yes") { +if ((vpx_config("CONFIG_VP9_ENCODER") eq "yes") || (vpx_config("CONFIG_VP10_ENCODER") eq "yes")) { if (vpx_config("CONFIG_VP9_HIGHBITDEPTH") eq "yes") { add_proto qw/void vpx_fdct4x4/, "const int16_t *input, tran_low_t *output, int stride"; specialize qw/vpx_fdct4x4 sse2/; @@ -608,11 +608,11 @@ if (vpx_config("CONFIG_VP9_HIGHBITDEPTH") eq "yes") { add_proto qw/void vpx_fdct32x32_1/, "const int16_t *input, tran_low_t *output, int stride"; specialize qw/vpx_fdct32x32_1 sse2 msa/; } # CONFIG_VP9_HIGHBITDEPTH -} # CONFIG_VP9_ENCODER +} # CONFIG_VP9_ENCODER || CONFIG_VP10_ENCODER # # Inverse transform -if (vpx_config("CONFIG_VP9") eq "yes") { +if ((vpx_config("CONFIG_VP9") eq "yes") || (vpx_config("CONFIG_VP10") eq "yes")) { if (vpx_config("CONFIG_VP9_HIGHBITDEPTH") eq "yes") { # Note as optimized versions of these functions are added we need to add a check to ensure # that when CONFIG_EMULATE_HARDWARE is on, it defaults to the C versions only. @@ -795,12 +795,12 @@ if (vpx_config("CONFIG_VP9_HIGHBITDEPTH") eq "yes") { specialize qw/vpx_iwht4x4_16_add msa/, "$sse2_x86inc"; } # CONFIG_EMULATE_HARDWARE } # CONFIG_VP9_HIGHBITDEPTH -} # CONFIG_VP9 +} # CONFIG_VP9 || CONFIG_VP10 # # Quantization # -if (vpx_config("CONFIG_VP9_ENCODER") eq "yes") { +if ((vpx_config("CONFIG_VP9_ENCODER") eq "yes") || (vpx_config("CONFIG_VP10_ENCODER") eq "yes")) { if (vpx_config("CONFIG_VP9_HIGHBITDEPTH") eq "yes") { add_proto qw/void vpx_quantize_b/, "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, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan"; specialize qw/vpx_quantize_b/; @@ -819,8 +819,8 @@ if (vpx_config("CONFIG_VP9_HIGHBITDEPTH") eq "yes") { add_proto qw/void vpx_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, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan"; specialize qw/vpx_quantize_b_32x32/, "$ssse3_x86_64_x86inc"; -} # CONFIG_VP9_ENCODER } # CONFIG_VP9_HIGHBITDEPTH +} # CONFIG_VP9_ENCODER || CONFIG_VP10_ENCODER if (vpx_config("CONFIG_ENCODERS") eq "yes") { # |