Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: source/config/linux/arm-neon-cpu-detect/vp8_rtcd.h

Issue 478033002: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « libvpx_srcs_x86_64.gypi ('k') | source/config/linux/arm-neon-cpu-detect/vp9_rtcd.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/config/linux/arm-neon-cpu-detect/vp8_rtcd.h
===================================================================
--- source/config/linux/arm-neon-cpu-detect/vp8_rtcd.h (revision 290053)
+++ source/config/linux/arm-neon-cpu-detect/vp8_rtcd.h (working copy)
@@ -148,7 +148,7 @@
void vp8_intra4x4_predict_c(unsigned char *Above, unsigned char *yleft, int left_stride, int b_mode, unsigned char *dst, int dst_stride, unsigned char top_left);
void vp8_intra4x4_predict_armv6(unsigned char *Above, unsigned char *yleft, int left_stride, int b_mode, unsigned char *dst, int dst_stride, unsigned char top_left);
-RTCD_EXTERN void (*vp8_intra4x4_predict)(unsigned char *Above, unsigned char *yleft, int left_stride, int b_mode, unsigned char *dst, int dst_stride, unsigned char top_left);
+#define vp8_intra4x4_predict vp8_intra4x4_predict_armv6
void vp8_loop_filter_bh_c(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
void vp8_loop_filter_bh_armv6(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
@@ -335,7 +335,7 @@
void vp8_sixtap_predict4x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
void vp8_sixtap_predict4x4_armv6(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-RTCD_EXTERN void (*vp8_sixtap_predict4x4)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+#define vp8_sixtap_predict4x4 vp8_sixtap_predict4x4_armv6
void vp8_sixtap_predict8x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
void vp8_sixtap_predict8x4_armv6(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
@@ -436,81 +436,57 @@
(void)flags;
- vp8_bilinear_predict16x16 = vp8_bilinear_predict16x16_c;
- if (flags & HAS_MEDIA) vp8_bilinear_predict16x16 = vp8_bilinear_predict16x16_armv6;
+ vp8_bilinear_predict16x16 = vp8_bilinear_predict16x16_armv6;
if (flags & HAS_NEON) vp8_bilinear_predict16x16 = vp8_bilinear_predict16x16_neon;
- vp8_bilinear_predict4x4 = vp8_bilinear_predict4x4_c;
- if (flags & HAS_MEDIA) vp8_bilinear_predict4x4 = vp8_bilinear_predict4x4_armv6;
+ vp8_bilinear_predict4x4 = vp8_bilinear_predict4x4_armv6;
if (flags & HAS_NEON) vp8_bilinear_predict4x4 = vp8_bilinear_predict4x4_neon;
- vp8_bilinear_predict8x4 = vp8_bilinear_predict8x4_c;
- if (flags & HAS_MEDIA) vp8_bilinear_predict8x4 = vp8_bilinear_predict8x4_armv6;
+ vp8_bilinear_predict8x4 = vp8_bilinear_predict8x4_armv6;
if (flags & HAS_NEON) vp8_bilinear_predict8x4 = vp8_bilinear_predict8x4_neon;
- vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_c;
- if (flags & HAS_MEDIA) vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_armv6;
+ vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_armv6;
if (flags & HAS_NEON) vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_neon;
- vp8_copy_mem16x16 = vp8_copy_mem16x16_c;
- if (flags & HAS_MEDIA) vp8_copy_mem16x16 = vp8_copy_mem16x16_v6;
+ vp8_copy_mem16x16 = vp8_copy_mem16x16_v6;
if (flags & HAS_NEON) vp8_copy_mem16x16 = vp8_copy_mem16x16_neon;
- vp8_copy_mem8x4 = vp8_copy_mem8x4_c;
- if (flags & HAS_MEDIA) vp8_copy_mem8x4 = vp8_copy_mem8x4_v6;
+ vp8_copy_mem8x4 = vp8_copy_mem8x4_v6;
if (flags & HAS_NEON) vp8_copy_mem8x4 = vp8_copy_mem8x4_neon;
- vp8_copy_mem8x8 = vp8_copy_mem8x8_c;
- if (flags & HAS_MEDIA) vp8_copy_mem8x8 = vp8_copy_mem8x8_v6;
+ vp8_copy_mem8x8 = vp8_copy_mem8x8_v6;
if (flags & HAS_NEON) vp8_copy_mem8x8 = vp8_copy_mem8x8_neon;
- vp8_dc_only_idct_add = vp8_dc_only_idct_add_c;
- if (flags & HAS_MEDIA) vp8_dc_only_idct_add = vp8_dc_only_idct_add_v6;
+ vp8_dc_only_idct_add = vp8_dc_only_idct_add_v6;
if (flags & HAS_NEON) vp8_dc_only_idct_add = vp8_dc_only_idct_add_neon;
vp8_denoiser_filter = vp8_denoiser_filter_c;
if (flags & HAS_NEON) vp8_denoiser_filter = vp8_denoiser_filter_neon;
vp8_denoiser_filter_uv = vp8_denoiser_filter_uv_c;
if (flags & HAS_NEON) vp8_denoiser_filter_uv = vp8_denoiser_filter_uv_neon;
- vp8_dequant_idct_add = vp8_dequant_idct_add_c;
- if (flags & HAS_MEDIA) vp8_dequant_idct_add = vp8_dequant_idct_add_v6;
+ vp8_dequant_idct_add = vp8_dequant_idct_add_v6;
if (flags & HAS_NEON) vp8_dequant_idct_add = vp8_dequant_idct_add_neon;
- vp8_dequant_idct_add_uv_block = vp8_dequant_idct_add_uv_block_c;
- if (flags & HAS_MEDIA) vp8_dequant_idct_add_uv_block = vp8_dequant_idct_add_uv_block_v6;
+ vp8_dequant_idct_add_uv_block = vp8_dequant_idct_add_uv_block_v6;
if (flags & HAS_NEON) vp8_dequant_idct_add_uv_block = vp8_dequant_idct_add_uv_block_neon;
- vp8_dequant_idct_add_y_block = vp8_dequant_idct_add_y_block_c;
- if (flags & HAS_MEDIA) vp8_dequant_idct_add_y_block = vp8_dequant_idct_add_y_block_v6;
+ vp8_dequant_idct_add_y_block = vp8_dequant_idct_add_y_block_v6;
if (flags & HAS_NEON) vp8_dequant_idct_add_y_block = vp8_dequant_idct_add_y_block_neon;
- vp8_dequantize_b = vp8_dequantize_b_c;
- if (flags & HAS_MEDIA) vp8_dequantize_b = vp8_dequantize_b_v6;
+ vp8_dequantize_b = vp8_dequantize_b_v6;
if (flags & HAS_NEON) vp8_dequantize_b = vp8_dequantize_b_neon;
- vp8_fast_quantize_b = vp8_fast_quantize_b_c;
- if (flags & HAS_MEDIA) vp8_fast_quantize_b = vp8_fast_quantize_b_armv6;
+ vp8_fast_quantize_b = vp8_fast_quantize_b_armv6;
if (flags & HAS_NEON) vp8_fast_quantize_b = vp8_fast_quantize_b_neon;
vp8_fast_quantize_b_pair = vp8_fast_quantize_b_pair_c;
if (flags & HAS_NEON) vp8_fast_quantize_b_pair = vp8_fast_quantize_b_pair_neon;
vp8_get4x4sse_cs = vp8_get4x4sse_cs_c;
if (flags & HAS_NEON) vp8_get4x4sse_cs = vp8_get4x4sse_cs_neon;
- vp8_intra4x4_predict = vp8_intra4x4_predict_c;
- if (flags & HAS_MEDIA) vp8_intra4x4_predict = vp8_intra4x4_predict_armv6;
- vp8_loop_filter_bh = vp8_loop_filter_bh_c;
- if (flags & HAS_MEDIA) vp8_loop_filter_bh = vp8_loop_filter_bh_armv6;
+ vp8_loop_filter_bh = vp8_loop_filter_bh_armv6;
if (flags & HAS_NEON) vp8_loop_filter_bh = vp8_loop_filter_bh_neon;
- vp8_loop_filter_bv = vp8_loop_filter_bv_c;
- if (flags & HAS_MEDIA) vp8_loop_filter_bv = vp8_loop_filter_bv_armv6;
+ vp8_loop_filter_bv = vp8_loop_filter_bv_armv6;
if (flags & HAS_NEON) vp8_loop_filter_bv = vp8_loop_filter_bv_neon;
- vp8_loop_filter_mbh = vp8_loop_filter_mbh_c;
- if (flags & HAS_MEDIA) vp8_loop_filter_mbh = vp8_loop_filter_mbh_armv6;
+ vp8_loop_filter_mbh = vp8_loop_filter_mbh_armv6;
if (flags & HAS_NEON) vp8_loop_filter_mbh = vp8_loop_filter_mbh_neon;
- vp8_loop_filter_mbv = vp8_loop_filter_mbv_c;
- if (flags & HAS_MEDIA) vp8_loop_filter_mbv = vp8_loop_filter_mbv_armv6;
+ vp8_loop_filter_mbv = vp8_loop_filter_mbv_armv6;
if (flags & HAS_NEON) vp8_loop_filter_mbv = vp8_loop_filter_mbv_neon;
- vp8_loop_filter_simple_bh = vp8_loop_filter_bhs_c;
- if (flags & HAS_MEDIA) vp8_loop_filter_simple_bh = vp8_loop_filter_bhs_armv6;
+ vp8_loop_filter_simple_bh = vp8_loop_filter_bhs_armv6;
if (flags & HAS_NEON) vp8_loop_filter_simple_bh = vp8_loop_filter_bhs_neon;
- vp8_loop_filter_simple_bv = vp8_loop_filter_bvs_c;
- if (flags & HAS_MEDIA) vp8_loop_filter_simple_bv = vp8_loop_filter_bvs_armv6;
+ vp8_loop_filter_simple_bv = vp8_loop_filter_bvs_armv6;
if (flags & HAS_NEON) vp8_loop_filter_simple_bv = vp8_loop_filter_bvs_neon;
- vp8_loop_filter_simple_mbh = vp8_loop_filter_simple_horizontal_edge_c;
- if (flags & HAS_MEDIA) vp8_loop_filter_simple_mbh = vp8_loop_filter_simple_horizontal_edge_armv6;
+ vp8_loop_filter_simple_mbh = vp8_loop_filter_simple_horizontal_edge_armv6;
if (flags & HAS_NEON) vp8_loop_filter_simple_mbh = vp8_loop_filter_mbhs_neon;
- vp8_loop_filter_simple_mbv = vp8_loop_filter_simple_vertical_edge_c;
- if (flags & HAS_MEDIA) vp8_loop_filter_simple_mbv = vp8_loop_filter_simple_vertical_edge_armv6;
+ vp8_loop_filter_simple_mbv = vp8_loop_filter_simple_vertical_edge_armv6;
if (flags & HAS_NEON) vp8_loop_filter_simple_mbv = vp8_loop_filter_mbvs_neon;
- vp8_mse16x16 = vp8_mse16x16_c;
- if (flags & HAS_MEDIA) vp8_mse16x16 = vp8_mse16x16_armv6;
+ vp8_mse16x16 = vp8_mse16x16_armv6;
if (flags & HAS_NEON) vp8_mse16x16 = vp8_mse16x16_neon;
vp8_quantize_mb = vp8_quantize_mb_c;
if (flags & HAS_NEON) vp8_quantize_mb = vp8_quantize_mb_neon;
@@ -518,8 +494,7 @@
if (flags & HAS_NEON) vp8_quantize_mbuv = vp8_quantize_mbuv_neon;
vp8_quantize_mby = vp8_quantize_mby_c;
if (flags & HAS_NEON) vp8_quantize_mby = vp8_quantize_mby_neon;
- vp8_sad16x16 = vp8_sad16x16_c;
- if (flags & HAS_MEDIA) vp8_sad16x16 = vp8_sad16x16_armv6;
+ vp8_sad16x16 = vp8_sad16x16_armv6;
if (flags & HAS_NEON) vp8_sad16x16 = vp8_sad16x16_neon;
vp8_sad16x8 = vp8_sad16x8_c;
if (flags & HAS_NEON) vp8_sad16x8 = vp8_sad16x8_neon;
@@ -529,65 +504,45 @@
if (flags & HAS_NEON) vp8_sad8x16 = vp8_sad8x16_neon;
vp8_sad8x8 = vp8_sad8x8_c;
if (flags & HAS_NEON) vp8_sad8x8 = vp8_sad8x8_neon;
- vp8_short_fdct4x4 = vp8_short_fdct4x4_c;
- if (flags & HAS_MEDIA) vp8_short_fdct4x4 = vp8_short_fdct4x4_armv6;
+ vp8_short_fdct4x4 = vp8_short_fdct4x4_armv6;
if (flags & HAS_NEON) vp8_short_fdct4x4 = vp8_short_fdct4x4_neon;
- vp8_short_fdct8x4 = vp8_short_fdct8x4_c;
- if (flags & HAS_MEDIA) vp8_short_fdct8x4 = vp8_short_fdct8x4_armv6;
+ vp8_short_fdct8x4 = vp8_short_fdct8x4_armv6;
if (flags & HAS_NEON) vp8_short_fdct8x4 = vp8_short_fdct8x4_neon;
- vp8_short_idct4x4llm = vp8_short_idct4x4llm_c;
- if (flags & HAS_MEDIA) vp8_short_idct4x4llm = vp8_short_idct4x4llm_v6_dual;
+ vp8_short_idct4x4llm = vp8_short_idct4x4llm_v6_dual;
if (flags & HAS_NEON) vp8_short_idct4x4llm = vp8_short_idct4x4llm_neon;
- vp8_short_inv_walsh4x4 = vp8_short_inv_walsh4x4_c;
- if (flags & HAS_MEDIA) vp8_short_inv_walsh4x4 = vp8_short_inv_walsh4x4_v6;
+ vp8_short_inv_walsh4x4 = vp8_short_inv_walsh4x4_v6;
if (flags & HAS_NEON) vp8_short_inv_walsh4x4 = vp8_short_inv_walsh4x4_neon;
- vp8_short_walsh4x4 = vp8_short_walsh4x4_c;
- if (flags & HAS_MEDIA) vp8_short_walsh4x4 = vp8_short_walsh4x4_armv6;
+ vp8_short_walsh4x4 = vp8_short_walsh4x4_armv6;
if (flags & HAS_NEON) vp8_short_walsh4x4 = vp8_short_walsh4x4_neon;
- vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_c;
- if (flags & HAS_MEDIA) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_armv6;
+ vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_armv6;
if (flags & HAS_NEON) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_neon;
- vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_c;
- if (flags & HAS_MEDIA) vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_armv6;
- vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_c;
- if (flags & HAS_MEDIA) vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_armv6;
+ vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_armv6;
if (flags & HAS_NEON) vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_neon;
- vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_c;
- if (flags & HAS_MEDIA) vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_armv6;
+ vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_armv6;
if (flags & HAS_NEON) vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_neon;
- vp8_sub_pixel_variance16x16 = vp8_sub_pixel_variance16x16_c;
- if (flags & HAS_MEDIA) vp8_sub_pixel_variance16x16 = vp8_sub_pixel_variance16x16_armv6;
+ vp8_sub_pixel_variance16x16 = vp8_sub_pixel_variance16x16_armv6;
if (flags & HAS_NEON) vp8_sub_pixel_variance16x16 = vp8_sub_pixel_variance16x16_neon;
- vp8_sub_pixel_variance8x8 = vp8_sub_pixel_variance8x8_c;
- if (flags & HAS_MEDIA) vp8_sub_pixel_variance8x8 = vp8_sub_pixel_variance8x8_armv6;
+ vp8_sub_pixel_variance8x8 = vp8_sub_pixel_variance8x8_armv6;
if (flags & HAS_NEON) vp8_sub_pixel_variance8x8 = vp8_sub_pixel_variance8x8_neon;
- vp8_subtract_b = vp8_subtract_b_c;
- if (flags & HAS_MEDIA) vp8_subtract_b = vp8_subtract_b_armv6;
+ vp8_subtract_b = vp8_subtract_b_armv6;
if (flags & HAS_NEON) vp8_subtract_b = vp8_subtract_b_neon;
- vp8_subtract_mbuv = vp8_subtract_mbuv_c;
- if (flags & HAS_MEDIA) vp8_subtract_mbuv = vp8_subtract_mbuv_armv6;
+ vp8_subtract_mbuv = vp8_subtract_mbuv_armv6;
if (flags & HAS_NEON) vp8_subtract_mbuv = vp8_subtract_mbuv_neon;
- vp8_subtract_mby = vp8_subtract_mby_c;
- if (flags & HAS_MEDIA) vp8_subtract_mby = vp8_subtract_mby_armv6;
+ vp8_subtract_mby = vp8_subtract_mby_armv6;
if (flags & HAS_NEON) vp8_subtract_mby = vp8_subtract_mby_neon;
- vp8_variance16x16 = vp8_variance16x16_c;
- if (flags & HAS_MEDIA) vp8_variance16x16 = vp8_variance16x16_armv6;
+ vp8_variance16x16 = vp8_variance16x16_armv6;
if (flags & HAS_NEON) vp8_variance16x16 = vp8_variance16x16_neon;
vp8_variance16x8 = vp8_variance16x8_c;
if (flags & HAS_NEON) vp8_variance16x8 = vp8_variance16x8_neon;
vp8_variance8x16 = vp8_variance8x16_c;
if (flags & HAS_NEON) vp8_variance8x16 = vp8_variance8x16_neon;
- vp8_variance8x8 = vp8_variance8x8_c;
- if (flags & HAS_MEDIA) vp8_variance8x8 = vp8_variance8x8_armv6;
+ vp8_variance8x8 = vp8_variance8x8_armv6;
if (flags & HAS_NEON) vp8_variance8x8 = vp8_variance8x8_neon;
- vp8_variance_halfpixvar16x16_h = vp8_variance_halfpixvar16x16_h_c;
- if (flags & HAS_MEDIA) vp8_variance_halfpixvar16x16_h = vp8_variance_halfpixvar16x16_h_armv6;
+ vp8_variance_halfpixvar16x16_h = vp8_variance_halfpixvar16x16_h_armv6;
if (flags & HAS_NEON) vp8_variance_halfpixvar16x16_h = vp8_variance_halfpixvar16x16_h_neon;
- vp8_variance_halfpixvar16x16_hv = vp8_variance_halfpixvar16x16_hv_c;
- if (flags & HAS_MEDIA) vp8_variance_halfpixvar16x16_hv = vp8_variance_halfpixvar16x16_hv_armv6;
+ vp8_variance_halfpixvar16x16_hv = vp8_variance_halfpixvar16x16_hv_armv6;
if (flags & HAS_NEON) vp8_variance_halfpixvar16x16_hv = vp8_variance_halfpixvar16x16_hv_neon;
- vp8_variance_halfpixvar16x16_v = vp8_variance_halfpixvar16x16_v_c;
- if (flags & HAS_MEDIA) vp8_variance_halfpixvar16x16_v = vp8_variance_halfpixvar16x16_v_armv6;
+ vp8_variance_halfpixvar16x16_v = vp8_variance_halfpixvar16x16_v_armv6;
if (flags & HAS_NEON) vp8_variance_halfpixvar16x16_v = vp8_variance_halfpixvar16x16_v_neon;
vp8_yv12_copy_partial_frame = vp8_yv12_copy_partial_frame_c;
if (flags & HAS_NEON) vp8_yv12_copy_partial_frame = vp8_yv12_copy_partial_frame_neon;
« no previous file with comments | « libvpx_srcs_x86_64.gypi ('k') | source/config/linux/arm-neon-cpu-detect/vp9_rtcd.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698