summaryrefslogtreecommitdiff
path: root/vp8/common
diff options
context:
space:
mode:
Diffstat (limited to 'vp8/common')
-rw-r--r--vp8/common/arm/arm_systemdependent.c6
-rw-r--r--vp8/common/arm/dequantize_arm.c8
-rw-r--r--vp8/common/arm/dequantize_arm.h4
-rw-r--r--vp8/common/arm/filter_arm.c2
-rw-r--r--vp8/common/arm/idct_arm.h4
-rw-r--r--vp8/common/arm/loopfilter_arm.c10
-rw-r--r--vp8/common/arm/loopfilter_arm.h8
-rw-r--r--vp8/common/arm/neon/save_reg_neon.asm (renamed from vp8/common/arm/neon/save_neon_reg.asm)0
-rw-r--r--vp8/common/arm/recon_arm.h4
-rw-r--r--vp8/common/arm/reconintra_arm.c5
-rw-r--r--vp8/common/arm/subpixel_arm.h4
-rw-r--r--vp8/common/asm_com_offsets.c4
12 files changed, 28 insertions, 31 deletions
diff --git a/vp8/common/arm/arm_systemdependent.c b/vp8/common/arm/arm_systemdependent.c
index 89a2be825..d16ff2bb2 100644
--- a/vp8/common/arm/arm_systemdependent.c
+++ b/vp8/common/arm/arm_systemdependent.c
@@ -26,13 +26,13 @@ void vp8_arch_arm_common_init(VP8_COMMON *ctx)
rtcd->flags = flags;
/* Override default functions with fastest ones for this CPU. */
-#if HAVE_ARMV5TE
+#if HAVE_EDSP
if (flags & HAS_EDSP)
{
}
#endif
-#if HAVE_ARMV6
+#if HAVE_MEDIA
if (flags & HAS_MEDIA)
{
rtcd->subpix.sixtap16x16 = vp8_sixtap_predict16x16_armv6;
@@ -71,7 +71,7 @@ void vp8_arch_arm_common_init(VP8_COMMON *ctx)
}
#endif
-#if HAVE_ARMV7
+#if HAVE_NEON
if (flags & HAS_NEON)
{
rtcd->subpix.sixtap16x16 = vp8_sixtap_predict16x16_neon;
diff --git a/vp8/common/arm/dequantize_arm.c b/vp8/common/arm/dequantize_arm.c
index 7cf4bf943..66a5dce26 100644
--- a/vp8/common/arm/dequantize_arm.c
+++ b/vp8/common/arm/dequantize_arm.c
@@ -13,15 +13,15 @@
#include "vp8/common/dequantize.h"
#include "vp8/common/idct.h"
-#if HAVE_ARMV7
+#if HAVE_NEON
extern void vp8_dequantize_b_loop_neon(short *Q, short *DQC, short *DQ);
#endif
-#if HAVE_ARMV6
+#if HAVE_MEDIA
extern void vp8_dequantize_b_loop_v6(short *Q, short *DQC, short *DQ);
#endif
-#if HAVE_ARMV7
+#if HAVE_NEON
void vp8_dequantize_b_neon(BLOCKD *d, short *DQC)
{
@@ -32,7 +32,7 @@ void vp8_dequantize_b_neon(BLOCKD *d, short *DQC)
}
#endif
-#if HAVE_ARMV6
+#if HAVE_MEDIA
void vp8_dequantize_b_v6(BLOCKD *d, short *DQC)
{
short *DQ = d->dqcoeff;
diff --git a/vp8/common/arm/dequantize_arm.h b/vp8/common/arm/dequantize_arm.h
index 0b4d8fe89..e330260bf 100644
--- a/vp8/common/arm/dequantize_arm.h
+++ b/vp8/common/arm/dequantize_arm.h
@@ -12,7 +12,7 @@
#ifndef DEQUANTIZE_ARM_H
#define DEQUANTIZE_ARM_H
-#if HAVE_ARMV6
+#if HAVE_MEDIA
extern prototype_dequant_block(vp8_dequantize_b_v6);
extern prototype_dequant_idct_add(vp8_dequant_idct_add_v6);
extern prototype_dequant_idct_add_y_block(vp8_dequant_idct_add_y_block_v6);
@@ -33,7 +33,7 @@ extern prototype_dequant_idct_add_uv_block(vp8_dequant_idct_add_uv_block_v6);
#endif
#endif
-#if HAVE_ARMV7
+#if HAVE_NEON
extern prototype_dequant_block(vp8_dequantize_b_neon);
extern prototype_dequant_idct_add(vp8_dequant_idct_add_neon);
extern prototype_dequant_idct_add_y_block(vp8_dequant_idct_add_y_block_neon);
diff --git a/vp8/common/arm/filter_arm.c b/vp8/common/arm/filter_arm.c
index 6d95eb8e3..55c8e7fe3 100644
--- a/vp8/common/arm/filter_arm.c
+++ b/vp8/common/arm/filter_arm.c
@@ -86,7 +86,7 @@ extern void vp8_filter_block2d_second_pass_only_armv6
const short *vp8_filter
);
-#if HAVE_ARMV6
+#if HAVE_MEDIA
void vp8_sixtap_predict_armv6
(
unsigned char *src_ptr,
diff --git a/vp8/common/arm/idct_arm.h b/vp8/common/arm/idct_arm.h
index 68c0cad11..63a5f3ecb 100644
--- a/vp8/common/arm/idct_arm.h
+++ b/vp8/common/arm/idct_arm.h
@@ -12,7 +12,7 @@
#ifndef IDCT_ARM_H
#define IDCT_ARM_H
-#if HAVE_ARMV6
+#if HAVE_MEDIA
extern prototype_idct(vp8_short_idct4x4llm_v6_dual);
extern prototype_idct_scalar_add(vp8_dc_only_idct_add_v6);
extern prototype_second_order(vp8_short_inv_walsh4x4_1_v6);
@@ -30,7 +30,7 @@ extern prototype_second_order(vp8_short_inv_walsh4x4_v6);
#endif
#endif
-#if HAVE_ARMV7
+#if HAVE_NEON
extern prototype_idct(vp8_short_idct4x4llm_neon);
extern prototype_idct_scalar_add(vp8_dc_only_idct_add_neon);
extern prototype_second_order(vp8_short_inv_walsh4x4_1_neon);
diff --git a/vp8/common/arm/loopfilter_arm.c b/vp8/common/arm/loopfilter_arm.c
index c841d455a..4e253e1aa 100644
--- a/vp8/common/arm/loopfilter_arm.c
+++ b/vp8/common/arm/loopfilter_arm.c
@@ -13,14 +13,14 @@
#include "vp8/common/loopfilter.h"
#include "vp8/common/onyxc_int.h"
-#if HAVE_ARMV6
+#if HAVE_MEDIA
extern prototype_loopfilter(vp8_loop_filter_horizontal_edge_armv6);
extern prototype_loopfilter(vp8_loop_filter_vertical_edge_armv6);
extern prototype_loopfilter(vp8_mbloop_filter_horizontal_edge_armv6);
extern prototype_loopfilter(vp8_mbloop_filter_vertical_edge_armv6);
#endif
-#if HAVE_ARMV7
+#if HAVE_NEON
typedef void loopfilter_y_neon(unsigned char *src, int pitch,
unsigned char blimit, unsigned char limit, unsigned char thresh);
typedef void loopfilter_uv_neon(unsigned char *u, int pitch,
@@ -38,8 +38,8 @@ extern loopfilter_uv_neon vp8_mbloop_filter_horizontal_edge_uv_neon;
extern loopfilter_uv_neon vp8_mbloop_filter_vertical_edge_uv_neon;
#endif
-#if HAVE_ARMV6
-/*ARMV6 loopfilter functions*/
+#if HAVE_MEDIA
+/* ARMV6/MEDIA loopfilter functions*/
/* Horizontal MB filtering */
void vp8_loop_filter_mbh_armv6(unsigned char *y_ptr, unsigned char *u_ptr, unsigned char *v_ptr,
int y_stride, int uv_stride, loop_filter_info *lfi)
@@ -113,7 +113,7 @@ void vp8_loop_filter_bvs_armv6(unsigned char *y_ptr, int y_stride,
}
#endif
-#if HAVE_ARMV7
+#if HAVE_NEON
/* NEON loopfilter functions */
/* Horizontal MB filtering */
void vp8_loop_filter_mbh_neon(unsigned char *y_ptr, unsigned char *u_ptr, unsigned char *v_ptr,
diff --git a/vp8/common/arm/loopfilter_arm.h b/vp8/common/arm/loopfilter_arm.h
index 390a547b0..28d454e89 100644
--- a/vp8/common/arm/loopfilter_arm.h
+++ b/vp8/common/arm/loopfilter_arm.h
@@ -14,7 +14,7 @@
#include "vpx_config.h"
-#if HAVE_ARMV6
+#if HAVE_MEDIA
extern prototype_loopfilter_block(vp8_loop_filter_mbv_armv6);
extern prototype_loopfilter_block(vp8_loop_filter_bv_armv6);
extern prototype_loopfilter_block(vp8_loop_filter_mbh_armv6);
@@ -50,9 +50,9 @@ extern prototype_simple_loopfilter(vp8_loop_filter_simple_vertical_edge_armv6);
#define vp8_lf_simple_b_h vp8_loop_filter_bhs_armv6
#endif /* !CONFIG_RUNTIME_CPU_DETECT */
-#endif /* HAVE_ARMV6 */
+#endif /* HAVE_MEDIA */
-#if HAVE_ARMV7
+#if HAVE_NEON
extern prototype_loopfilter_block(vp8_loop_filter_mbv_neon);
extern prototype_loopfilter_block(vp8_loop_filter_bv_neon);
extern prototype_loopfilter_block(vp8_loop_filter_mbh_neon);
@@ -88,6 +88,6 @@ extern prototype_simple_loopfilter(vp8_loop_filter_bhs_neon);
#define vp8_lf_simple_b_h vp8_loop_filter_bhs_neon
#endif /* !CONFIG_RUNTIME_CPU_DETECT */
-#endif /* HAVE_ARMV7 */
+#endif /* HAVE_NEON */
#endif /* LOOPFILTER_ARM_H */
diff --git a/vp8/common/arm/neon/save_neon_reg.asm b/vp8/common/arm/neon/save_reg_neon.asm
index fd7002e7a..fd7002e7a 100644
--- a/vp8/common/arm/neon/save_neon_reg.asm
+++ b/vp8/common/arm/neon/save_reg_neon.asm
diff --git a/vp8/common/arm/recon_arm.h b/vp8/common/arm/recon_arm.h
index f8ef56ac6..e2baa5b3a 100644
--- a/vp8/common/arm/recon_arm.h
+++ b/vp8/common/arm/recon_arm.h
@@ -12,7 +12,7 @@
#ifndef RECON_ARM_H
#define RECON_ARM_H
-#if HAVE_ARMV6
+#if HAVE_MEDIA
extern prototype_copy_block(vp8_copy_mem8x8_v6);
extern prototype_copy_block(vp8_copy_mem8x4_v6);
@@ -34,7 +34,7 @@ extern prototype_intra4x4_predict(vp8_intra4x4_predict_armv6);
#endif
#endif
-#if HAVE_ARMV7
+#if HAVE_NEON
extern prototype_copy_block(vp8_copy_mem8x8_neon);
extern prototype_copy_block(vp8_copy_mem8x4_neon);
diff --git a/vp8/common/arm/reconintra_arm.c b/vp8/common/arm/reconintra_arm.c
index cd82baf7c..c167d9298 100644
--- a/vp8/common/arm/reconintra_arm.c
+++ b/vp8/common/arm/reconintra_arm.c
@@ -15,7 +15,7 @@
#include "vpx_mem/vpx_mem.h"
#include "vp8/common/recon.h"
-#if HAVE_ARMV7
+#if HAVE_NEON
extern void vp8_build_intra_predictors_mby_neon_func(
unsigned char *y_buffer,
unsigned char *ypred_ptr,
@@ -35,10 +35,7 @@ void vp8_build_intra_predictors_mby_neon(MACROBLOCKD *x)
vp8_build_intra_predictors_mby_neon_func(y_buffer, ypred_ptr, y_stride, mode, Up, Left);
}
-#endif
-
-#if HAVE_ARMV7
extern void vp8_build_intra_predictors_mby_s_neon_func(
unsigned char *y_buffer,
unsigned char *ypred_ptr,
diff --git a/vp8/common/arm/subpixel_arm.h b/vp8/common/arm/subpixel_arm.h
index 6288538d0..dba372e36 100644
--- a/vp8/common/arm/subpixel_arm.h
+++ b/vp8/common/arm/subpixel_arm.h
@@ -12,7 +12,7 @@
#ifndef SUBPIXEL_ARM_H
#define SUBPIXEL_ARM_H
-#if HAVE_ARMV6
+#if HAVE_MEDIA
extern prototype_subpixel_predict(vp8_sixtap_predict16x16_armv6);
extern prototype_subpixel_predict(vp8_sixtap_predict8x8_armv6);
extern prototype_subpixel_predict(vp8_sixtap_predict8x4_armv6);
@@ -49,7 +49,7 @@ extern prototype_subpixel_predict(vp8_bilinear_predict4x4_armv6);
#endif
#endif
-#if HAVE_ARMV7
+#if HAVE_NEON
extern prototype_subpixel_predict(vp8_sixtap_predict16x16_neon);
extern prototype_subpixel_predict(vp8_sixtap_predict8x8_neon);
extern prototype_subpixel_predict(vp8_sixtap_predict8x4_neon);
diff --git a/vp8/common/asm_com_offsets.c b/vp8/common/asm_com_offsets.c
index 704a3f07f..5cf151980 100644
--- a/vp8/common/asm_com_offsets.c
+++ b/vp8/common/asm_com_offsets.c
@@ -35,7 +35,7 @@ END
/* add asserts for any offset that is not supported by assembly code */
/* add asserts for any size that is not supported by assembly code */
-#if HAVE_ARMV6
+#if HAVE_MEDIA
/* switch case in vp8_intra4x4_predict_armv6 is based on these enumerated values */
ct_assert(B_DC_PRED, B_DC_PRED == 0);
ct_assert(B_TM_PRED, B_TM_PRED == 1);
@@ -49,7 +49,7 @@ ct_assert(B_HD_PRED, B_HD_PRED == 8);
ct_assert(B_HU_PRED, B_HU_PRED == 9);
#endif
-#if HAVE_ARMV7
+#if HAVE_NEON
/* vp8_yv12_extend_frame_borders_neon makes several assumptions based on this */
ct_assert(VP8BORDERINPIXELS_VAL, VP8BORDERINPIXELS == 32)
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-12 11:20:27 +0000