diff options
| author | Yunqing Wang <yunqingwang@google.com> | 2011-01-25 09:54:23 -0800 |
|---|---|---|
| committer | Code Review <code-review@webmproject.org> | 2011-01-25 09:54:23 -0800 |
| commit | 4e149bb447b1868f42bf17530f618dfa0e84ffe5 (patch) | |
| tree | 27b1a22a6b642d6c7e8f9f43f1ff3c48f7f34025 /vp8 | |
| parent | a69c18980fc4d81a355a8882b763397d13945330 (diff) | |
| parent | ce6c954d2e643c74eb77ca36884c541b1d97fbdb (diff) | |
| download | libvpx-4e149bb447b1868f42bf17530f618dfa0e84ffe5.tar libvpx-4e149bb447b1868f42bf17530f618dfa0e84ffe5.tar.gz libvpx-4e149bb447b1868f42bf17530f618dfa0e84ffe5.tar.bz2 libvpx-4e149bb447b1868f42bf17530f618dfa0e84ffe5.zip | |
Merge "Modify calling of NEON code in sub-pixel search"
Diffstat (limited to 'vp8')
| -rw-r--r-- | vp8/encoder/arm/arm_csystemdependent.c | 31 | ||||
| -rw-r--r-- | vp8/encoder/arm/neon/vp8_subpixelvariance16x16_neon.asm | 4 |
2 files changed, 33 insertions, 2 deletions
diff --git a/vp8/encoder/arm/arm_csystemdependent.c b/vp8/encoder/arm/arm_csystemdependent.c index a1f110260..4f68a9576 100644 --- a/vp8/encoder/arm/arm_csystemdependent.c +++ b/vp8/encoder/arm/arm_csystemdependent.c @@ -18,6 +18,37 @@ extern void (*vp8_yv12_copy_partial_frame_ptr)(YV12_BUFFER_CONFIG *src_ybc, YV12 extern void vp8_yv12_copy_partial_frame(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc, int Fraction); extern void vpxyv12_copy_partial_frame_neon(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc, int Fraction); +extern unsigned int vp8_sub_pixel_variance16x16_neon_func +( + const unsigned char *src_ptr, + int src_pixels_per_line, + int xoffset, + int yoffset, + const unsigned char *dst_ptr, + int dst_pixels_per_line, + unsigned int *sse +); +unsigned int vp8_sub_pixel_variance16x16_neon +( + const unsigned char *src_ptr, + int src_pixels_per_line, + int xoffset, + int yoffset, + const unsigned char *dst_ptr, + int dst_pixels_per_line, + unsigned int *sse +) +{ + if (xoffset == 4 && yoffset == 0) + return vp8_variance_halfpixvar16x16_h_neon(src_ptr, src_pixels_per_line, dst_ptr, dst_pixels_per_line, sse); + else if (xoffset == 0 && yoffset == 4) + return vp8_variance_halfpixvar16x16_v_neon(src_ptr, src_pixels_per_line, dst_ptr, dst_pixels_per_line, sse); + else if (xoffset == 4 && yoffset == 4) + return vp8_variance_halfpixvar16x16_hv_neon(src_ptr, src_pixels_per_line, dst_ptr, dst_pixels_per_line, sse); + else + return vp8_sub_pixel_variance16x16_neon_func(src_ptr, src_pixels_per_line, xoffset, yoffset, dst_ptr, dst_pixels_per_line, sse); +} + void vp8_arch_arm_encoder_init(VP8_COMP *cpi) { #if CONFIG_RUNTIME_CPU_DETECT diff --git a/vp8/encoder/arm/neon/vp8_subpixelvariance16x16_neon.asm b/vp8/encoder/arm/neon/vp8_subpixelvariance16x16_neon.asm index 1b09cfe4c..1475f76df 100644 --- a/vp8/encoder/arm/neon/vp8_subpixelvariance16x16_neon.asm +++ b/vp8/encoder/arm/neon/vp8_subpixelvariance16x16_neon.asm @@ -9,7 +9,7 @@ ; - EXPORT |vp8_sub_pixel_variance16x16_neon| + EXPORT |vp8_sub_pixel_variance16x16_neon_func| ARM REQUIRE8 PRESERVE8 @@ -24,7 +24,7 @@ ; stack(r6) unsigned int *sse ;note: most of the code is copied from bilinear_predict16x16_neon and vp8_variance16x16_neon. -|vp8_sub_pixel_variance16x16_neon| PROC +|vp8_sub_pixel_variance16x16_neon_func| PROC push {r4-r6, lr} ldr r12, _BilinearTaps_coeff_ |