diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-20 23:33:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-20 23:33:15 +0100 |
| commit | 4fa91b88c6180957781036614fa94a6fc3b7046f (patch) | |
| tree | 8efb706aacdccbbfce90ea8dfb6b9f50b6102b7f /libavcodec/arm/h264cmc_neon.S | |
| parent | 69278d94c4823f5ea988751e34cb2b8e33426b01 (diff) | |
| parent | b254490bdabb21bd517c05b1a68717f9952ac8c4 (diff) | |
Merge commit 'b254490bdabb21bd517c05b1a68717f9952ac8c4'
* commit 'b254490bdabb21bd517c05b1a68717f9952ac8c4':
vc1: arm: Add NEON no_rnd chroma MC
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/h264cmc_neon.S')
| -rw-r--r-- | libavcodec/arm/h264cmc_neon.S | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/libavcodec/arm/h264cmc_neon.S b/libavcodec/arm/h264cmc_neon.S index 112d5d6f86..0bcae11204 100644 --- a/libavcodec/arm/h264cmc_neon.S +++ b/libavcodec/arm/h264cmc_neon.S @@ -39,6 +39,9 @@ function ff_\type\()_\codec\()_chroma_mc8_neon, export=1 add r6, r6, r7, lsl #1 vld1.16 {d22[],d23[]}, [r6,:16] .endif + .ifc \codec,vc1 + vmov.u16 q11, #28 + .endif A muls r7, r4, r5 T mul r7, r4, r5 @@ -183,6 +186,9 @@ function ff_\type\()_\codec\()_chroma_mc4_neon, export=1 add r6, r6, r7, lsl #1 vld1.16 {d22[],d23[]}, [r6,:16] .endif + .ifc \codec,vc1 + vmov.u16 q11, #28 + .endif A muls r7, r4, r5 T mul r7, r4, r5 @@ -396,3 +402,10 @@ endconst h264_chroma_mc4 put, rv40 h264_chroma_mc4 avg, rv40 #endif + +#if CONFIG_VC1_DECODER + h264_chroma_mc8 put, vc1 + h264_chroma_mc8 avg, vc1 + h264_chroma_mc4 put, vc1 + h264_chroma_mc4 avg, vc1 +#endif |