diff options
Diffstat (limited to 'vp8/common')
| -rw-r--r-- | vp8/common/generic/systemdependent.c | 2 | ||||
| -rw-r--r-- | vp8/common/postproc.c | 5 | ||||
| -rw-r--r-- | vp8/common/rtcd_defs.pl | 30 |
3 files changed, 3 insertions, 34 deletions
diff --git a/vp8/common/generic/systemdependent.c b/vp8/common/generic/systemdependent.c index 89abd41c0..28c981a60 100644 --- a/vp8/common/generic/systemdependent.c +++ b/vp8/common/generic/systemdependent.c @@ -83,8 +83,6 @@ static int get_cpu_count() { } #endif -void vp8_clear_system_state_c(){}; - void vp8_machine_specific_config(VP8_COMMON *ctx) { #if CONFIG_MULTITHREAD ctx->processor_core_count = get_cpu_count(); diff --git a/vp8/common/postproc.c b/vp8/common/postproc.c index 8b8c1701a..d67ee8a57 100644 --- a/vp8/common/postproc.c +++ b/vp8/common/postproc.c @@ -12,6 +12,7 @@ #include "vpx_dsp_rtcd.h" #include "vp8_rtcd.h" #include "vpx_dsp/postproc.h" +#include "vpx_ports/system_state.h" #include "vpx_scale_rtcd.h" #include "vpx_scale/yv12config.h" #include "postproc.h" @@ -321,7 +322,7 @@ int vp8_post_proc_frame(VP8_COMMON *oci, YV12_BUFFER_CONFIG *dest, } } - vp8_clear_system_state(); + vpx_clear_system_state(); if ((flags & VP8D_MFQE) && oci->postproc_state.last_frame_valid && oci->current_video_frame >= 2 && @@ -363,7 +364,7 @@ int vp8_post_proc_frame(VP8_COMMON *oci, YV12_BUFFER_CONFIG *dest, oci->postproc_state.last_noise != noise_level) { double sigma; struct postproc_state *ppstate = &oci->postproc_state; - vp8_clear_system_state(); + vpx_clear_system_state(); sigma = noise_level + .5 + .6 * q / 63.0; ppstate->clamp = vpx_setup_noise(sigma, ppstate->generated_noise, oci->Width + 256); diff --git a/vp8/common/rtcd_defs.pl b/vp8/common/rtcd_defs.pl index f49a0ef4b..ca10a1a1e 100644 --- a/vp8/common/rtcd_defs.pl +++ b/vp8/common/rtcd_defs.pl @@ -19,13 +19,6 @@ EOF forward_decls qw/vp8_common_forward_decls/; # -# system state -# -add_proto qw/void vp8_clear_system_state/, ""; -specialize qw/vp8_clear_system_state mmx/; -$vp8_clear_system_state_mmx=vpx_reset_mmx_state; - -# # Dequant # add_proto qw/void vp8_dequantize_b/, "struct blockd*, short *dqc"; @@ -33,34 +26,27 @@ specialize qw/vp8_dequantize_b mmx neon msa/; add_proto qw/void vp8_dequant_idct_add/, "short *input, short *dq, unsigned char *output, int stride"; specialize qw/vp8_dequant_idct_add mmx neon dspr2 msa/; -$vp8_dequant_idct_add_dspr2=vp8_dequant_idct_add_dspr2; add_proto qw/void vp8_dequant_idct_add_y_block/, "short *q, short *dq, unsigned char *dst, int stride, char *eobs"; specialize qw/vp8_dequant_idct_add_y_block mmx sse2 neon dspr2 msa/; -$vp8_dequant_idct_add_y_block_dspr2=vp8_dequant_idct_add_y_block_dspr2; add_proto qw/void vp8_dequant_idct_add_uv_block/, "short *q, short *dq, unsigned char *dst_u, unsigned char *dst_v, int stride, char *eobs"; specialize qw/vp8_dequant_idct_add_uv_block mmx sse2 neon dspr2 msa/; -$vp8_dequant_idct_add_y_block_dspr2=vp8_dequant_idct_add_y_block_dspr2; # # Loopfilter # add_proto qw/void vp8_loop_filter_mbv/, "unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi"; specialize qw/vp8_loop_filter_mbv mmx sse2 neon dspr2 msa/; -$vp8_loop_filter_mbv_dspr2=vp8_loop_filter_mbv_dspr2; add_proto qw/void vp8_loop_filter_bv/, "unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi"; specialize qw/vp8_loop_filter_bv mmx sse2 neon dspr2 msa/; -$vp8_loop_filter_bv_dspr2=vp8_loop_filter_bv_dspr2; add_proto qw/void vp8_loop_filter_mbh/, "unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi"; specialize qw/vp8_loop_filter_mbh mmx sse2 neon dspr2 msa/; -$vp8_loop_filter_mbh_dspr2=vp8_loop_filter_mbh_dspr2; add_proto qw/void vp8_loop_filter_bh/, "unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi"; specialize qw/vp8_loop_filter_bh mmx sse2 neon dspr2 msa/; -$vp8_loop_filter_bh_dspr2=vp8_loop_filter_bh_dspr2; add_proto qw/void vp8_loop_filter_simple_mbv/, "unsigned char *y, int ystride, const unsigned char *blimit"; @@ -101,38 +87,30 @@ $vp8_loop_filter_simple_bh_msa=vp8_loop_filter_bhs_msa; #idct16 add_proto qw/void vp8_short_idct4x4llm/, "short *input, unsigned char *pred, int pitch, unsigned char *dst, int dst_stride"; specialize qw/vp8_short_idct4x4llm mmx neon dspr2 msa/; -$vp8_short_idct4x4llm_dspr2=vp8_short_idct4x4llm_dspr2; #iwalsh1 add_proto qw/void vp8_short_inv_walsh4x4_1/, "short *input, short *output"; specialize qw/vp8_short_inv_walsh4x4_1 dspr2/; -$vp8_short_inv_walsh4x4_1_dspr2=vp8_short_inv_walsh4x4_1_dspr2; -# no asm yet #iwalsh16 add_proto qw/void vp8_short_inv_walsh4x4/, "short *input, short *output"; specialize qw/vp8_short_inv_walsh4x4 mmx sse2 neon dspr2 msa/; -$vp8_short_inv_walsh4x4_dspr2=vp8_short_inv_walsh4x4_dspr2; #idct1_scalar_add add_proto qw/void vp8_dc_only_idct_add/, "short input, unsigned char *pred, int pred_stride, unsigned char *dst, int dst_stride"; specialize qw/vp8_dc_only_idct_add mmx neon dspr2 msa/; -$vp8_dc_only_idct_add_dspr2=vp8_dc_only_idct_add_dspr2; # # RECON # add_proto qw/void vp8_copy_mem16x16/, "unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch"; specialize qw/vp8_copy_mem16x16 mmx sse2 neon dspr2 msa/; -$vp8_copy_mem16x16_dspr2=vp8_copy_mem16x16_dspr2; add_proto qw/void vp8_copy_mem8x8/, "unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch"; specialize qw/vp8_copy_mem8x8 mmx neon dspr2 msa/; -$vp8_copy_mem8x8_dspr2=vp8_copy_mem8x8_dspr2; add_proto qw/void vp8_copy_mem8x4/, "unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch"; specialize qw/vp8_copy_mem8x4 mmx neon dspr2 msa/; -$vp8_copy_mem8x4_dspr2=vp8_copy_mem8x4_dspr2; # # Postproc @@ -140,13 +118,10 @@ $vp8_copy_mem8x4_dspr2=vp8_copy_mem8x4_dspr2; if (vpx_config("CONFIG_POSTPROC") eq "yes") { add_proto qw/void vp8_blend_mb_inner/, "unsigned char *y, unsigned char *u, unsigned char *v, int y1, int u1, int v1, int alpha, int stride"; - # no asm yet add_proto qw/void vp8_blend_mb_outer/, "unsigned char *y, unsigned char *u, unsigned char *v, int y1, int u1, int v1, int alpha, int stride"; - # no asm yet add_proto qw/void vp8_blend_b/, "unsigned char *y, unsigned char *u, unsigned char *v, int y1, int u1, int v1, int alpha, int stride"; - # no asm yet add_proto qw/void vp8_filter_by_weight16x16/, "unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight"; specialize qw/vp8_filter_by_weight16x16 sse2 msa/; @@ -155,7 +130,6 @@ if (vpx_config("CONFIG_POSTPROC") eq "yes") { specialize qw/vp8_filter_by_weight8x8 sse2 msa/; add_proto qw/void vp8_filter_by_weight4x4/, "unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight"; - # no asm yet } # @@ -163,19 +137,15 @@ if (vpx_config("CONFIG_POSTPROC") eq "yes") { # add_proto qw/void vp8_sixtap_predict16x16/, "unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch"; specialize qw/vp8_sixtap_predict16x16 mmx sse2 ssse3 neon dspr2 msa/; -$vp8_sixtap_predict16x16_dspr2=vp8_sixtap_predict16x16_dspr2; add_proto qw/void vp8_sixtap_predict8x8/, "unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch"; specialize qw/vp8_sixtap_predict8x8 mmx sse2 ssse3 neon dspr2 msa/; -$vp8_sixtap_predict8x8_dspr2=vp8_sixtap_predict8x8_dspr2; add_proto qw/void vp8_sixtap_predict8x4/, "unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch"; specialize qw/vp8_sixtap_predict8x4 mmx sse2 ssse3 neon dspr2 msa/; -$vp8_sixtap_predict8x4_dspr2=vp8_sixtap_predict8x4_dspr2; add_proto qw/void vp8_sixtap_predict4x4/, "unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch"; specialize qw/vp8_sixtap_predict4x4 mmx ssse3 neon dspr2 msa/; -$vp8_sixtap_predict4x4_dspr2=vp8_sixtap_predict4x4_dspr2; add_proto qw/void vp8_bilinear_predict16x16/, "unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch"; specialize qw/vp8_bilinear_predict16x16 mmx sse2 ssse3 neon msa/; |