summaryrefslogtreecommitdiff
path: root/vp8/encoder
diff options
context:
space:
mode:
Diffstat (limited to 'vp8/encoder')
-rw-r--r--vp8/encoder/arm/arm_csystemdependent.c12
-rw-r--r--vp8/encoder/arm/dct_arm.c4
-rw-r--r--vp8/encoder/arm/dct_arm.h8
-rw-r--r--vp8/encoder/arm/encodemb_arm.h8
-rw-r--r--vp8/encoder/arm/quantize_arm.c4
-rw-r--r--vp8/encoder/arm/quantize_arm.h8
-rw-r--r--vp8/encoder/arm/variance_arm.c6
-rw-r--r--vp8/encoder/arm/variance_arm.h10
-rw-r--r--vp8/encoder/asm_enc_offsets.c2
-rw-r--r--vp8/encoder/bitstream.h2
-rw-r--r--vp8/encoder/onyx_if.c18
11 files changed, 41 insertions, 41 deletions
diff --git a/vp8/encoder/arm/arm_csystemdependent.c b/vp8/encoder/arm/arm_csystemdependent.c
index 918d7d9ae..c016bf008 100644
--- a/vp8/encoder/arm/arm_csystemdependent.c
+++ b/vp8/encoder/arm/arm_csystemdependent.c
@@ -23,13 +23,13 @@ void vp8_arch_arm_encoder_init(VP8_COMP *cpi)
#if CONFIG_RUNTIME_CPU_DETECT
int flags = cpi->common.rtcd.flags;
-#if HAVE_ARMV5TE
+#if HAVE_EDSP
if (flags & HAS_EDSP)
{
}
#endif
-#if HAVE_ARMV6
+#if HAVE_MEDIA
if (flags & HAS_MEDIA)
{
cpi->rtcd.variance.sad16x16 = vp8_sad16x16_armv6;
@@ -74,9 +74,9 @@ void vp8_arch_arm_encoder_init(VP8_COMP *cpi)
/*cpi->rtcd.quantize.quantb = vp8_regular_quantize_b;*/
cpi->rtcd.quantize.fastquantb = vp8_fast_quantize_b_armv6;
}
-#endif
+#endif /* HAVE_MEDIA */
-#if HAVE_ARMV7
+#if HAVE_NEON
if (flags & HAS_NEON)
{
cpi->rtcd.variance.sad16x16 = vp8_sad16x16_neon;
@@ -123,10 +123,10 @@ void vp8_arch_arm_encoder_init(VP8_COMP *cpi)
cpi->rtcd.quantize.fastquantb = vp8_fast_quantize_b_neon;
cpi->rtcd.quantize.fastquantb_pair = vp8_fast_quantize_b_pair_neon;
}
-#endif /* HAVE_ARMV7 */
+#endif /* HAVE_NEON */
#endif /* CONFIG_RUNTIME_CPU_DETECT */
-#if HAVE_ARMV7
+#if HAVE_NEON
#if CONFIG_RUNTIME_CPU_DETECT
if (flags & HAS_NEON)
#endif
diff --git a/vp8/encoder/arm/dct_arm.c b/vp8/encoder/arm/dct_arm.c
index 2692acb49..91e2f6d90 100644
--- a/vp8/encoder/arm/dct_arm.c
+++ b/vp8/encoder/arm/dct_arm.c
@@ -11,7 +11,7 @@
#include "vpx_config.h"
#include "vp8/encoder/dct.h"
-#if HAVE_ARMV6
+#if HAVE_MEDIA
void vp8_short_fdct8x4_armv6(short *input, short *output, int pitch)
{
@@ -19,4 +19,4 @@ void vp8_short_fdct8x4_armv6(short *input, short *output, int pitch)
vp8_short_fdct4x4_armv6(input + 4, output + 16, pitch);
}
-#endif /* HAVE_ARMV6 */
+#endif /* HAVE_MEDIA */
diff --git a/vp8/encoder/arm/dct_arm.h b/vp8/encoder/arm/dct_arm.h
index db553c4e0..445f8e14e 100644
--- a/vp8/encoder/arm/dct_arm.h
+++ b/vp8/encoder/arm/dct_arm.h
@@ -12,7 +12,7 @@
#ifndef DCT_ARM_H
#define DCT_ARM_H
-#if HAVE_ARMV6
+#if HAVE_MEDIA
extern prototype_fdct(vp8_short_walsh4x4_armv6);
extern prototype_fdct(vp8_short_fdct4x4_armv6);
extern prototype_fdct(vp8_short_fdct8x4_armv6);
@@ -34,9 +34,9 @@ extern prototype_fdct(vp8_short_fdct8x4_armv6);
#define vp8_fdct_fast8x4 vp8_short_fdct8x4_armv6
#endif
-#endif /* HAVE_ARMV6 */
+#endif /* HAVE_MEDIA */
-#if HAVE_ARMV7
+#if HAVE_NEON
extern prototype_fdct(vp8_short_fdct4x4_neon);
extern prototype_fdct(vp8_short_fdct8x4_neon);
extern prototype_fdct(vp8_fast_fdct4x4_neon);
@@ -60,6 +60,6 @@ extern prototype_fdct(vp8_short_walsh4x4_neon);
#define vp8_fdct_walsh_short4x4 vp8_short_walsh4x4_neon
#endif
-#endif
+#endif /* HAVE_NEON */
#endif
diff --git a/vp8/encoder/arm/encodemb_arm.h b/vp8/encoder/arm/encodemb_arm.h
index bf417fe1d..55ffdb32e 100644
--- a/vp8/encoder/arm/encodemb_arm.h
+++ b/vp8/encoder/arm/encodemb_arm.h
@@ -12,7 +12,7 @@
#ifndef ENCODEMB_ARM_H
#define ENCODEMB_ARM_H
-#if HAVE_ARMV6
+#if HAVE_MEDIA
extern prototype_subb(vp8_subtract_b_armv6);
extern prototype_submby(vp8_subtract_mby_armv6);
extern prototype_submbuv(vp8_subtract_mbuv_armv6);
@@ -28,9 +28,9 @@ extern prototype_submbuv(vp8_subtract_mbuv_armv6);
#define vp8_encodemb_submbuv vp8_subtract_mbuv_armv6
#endif
-#endif /* HAVE_ARMV6 */
+#endif /* HAVE_MEDIA */
-#if HAVE_ARMV7
+#if HAVE_NEON
//extern prototype_berr(vp8_block_error_c);
//extern prototype_mberr(vp8_mbblock_error_c);
//extern prototype_mbuverr(vp8_mbuverror_c);
@@ -59,6 +59,6 @@ extern prototype_submbuv(vp8_subtract_mbuv_neon);
#define vp8_encodemb_submbuv vp8_subtract_mbuv_neon
#endif
-#endif
+#endif /* HAVE_NEON */
#endif
diff --git a/vp8/encoder/arm/quantize_arm.c b/vp8/encoder/arm/quantize_arm.c
index 5b3a0275f..6f3f70a0a 100644
--- a/vp8/encoder/arm/quantize_arm.c
+++ b/vp8/encoder/arm/quantize_arm.c
@@ -16,7 +16,7 @@
#include "vp8/common/entropy.h"
-#if HAVE_ARMV7
+#if HAVE_NEON
/* vp8_quantize_mbX functions here differs from corresponding ones in
* quantize.c only by using quantize_b_pair function pointer instead of
@@ -59,4 +59,4 @@ void vp8_quantize_mbuv_neon(MACROBLOCK *x)
&x->e_mbd.block[i], &x->e_mbd.block[i+1]);
}
-#endif /* HAVE_ARMV7 */
+#endif /* HAVE_NEON */
diff --git a/vp8/encoder/arm/quantize_arm.h b/vp8/encoder/arm/quantize_arm.h
index 7d2088d2d..ef6517bd8 100644
--- a/vp8/encoder/arm/quantize_arm.h
+++ b/vp8/encoder/arm/quantize_arm.h
@@ -12,7 +12,7 @@
#ifndef QUANTIZE_ARM_H
#define QUANTIZE_ARM_H
-#if HAVE_ARMV6
+#if HAVE_MEDIA
extern prototype_quantize_block(vp8_fast_quantize_b_armv6);
@@ -21,10 +21,10 @@ extern prototype_quantize_block(vp8_fast_quantize_b_armv6);
#define vp8_quantize_fastquantb vp8_fast_quantize_b_armv6
#endif
-#endif /* HAVE_ARMV6 */
+#endif /* HAVE_MEDIA */
-#if HAVE_ARMV7
+#if HAVE_NEON
extern prototype_quantize_block(vp8_fast_quantize_b_neon);
extern prototype_quantize_block_pair(vp8_fast_quantize_b_pair_neon);
@@ -46,7 +46,7 @@ extern prototype_quantize_block_pair(vp8_fast_quantize_b_pair_neon);
#define vp8_quantize_mby vp8_quantize_mby_neon
#endif
-#endif /* HAVE_ARMV7 */
+#endif /* HAVE_NEON */
#endif
diff --git a/vp8/encoder/arm/variance_arm.c b/vp8/encoder/arm/variance_arm.c
index 7fc7473ac..5faa1048e 100644
--- a/vp8/encoder/arm/variance_arm.c
+++ b/vp8/encoder/arm/variance_arm.c
@@ -12,7 +12,7 @@
#include "vp8/encoder/variance.h"
#include "vp8/common/filter.h"
-#if HAVE_ARMV6
+#if HAVE_MEDIA
#include "vp8/common/arm/bilinearfilter_arm.h"
unsigned int vp8_sub_pixel_variance8x8_armv6
@@ -91,10 +91,10 @@ unsigned int vp8_sub_pixel_variance16x16_armv6
return var;
}
-#endif /* HAVE_ARMV6 */
+#endif /* HAVE_MEDIA */
-#if HAVE_ARMV7
+#if HAVE_NEON
unsigned int vp8_sub_pixel_variance16x16_neon
(
diff --git a/vp8/encoder/arm/variance_arm.h b/vp8/encoder/arm/variance_arm.h
index f2f761f9e..99eb26b28 100644
--- a/vp8/encoder/arm/variance_arm.h
+++ b/vp8/encoder/arm/variance_arm.h
@@ -12,7 +12,7 @@
#ifndef VARIANCE_ARM_H
#define VARIANCE_ARM_H
-#if HAVE_ARMV6
+#if HAVE_MEDIA
extern prototype_sad(vp8_sad16x16_armv6);
extern prototype_variance(vp8_variance16x16_armv6);
@@ -55,10 +55,10 @@ extern prototype_variance(vp8_mse16x16_armv6);
#endif /* !CONFIG_RUNTIME_CPU_DETECT */
-#endif /* HAVE_ARMV6 */
+#endif /* HAVE_MEDIA */
-#if HAVE_ARMV7
+#if HAVE_NEON
extern prototype_sad(vp8_sad4x4_neon);
extern prototype_sad(vp8_sad8x8_neon);
extern prototype_sad(vp8_sad8x16_neon);
@@ -148,8 +148,8 @@ extern prototype_get16x16prederror(vp8_get4x4sse_cs_neon);
#undef vp8_variance_get4x4sse_cs
#define vp8_variance_get4x4sse_cs vp8_get4x4sse_cs_neon
-#endif
+#endif /* !CONFIG_RUNTIME_CPU_DETECT */
-#endif
+#endif /* HAVE_NEON */
#endif
diff --git a/vp8/encoder/asm_enc_offsets.c b/vp8/encoder/asm_enc_offsets.c
index 2e9ca7232..09ee6fbec 100644
--- a/vp8/encoder/asm_enc_offsets.c
+++ b/vp8/encoder/asm_enc_offsets.c
@@ -88,7 +88,7 @@ END
* change they will have to be adjusted.
*/
-#if HAVE_ARMV5TE
+#if HAVE_EDSP
ct_assert(TOKENEXTRA_SZ, sizeof(TOKENEXTRA) == 8)
ct_assert(vp8_extra_bit_struct_sz, sizeof(vp8_extra_bit_struct) == 16)
#endif
diff --git a/vp8/encoder/bitstream.h b/vp8/encoder/bitstream.h
index 9007cede0..736b9d494 100644
--- a/vp8/encoder/bitstream.h
+++ b/vp8/encoder/bitstream.h
@@ -12,7 +12,7 @@
#ifndef __INC_BITSTREAM_H
#define __INC_BITSTREAM_H
-#if HAVE_ARMV5TE
+#if HAVE_EDSP
void vp8cx_pack_tokens_armv5(vp8_writer *w, const TOKENEXTRA *p, int xcount,
vp8_token *,
vp8_extra_bit_struct *,
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index bb2a7963a..9dcf71dfc 100644
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -63,7 +63,7 @@ extern unsigned int vp8_get_processor_freq();
extern void print_tree_update_probs();
extern void vp8cx_create_encoder_threads(VP8_COMP *cpi);
extern void vp8cx_remove_encoder_threads(VP8_COMP *cpi);
-#if HAVE_ARMV7
+#if HAVE_NEON
extern void vp8_yv12_copy_frame_func_neon(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc);
extern void vp8_yv12_copy_src_frame_func_neon(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc);
#endif
@@ -4556,7 +4556,7 @@ static void Pass2Encode(VP8_COMP *cpi, unsigned long *size, unsigned char *dest,
#endif
//For ARM NEON, d8-d15 are callee-saved registers, and need to be saved by us.
-#if HAVE_ARMV7
+#if HAVE_NEON
extern void vp8_push_neon(int64_t *store);
extern void vp8_pop_neon(int64_t *store);
#endif
@@ -4564,14 +4564,14 @@ extern void vp8_pop_neon(int64_t *store);
int vp8_receive_raw_frame(VP8_COMP *cpi, unsigned int frame_flags, YV12_BUFFER_CONFIG *sd, int64_t time_stamp, int64_t end_time)
{
-#if HAVE_ARMV7
+#if HAVE_NEON
int64_t store_reg[8];
#endif
VP8_COMMON *cm = &cpi->common;
struct vpx_usec_timer timer;
int res = 0;
-#if HAVE_ARMV7
+#if HAVE_NEON
#if CONFIG_RUNTIME_CPU_DETECT
if (cm->rtcd.flags & HAS_NEON)
#endif
@@ -4588,7 +4588,7 @@ int vp8_receive_raw_frame(VP8_COMP *cpi, unsigned int frame_flags, YV12_BUFFER_C
vpx_usec_timer_mark(&timer);
cpi->time_receive_data += vpx_usec_timer_elapsed(&timer);
-#if HAVE_ARMV7
+#if HAVE_NEON
#if CONFIG_RUNTIME_CPU_DETECT
if (cm->rtcd.flags & HAS_NEON)
#endif
@@ -4617,7 +4617,7 @@ static int frame_is_reference(const VP8_COMP *cpi)
int vp8_get_compressed_data(VP8_COMP *cpi, unsigned int *frame_flags, unsigned long *size, unsigned char *dest, unsigned char *dest_end, int64_t *time_stamp, int64_t *time_end, int flush)
{
-#if HAVE_ARMV7
+#if HAVE_NEON
int64_t store_reg[8];
#endif
VP8_COMMON *cm;
@@ -4639,7 +4639,7 @@ int vp8_get_compressed_data(VP8_COMP *cpi, unsigned int *frame_flags, unsigned l
cpi->common.error.setjmp = 1;
-#if HAVE_ARMV7
+#if HAVE_NEON
#if CONFIG_RUNTIME_CPU_DETECT
if (cm->rtcd.flags & HAS_NEON)
#endif
@@ -4714,7 +4714,7 @@ int vp8_get_compressed_data(VP8_COMP *cpi, unsigned int *frame_flags, unsigned l
#endif
-#if HAVE_ARMV7
+#if HAVE_NEON
#if CONFIG_RUNTIME_CPU_DETECT
if (cm->rtcd.flags & HAS_NEON)
#endif
@@ -5103,7 +5103,7 @@ int vp8_get_compressed_data(VP8_COMP *cpi, unsigned int *frame_flags, unsigned l
#endif
#endif
-#if HAVE_ARMV7
+#if HAVE_NEON
#if CONFIG_RUNTIME_CPU_DETECT
if (cm->rtcd.flags & HAS_NEON)
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-12 11:21:50 +0000