diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-13 01:07:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-13 01:29:48 +0100 |
| commit | b18e17eabf3ba51da2d0fd0f85c4815945bfd70a (patch) | |
| tree | e949920e01cba93fbedca647076f72b31eec59cb /libavcodec/arm | |
| parent | a2c419848df3e76e164bd19c3841f39d2971d326 (diff) | |
| parent | 4df30f71147b7bedd4457bcfa0e4efe01085af9f (diff) | |
| download | ffmpeg-b18e17eabf3ba51da2d0fd0f85c4815945bfd70a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (21 commits)
utils: Check for extradata size overflows.
ARM: rv34: fix asm syntax in dc transform functions
avio: Fix the value of the deprecated URL_FLAG_NONBLOCK
rv34: fix and optimise frame dependency checking
rv34: NEON optimised dc only inverse transform
avprobe: use avio_size() instead of deprecated AVFormatContext.file_size.
ffmenc: remove references to deprecated AVFormatContext.timestamp.
lavf: undeprecate read_seek().
avserver: remove code using deprecated CODEC_CAP_PARSE_ONLY.
lavc: replace some remaining FF_I_TYPE with AV_PICTURE_TYPE_I
lavc: ifdef out parse_only AVOption
nellymoserdec: SAMPLE_FMT -> AV_SAMPLE_FMT
mpegvideo_enc: ifdef out/replace references to deprecated codec flags.
riff: remove references to sonic codec ids
indeo4: add some missing static and const qualifiers
rv34: DC-only inverse transform
avconv: use AVFrame.width/height/format instead of corresponding AVCodecContext fields
lavfi: move version macros to a new installed header version.h
vsrc_buffer: release the buffer on uninit.
rgb2rgb: rgb12tobgr12()
...
Conflicts:
avconv.c
doc/APIchanges
ffprobe.c
libavfilter/Makefile
libavfilter/avfilter.h
libswscale/rgb2rgb.c
libswscale/rgb2rgb.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm')
| -rw-r--r-- | libavcodec/arm/rv34dsp_init_neon.c | 9 | ||||
| -rw-r--r-- | libavcodec/arm/rv34dsp_neon.S | 29 |
2 files changed, 36 insertions, 2 deletions
diff --git a/libavcodec/arm/rv34dsp_init_neon.c b/libavcodec/arm/rv34dsp_init_neon.c index 9a09fde7a9..16bda46658 100644 --- a/libavcodec/arm/rv34dsp_init_neon.c +++ b/libavcodec/arm/rv34dsp_init_neon.c @@ -26,8 +26,13 @@ void ff_rv34_inv_transform_neon(DCTELEM *block); void ff_rv34_inv_transform_noround_neon(DCTELEM *block); +void ff_rv34_inv_transform_dc_neon(DCTELEM *block); +void ff_rv34_inv_transform_noround_dc_neon(DCTELEM *block); + void ff_rv34dsp_init_neon(RV34DSPContext *c, DSPContext* dsp) { - c->rv34_inv_transform_tab[0] = ff_rv34_inv_transform_neon; - c->rv34_inv_transform_tab[1] = ff_rv34_inv_transform_noround_neon; + c->rv34_inv_transform_tab[0] = ff_rv34_inv_transform_neon; + c->rv34_inv_transform_tab[1] = ff_rv34_inv_transform_noround_neon; + c->rv34_inv_transform_dc_tab[0] = ff_rv34_inv_transform_dc_neon; + c->rv34_inv_transform_dc_tab[1] = ff_rv34_inv_transform_noround_dc_neon; } diff --git a/libavcodec/arm/rv34dsp_neon.S b/libavcodec/arm/rv34dsp_neon.S index f700f5c321..1e8d4b49a1 100644 --- a/libavcodec/arm/rv34dsp_neon.S +++ b/libavcodec/arm/rv34dsp_neon.S @@ -107,3 +107,32 @@ function ff_rv34_inv_transform_noround_neon, export=1 vst4.16 {d0[3], d1[3], d2[3], d3[3]}, [r2,:64], r1 bx lr endfunc + +/* void rv34_inv_transform_dc_c(DCTELEM *block) */ +function ff_rv34_inv_transform_dc_neon, export=1 + vld1.16 {d28[]}, [r0,:16] @ block[0] + vmov.i16 d4, #169 + mov r1, #16 + vmull.s16 q3, d28, d4 + vrshrn.s32 d0, q3, #10 + vst1.16 {d0}, [r0,:64], r1 + vst1.16 {d0}, [r0,:64], r1 + vst1.16 {d0}, [r0,:64], r1 + vst1.16 {d0}, [r0,:64], r1 + bx lr +endfunc + +/* void rv34_inv_transform_dc_noround_c(DCTELEM *block) */ +function ff_rv34_inv_transform_noround_dc_neon, export=1 + vld1.16 {d28[]}, [r0,:16] @ block[0] + vmov.i16 d4, #251 + vorr.s16 d4, #256 @ 13^2 * 3 + mov r1, #16 + vmull.s16 q3, d28, d4 + vshrn.s32 d0, q3, #11 + vst1.64 {d0}, [r0,:64], r1 + vst1.64 {d0}, [r0,:64], r1 + vst1.64 {d0}, [r0,:64], r1 + vst1.64 {d0}, [r0,:64], r1 + bx lr +endfunc |