diff options
| author | Johann <johannkoenig@google.com> | 2011-03-11 10:23:48 -0800 |
|---|---|---|
| committer | Code Review <code-review@webmproject.org> | 2011-03-11 10:23:48 -0800 |
| commit | 3788b3564c587983a10d7131b35c0d9c39540666 (patch) | |
| tree | e565cf4f8e5adfec0c9a631410d1c49ad3f29537 /vp8/common/arm/arm_systemdependent.c | |
| parent | 5c60a646f3faa6c2cb3c55c971803a43657a9a1b (diff) | |
| parent | 27972d2c1d53a0ff831c1f05d40a3720cf45aec7 (diff) | |
| download | libvpx-3788b3564c587983a10d7131b35c0d9c39540666.tar libvpx-3788b3564c587983a10d7131b35c0d9c39540666.tar.gz libvpx-3788b3564c587983a10d7131b35c0d9c39540666.tar.bz2 libvpx-3788b3564c587983a10d7131b35c0d9c39540666.zip | |
Merge "Move build_intra_predictors_mby to RTCD framework"
Diffstat (limited to 'vp8/common/arm/arm_systemdependent.c')
| -rw-r--r-- | vp8/common/arm/arm_systemdependent.c | 35 |
1 files changed, 4 insertions, 31 deletions
diff --git a/vp8/common/arm/arm_systemdependent.c b/vp8/common/arm/arm_systemdependent.c index 69e1bdff4..bd5c0759d 100644 --- a/vp8/common/arm/arm_systemdependent.c +++ b/vp8/common/arm/arm_systemdependent.c @@ -19,14 +19,6 @@ #include "vp8/common/idct.h" #include "vp8/common/onyxc_int.h" -extern void (*vp8_build_intra_predictors_mby_ptr)(MACROBLOCKD *x); -extern void vp8_build_intra_predictors_mby(MACROBLOCKD *x); -extern void vp8_build_intra_predictors_mby_neon(MACROBLOCKD *x); - -extern void (*vp8_build_intra_predictors_mby_s_ptr)(MACROBLOCKD *x); -extern void vp8_build_intra_predictors_mby_s(MACROBLOCKD *x); -extern void vp8_build_intra_predictors_mby_s_neon(MACROBLOCKD *x); - void vp8_arch_arm_common_init(VP8_COMMON *ctx) { #if CONFIG_RUNTIME_CPU_DETECT @@ -106,31 +98,12 @@ void vp8_arch_arm_common_init(VP8_COMMON *ctx) rtcd->recon.recon2 = vp8_recon2b_neon; rtcd->recon.recon4 = vp8_recon4b_neon; rtcd->recon.recon_mb = vp8_recon_mb_neon; - + rtcd->recon.build_intra_predictors_mby = + vp8_build_intra_predictors_mby_neon; + rtcd->recon.build_intra_predictors_mby_s = + vp8_build_intra_predictors_mby_s_neon; } #endif #endif - -#if HAVE_ARMV6 -#if CONFIG_RUNTIME_CPU_DETECT - if (has_media) -#endif - { - vp8_build_intra_predictors_mby_ptr = vp8_build_intra_predictors_mby; - vp8_build_intra_predictors_mby_s_ptr = vp8_build_intra_predictors_mby_s; - } -#endif - -#if HAVE_ARMV7 -#if CONFIG_RUNTIME_CPU_DETECT - if (has_neon) -#endif - { - vp8_build_intra_predictors_mby_ptr = - vp8_build_intra_predictors_mby_neon; - vp8_build_intra_predictors_mby_s_ptr = - vp8_build_intra_predictors_mby_s_neon; - } -#endif } |