diff options
Diffstat (limited to 'vp8/common')
-rw-r--r-- | vp8/common/arm/arm_systemdependent.c | 35 | ||||
-rw-r--r-- | vp8/common/arm/recon_arm.h | 10 | ||||
-rw-r--r-- | vp8/common/generic/systemdependent.c | 13 | ||||
-rw-r--r-- | vp8/common/recon.h | 19 | ||||
-rw-r--r-- | vp8/common/reconintra.h | 7 |
5 files changed, 37 insertions, 47 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 } diff --git a/vp8/common/arm/recon_arm.h b/vp8/common/arm/recon_arm.h index b46b7fc7d..377cb2a07 100644 --- a/vp8/common/arm/recon_arm.h +++ b/vp8/common/arm/recon_arm.h @@ -53,6 +53,9 @@ extern prototype_copy_block(vp8_copy_mem16x16_neon); extern prototype_recon_macroblock(vp8_recon_mb_neon); +extern prototype_build_intra_predictors(vp8_build_intra_predictors_mby_neon); +extern prototype_build_intra_predictors(vp8_build_intra_predictors_mby_s_neon); + #if !CONFIG_RUNTIME_CPU_DETECT #undef vp8_recon_recon #define vp8_recon_recon vp8_recon_b_neon @@ -74,6 +77,13 @@ extern prototype_recon_macroblock(vp8_recon_mb_neon); #undef vp8_recon_recon_mb #define vp8_recon_recon_mb vp8_recon_mb_neon + +#undef vp8_recon_build_intra_predictors_mby +#define vp8_recon_build_intra_predictors_mby vp8_build_intra_predictors_mby_neon + +#undef vp8_recon_build_intra_predictors_mby_s +#define vp8_recon_build_intra_predictors_mby_s vp8_build_intra_predictors_mby_s_neon + #endif #endif diff --git a/vp8/common/generic/systemdependent.c b/vp8/common/generic/systemdependent.c index c843d86fe..5c6464772 100644 --- a/vp8/common/generic/systemdependent.c +++ b/vp8/common/generic/systemdependent.c @@ -20,12 +20,6 @@ extern void vp8_arch_x86_common_init(VP8_COMMON *ctx); extern void vp8_arch_arm_common_init(VP8_COMMON *ctx); -void (*vp8_build_intra_predictors_mby_ptr)(MACROBLOCKD *x); -extern void vp8_build_intra_predictors_mby(MACROBLOCKD *x); - -void (*vp8_build_intra_predictors_mby_s_ptr)(MACROBLOCKD *x); -extern void vp8_build_intra_predictors_mby_s(MACROBLOCKD *x); - void vp8_machine_specific_config(VP8_COMMON *ctx) { #if CONFIG_RUNTIME_CPU_DETECT @@ -45,6 +39,10 @@ void vp8_machine_specific_config(VP8_COMMON *ctx) rtcd->recon.recon4 = vp8_recon4b_c; rtcd->recon.recon_mb = vp8_recon_mb_c; rtcd->recon.recon_mby = vp8_recon_mby_c; + rtcd->recon.build_intra_predictors_mby = + vp8_build_intra_predictors_mby; + rtcd->recon.build_intra_predictors_mby_s = + vp8_build_intra_predictors_mby_s; rtcd->subpix.sixtap16x16 = vp8_sixtap_predict16x16_c; rtcd->subpix.sixtap8x8 = vp8_sixtap_predict8x8_c; @@ -75,9 +73,6 @@ void vp8_machine_specific_config(VP8_COMMON *ctx) #endif #endif - /* Pure C: */ - vp8_build_intra_predictors_mby_ptr = vp8_build_intra_predictors_mby; - vp8_build_intra_predictors_mby_s_ptr = vp8_build_intra_predictors_mby_s; #if ARCH_X86 || ARCH_X86_64 vp8_arch_x86_common_init(ctx); diff --git a/vp8/common/recon.h b/vp8/common/recon.h index e7df90a71..e608f218c 100644 --- a/vp8/common/recon.h +++ b/vp8/common/recon.h @@ -23,6 +23,9 @@ #define prototype_recon_macroblock(sym) \ void sym(const struct vp8_recon_rtcd_vtable *rtcd, MACROBLOCKD *x) +#define prototype_build_intra_predictors(sym) \ + void sym(MACROBLOCKD *x) + struct vp8_recon_rtcd_vtable; #if ARCH_X86 || ARCH_X86_64 @@ -73,9 +76,23 @@ extern prototype_recon_macroblock(vp8_recon_recon_mb); #endif extern prototype_recon_macroblock(vp8_recon_recon_mby); +#ifndef vp8_recon_build_intra_predictors_mby +#define vp8_recon_build_intra_predictors_mby vp8_build_intra_predictors_mby +#endif +extern prototype_build_intra_predictors\ + (vp8_recon_build_intra_predictors_mby); + +#ifndef vp8_recon_build_intra_predictors_mby_s +#define vp8_recon_build_intra_predictors_mby_s vp8_build_intra_predictors_mby_s +#endif +extern prototype_build_intra_predictors\ + (vp8_recon_build_intra_predictors_mby_s); + + typedef prototype_copy_block((*vp8_copy_block_fn_t)); typedef prototype_recon_block((*vp8_recon_fn_t)); typedef prototype_recon_macroblock((*vp8_recon_mb_fn_t)); +typedef prototype_build_intra_predictors((*vp8_build_intra_pred_fn_t)); typedef struct vp8_recon_rtcd_vtable { vp8_copy_block_fn_t copy16x16; @@ -86,6 +103,8 @@ typedef struct vp8_recon_rtcd_vtable vp8_recon_fn_t recon4; vp8_recon_mb_fn_t recon_mb; vp8_recon_mb_fn_t recon_mby; + vp8_build_intra_pred_fn_t build_intra_predictors_mby_s; + vp8_build_intra_pred_fn_t build_intra_predictors_mby; } vp8_recon_rtcd_vtable_t; #if CONFIG_RUNTIME_CPU_DETECT diff --git a/vp8/common/reconintra.h b/vp8/common/reconintra.h index 988b43a77..4025a5307 100644 --- a/vp8/common/reconintra.h +++ b/vp8/common/reconintra.h @@ -14,13 +14,6 @@ extern void init_intra_left_above_pixels(MACROBLOCKD *x); -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); - extern void vp8_build_intra_predictors_mbuv(MACROBLOCKD *x); extern void vp8_build_intra_predictors_mbuv_s(MACROBLOCKD *x); |