Commit 6611f669 authored by Johann's avatar Johann
Browse files

clean up warnings when building arm with rtcd

Change-Id: I3683cb87e9cb7c36fc22c1d70f0799c7c46a21df
parent f3a13cb2
...@@ -24,14 +24,17 @@ void vp8_arch_arm_common_init(VP8_COMMON *ctx) ...@@ -24,14 +24,17 @@ void vp8_arch_arm_common_init(VP8_COMMON *ctx)
#if CONFIG_RUNTIME_CPU_DETECT #if CONFIG_RUNTIME_CPU_DETECT
VP8_COMMON_RTCD *rtcd = &ctx->rtcd; VP8_COMMON_RTCD *rtcd = &ctx->rtcd;
int flags = arm_cpu_caps(); int flags = arm_cpu_caps();
int has_edsp = flags & HAS_EDSP;
int has_media = flags & HAS_MEDIA;
int has_neon = flags & HAS_NEON;
rtcd->flags = flags; rtcd->flags = flags;
/* Override default functions with fastest ones for this CPU. */ /* Override default functions with fastest ones for this CPU. */
#if HAVE_ARMV5TE
if (flags & HAS_EDSP)
{
}
#endif
#if HAVE_ARMV6 #if HAVE_ARMV6
if (has_media) if (flags & HAS_MEDIA)
{ {
rtcd->subpix.sixtap16x16 = vp8_sixtap_predict16x16_armv6; rtcd->subpix.sixtap16x16 = vp8_sixtap_predict16x16_armv6;
rtcd->subpix.sixtap8x8 = vp8_sixtap_predict8x8_armv6; rtcd->subpix.sixtap8x8 = vp8_sixtap_predict8x8_armv6;
...@@ -66,7 +69,7 @@ void vp8_arch_arm_common_init(VP8_COMMON *ctx) ...@@ -66,7 +69,7 @@ void vp8_arch_arm_common_init(VP8_COMMON *ctx)
#endif #endif
#if HAVE_ARMV7 #if HAVE_ARMV7
if (has_neon) if (flags & HAS_NEON)
{ {
rtcd->subpix.sixtap16x16 = vp8_sixtap_predict16x16_neon; rtcd->subpix.sixtap16x16 = vp8_sixtap_predict16x16_neon;
rtcd->subpix.sixtap8x8 = vp8_sixtap_predict8x8_neon; rtcd->subpix.sixtap8x8 = vp8_sixtap_predict8x8_neon;
......
...@@ -21,12 +21,15 @@ void vp8_arch_arm_decode_init(VP8D_COMP *pbi) ...@@ -21,12 +21,15 @@ void vp8_arch_arm_decode_init(VP8D_COMP *pbi)
{ {
#if CONFIG_RUNTIME_CPU_DETECT #if CONFIG_RUNTIME_CPU_DETECT
int flags = pbi->common.rtcd.flags; int flags = pbi->common.rtcd.flags;
int has_edsp = flags & HAS_EDSP;
int has_media = flags & HAS_MEDIA; #if HAVE_ARMV5TE
int has_neon = flags & HAS_NEON; if (flags & HAS_EDSP)
{
}
#endif
#if HAVE_ARMV6 #if HAVE_ARMV6
if (has_media) if (flags & HAS_MEDIA)
{ {
pbi->dequant.block = vp8_dequantize_b_v6; pbi->dequant.block = vp8_dequantize_b_v6;
pbi->dequant.idct_add = vp8_dequant_idct_add_v6; pbi->dequant.idct_add = vp8_dequant_idct_add_v6;
...@@ -38,7 +41,7 @@ void vp8_arch_arm_decode_init(VP8D_COMP *pbi) ...@@ -38,7 +41,7 @@ void vp8_arch_arm_decode_init(VP8D_COMP *pbi)
#endif #endif
#if HAVE_ARMV7 #if HAVE_ARMV7
if (has_neon) if (flags & HAS_NEON)
{ {
pbi->dequant.block = vp8_dequantize_b_neon; pbi->dequant.block = vp8_dequantize_b_neon;
pbi->dequant.idct_add = vp8_dequant_idct_add_neon; pbi->dequant.idct_add = vp8_dequant_idct_add_neon;
......
...@@ -22,12 +22,15 @@ void vp8_arch_arm_encoder_init(VP8_COMP *cpi) ...@@ -22,12 +22,15 @@ void vp8_arch_arm_encoder_init(VP8_COMP *cpi)
{ {
#if CONFIG_RUNTIME_CPU_DETECT #if CONFIG_RUNTIME_CPU_DETECT
int flags = cpi->common.rtcd.flags; int flags = cpi->common.rtcd.flags;
int has_edsp = flags & HAS_EDSP;
int has_media = flags & HAS_MEDIA; #if HAVE_ARMV5TE
int has_neon = flags & HAS_NEON; if (flags & HAS_EDSP)
{
}
#endif
#if HAVE_ARMV6 #if HAVE_ARMV6
if (has_media) if (flags & HAS_MEDIA)
{ {
cpi->rtcd.variance.sad16x16 = vp8_sad16x16_armv6; cpi->rtcd.variance.sad16x16 = vp8_sad16x16_armv6;
/*cpi->rtcd.variance.sad16x8 = vp8_sad16x8_c; /*cpi->rtcd.variance.sad16x8 = vp8_sad16x8_c;
...@@ -74,7 +77,7 @@ void vp8_arch_arm_encoder_init(VP8_COMP *cpi) ...@@ -74,7 +77,7 @@ void vp8_arch_arm_encoder_init(VP8_COMP *cpi)
#endif #endif
#if HAVE_ARMV7 #if HAVE_ARMV7
if (has_neon) if (flags & HAS_NEON)
{ {
cpi->rtcd.variance.sad16x16 = vp8_sad16x16_neon; cpi->rtcd.variance.sad16x16 = vp8_sad16x16_neon;
cpi->rtcd.variance.sad16x8 = vp8_sad16x8_neon; cpi->rtcd.variance.sad16x8 = vp8_sad16x8_neon;
...@@ -124,7 +127,7 @@ void vp8_arch_arm_encoder_init(VP8_COMP *cpi) ...@@ -124,7 +127,7 @@ void vp8_arch_arm_encoder_init(VP8_COMP *cpi)
#if HAVE_ARMV7 #if HAVE_ARMV7
#if CONFIG_RUNTIME_CPU_DETECT #if CONFIG_RUNTIME_CPU_DETECT
if (has_neon) if (flags & HAS_NEON)
#endif #endif
{ {
vp8_yv12_copy_partial_frame_ptr = vpxyv12_copy_partial_frame_neon; vp8_yv12_copy_partial_frame_ptr = vpxyv12_copy_partial_frame_neon;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment