diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 20:34:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 20:35:33 +0200 |
| commit | 32cf26cc6a0dc1425ed60b8ac99552fd858fab9b (patch) | |
| tree | f989a4b7a14b2429f32a6ee0d639a044ecd8e122 /libavcodec/arm | |
| parent | 957457a044f6b03453cbc4f817a051cbe1e388eb (diff) | |
| parent | f23d26a6864128001b03876b0b92fffe131f2060 (diff) | |
| download | ffmpeg-32cf26cc6a0dc1425ed60b8ac99552fd858fab9b.tar.gz | |
Merge commit 'f23d26a6864128001b03876b0b92fffe131f2060'
* commit 'f23d26a6864128001b03876b0b92fffe131f2060':
h264: avoid using uninitialized memory in NEON chroma mc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm')
| -rw-r--r-- | libavcodec/arm/h264cmc_neon.S | 60 |
1 files changed, 56 insertions, 4 deletions
diff --git a/libavcodec/arm/h264cmc_neon.S b/libavcodec/arm/h264cmc_neon.S index 0bcae11204..77ed3c0daa 100644 --- a/libavcodec/arm/h264cmc_neon.S +++ b/libavcodec/arm/h264cmc_neon.S @@ -96,9 +96,10 @@ T cmp r7, #0 pop {r4-r7, pc} -2: tst r6, r6 - add r12, r12, r6 +2: adds r12, r12, r6 vdup.8 d0, r4 + beq 5f + tst r6, r6 vdup.8 d1, r12 beq 4f @@ -164,6 +165,33 @@ T cmp r7, #0 bgt 4b pop {r4-r7, pc} + +5: vld1.8 {d4}, [r1], r2 + vld1.8 {d5}, [r1], r2 + pld [r1] + subs r3, r3, #2 + vmull.u8 q8, d4, d0 + vmull.u8 q9, d5, d0 + pld [r1, r2] + .ifc \codec,h264 + vrshrn.u16 d16, q8, #6 + vrshrn.u16 d17, q9, #6 + .else + vadd.u16 q8, q8, q11 + vadd.u16 q9, q9, q11 + vshrn.u16 d16, q8, #6 + vshrn.u16 d17, q9, #6 + .endif + .ifc \type,avg + vld1.8 {d20}, [lr,:64], r2 + vld1.8 {d21}, [lr,:64], r2 + vrhadd.u8 q8, q8, q10 + .endif + vst1.8 {d16}, [r0,:64], r2 + vst1.8 {d17}, [r0,:64], r2 + bgt 5b + + pop {r4-r7, pc} endfunc .endm @@ -245,9 +273,10 @@ T cmp r7, #0 pop {r4-r7, pc} -2: tst r6, r6 - add r12, r12, r6 +2: adds r12, r12, r6 vdup.8 d0, r4 + beq 5f + tst r6, r6 vdup.8 d1, r12 vtrn.32 d0, d1 @@ -311,6 +340,29 @@ T cmp r7, #0 bgt 4b pop {r4-r7, pc} + +5: vld1.32 {d4[0]}, [r1], r2 + vld1.32 {d4[1]}, [r1], r2 + vmull.u8 q8, d4, d0 + subs r3, r3, #2 + pld [r1] + .ifc \codec,h264 + vrshrn.u16 d16, q8, #6 + .else + vadd.u16 q8, q8, q11 + vshrn.u16 d16, q8, #6 + .endif + .ifc \type,avg + vld1.32 {d20[0]}, [lr,:32], r2 + vld1.32 {d20[1]}, [lr,:32], r2 + vrhadd.u8 d16, d16, d20 + .endif + pld [r1] + vst1.32 {d16[0]}, [r0,:32], r2 + vst1.32 {d16[1]}, [r0,:32], r2 + bgt 5b + + pop {r4-r7, pc} endfunc .endm |