diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-09-29 12:01:50 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-09-29 12:01:50 -0700 |
| commit | b3d3578ee4008c3e0906095ee71cbbde5117dfc6 (patch) | |
| tree | 1adf75c3cd7a4260793a7a9679582f2d040dd4fb /vp9/common | |
| parent | 734368167567c7189246bef2d16f15039a690cbc (diff) | |
| parent | 3fab2125ff77c4e67bc28c49a1ab74cf9f56c54d (diff) | |
| download | libvpx-b3d3578ee4008c3e0906095ee71cbbde5117dfc6.tar libvpx-b3d3578ee4008c3e0906095ee71cbbde5117dfc6.tar.gz libvpx-b3d3578ee4008c3e0906095ee71cbbde5117dfc6.tar.bz2 libvpx-b3d3578ee4008c3e0906095ee71cbbde5117dfc6.zip | |
Merge "Renaming vp9_short_idct10_8x8_add to vp9_short_idct8x8_10_add."
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/arm/neon/vp9_short_idct8x8_add_neon.asm | 8 | ||||
| -rw-r--r-- | vp9/common/vp9_idct.c | 2 | ||||
| -rw-r--r-- | vp9/common/vp9_rtcd_defs.sh | 4 | ||||
| -rw-r--r-- | vp9/common/x86/vp9_idct_intrin_sse2.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/vp9/common/arm/neon/vp9_short_idct8x8_add_neon.asm b/vp9/common/arm/neon/vp9_short_idct8x8_add_neon.asm index a744f59db..c02251a3d 100644 --- a/vp9/common/arm/neon/vp9_short_idct8x8_add_neon.asm +++ b/vp9/common/arm/neon/vp9_short_idct8x8_add_neon.asm @@ -9,7 +9,7 @@ ; EXPORT |vp9_short_idct8x8_add_neon| - EXPORT |vp9_short_idct10_8x8_add_neon| + EXPORT |vp9_short_idct8x8_10_add_neon| ARM REQUIRE8 PRESERVE8 @@ -310,13 +310,13 @@ bx lr ENDP ; |vp9_short_idct8x8_add_neon| -;void vp9_short_idct10_8x8_add_neon(int16_t *input, uint8_t *dest, int dest_stride) +;void vp9_short_idct8x8_10_add_neon(int16_t *input, uint8_t *dest, int dest_stride) ; ; r0 int16_t input ; r1 uint8_t *dest ; r2 int dest_stride) -|vp9_short_idct10_8x8_add_neon| PROC +|vp9_short_idct8x8_10_add_neon| PROC push {r4-r9} vpush {d8-d15} vld1.s16 {q8,q9}, [r0]! @@ -514,6 +514,6 @@ vpop {d8-d15} pop {r4-r9} bx lr - ENDP ; |vp9_short_idct10_8x8_add_neon| + ENDP ; |vp9_short_idct8x8_10_add_neon| END diff --git a/vp9/common/vp9_idct.c b/vp9/common/vp9_idct.c index 9975d3678..bc30d2a95 100644 --- a/vp9/common/vp9_idct.c +++ b/vp9/common/vp9_idct.c @@ -420,7 +420,7 @@ void vp9_short_iht8x8_add_c(int16_t *input, uint8_t *dest, int dest_stride, + dest[j * dest_stride + i]); } } -void vp9_short_idct10_8x8_add_c(int16_t *input, uint8_t *dest, +void vp9_short_idct8x8_10_add_c(int16_t *input, uint8_t *dest, int dest_stride) { int16_t out[8 * 8] = { 0 }; int16_t *outptr = out; diff --git a/vp9/common/vp9_rtcd_defs.sh b/vp9/common/vp9_rtcd_defs.sh index c4d7134f4..42923b3c8 100644 --- a/vp9/common/vp9_rtcd_defs.sh +++ b/vp9/common/vp9_rtcd_defs.sh @@ -306,8 +306,8 @@ specialize vp9_short_idct8x8_1_add sse2 neon prototype void vp9_short_idct8x8_add "int16_t *input, uint8_t *dest, int dest_stride" specialize vp9_short_idct8x8_add sse2 neon -prototype void vp9_short_idct10_8x8_add "int16_t *input, uint8_t *dest, int dest_stride" -specialize vp9_short_idct10_8x8_add sse2 neon +prototype void vp9_short_idct8x8_10_add "int16_t *input, uint8_t *dest, int dest_stride" +specialize vp9_short_idct8x8_10_add sse2 neon prototype void vp9_short_idct16x16_1_add "int16_t *input, uint8_t *dest, int dest_stride" specialize vp9_short_idct16x16_1_add sse2 neon diff --git a/vp9/common/x86/vp9_idct_intrin_sse2.c b/vp9/common/x86/vp9_idct_intrin_sse2.c index f97a6f5bf..d44c7e2a0 100644 --- a/vp9/common/x86/vp9_idct_intrin_sse2.c +++ b/vp9/common/x86/vp9_idct_intrin_sse2.c @@ -985,7 +985,7 @@ void vp9_short_iht8x8_add_sse2(int16_t *input, uint8_t *dest, int stride, RECON_AND_STORE(dest, in[7]); } -void vp9_short_idct10_8x8_add_sse2(int16_t *input, uint8_t *dest, int stride) { +void vp9_short_idct8x8_10_add_sse2(int16_t *input, uint8_t *dest, int stride) { const __m128i zero = _mm_setzero_si128(); const __m128i rounding = _mm_set1_epi32(DCT_CONST_ROUNDING); const __m128i final_rounding = _mm_set1_epi16(1<<4); |