summaryrefslogtreecommitdiff
path: root/libavcodec/arm
Commit message (Collapse)AuthorAge
* Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'Michael Niedermayer2013-02-26
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f': Remove unnecessary dsputil.h #includes Conflicts: libavcodec/ffv1.c libavcodec/h261dec.c libavcodec/h261enc.c libavcodec/h264pred.c libavcodec/lpc.h libavcodec/mjpegdec.c libavcodec/rectangle.h libavcodec/x86/idct_sse2_xvid.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove unnecessary dsputil.h #includesDiego Biurrun2013-02-26
| |
* | Merge commit '76b19a3984359b3be44d4f7e4e69b7b86729a622'Michael Niedermayer2013-02-26
|\| | | | | | | | | | | | | | | * commit '76b19a3984359b3be44d4f7e4e69b7b86729a622': Fix a number of incorrect intmath.h #includes. avconv: remove an unused variable Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Fix a number of incorrect intmath.h #includes.Diego Biurrun2013-02-26
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-21
|\| | | | | | | | | | | | | | | | | * qatar/master: dxva2: Add missing #define to make header compile standalone arm: vp8: Add missing #includes for header to compile standalone doc: filters: Correct BNF FILTER description Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * arm: vp8: Add missing #includes for header to compile standaloneDiego Biurrun2013-02-20
| |
* | h264: integrate clear_blocks calls with IDCT.Ronald S. Bultje2013-02-19
| | | | | | | | | | | | | | | | | | The non-intra-pcm branch in hl_decode_mb (simple, 8bpp) goes from 700 to 672 cycles, and the complete loop of decode_mb_cabac and hl_decode_mb (in the decode_slice loop) goes from 1759 to 1733 cycles on the clip tested (cathedral), i.e. almost 30 cycles per mb faster. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Only set accelerated arm fft functions if fft is enabled.Carl Eugen Hoyos2013-02-17
| | | | | | | | | | | | | | Fixes lavc compilation (linking) for configurations without fft. Reported-by: tyler wear Tested-by: Gavin Kinsey
* | Merge commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc'Michael Niedermayer2013-02-07
|\| | | | | | | | | | | | | | | | | | | | | * commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc': h264chroma: x86: Fix building with yasm disabled rv34: Drop now unnecessary dsputil dependencies Conflicts: libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rv34: Drop now unnecessary dsputil dependenciesDiego Biurrun2013-02-06
| |
* | Merge commit '79dad2a932534d1155079f937649e099f9e5cc27'Michael Niedermayer2013-02-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '79dad2a932534d1155079f937649e099f9e5cc27': dsputil: Separate h264chroma Conflicts: libavcodec/dsputil_template.c libavcodec/ppc/dsputil_ppc.c libavcodec/vc1dec.c libavcodec/vc1dsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Separate h264chromaDiego Biurrun2013-02-06
| |
* | Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'Michael Niedermayer2013-02-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '620289a20e022b9c16c10d546ef86cc0bb77cc84': sh4: Fix silly type vs. variable name search and replace typo configure: Group all hwaccels together in a separate variable Add av_cold attributes to arch-specific init functions Conflicts: configure libavcodec/arm/mpegvideo_armv5te.c libavcodec/x86/mlpdsp.c libavcodec/x86/motion_est.c libavcodec/x86/mpegvideoenc.c libavcodec/x86/videodsp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add av_cold attributes to arch-specific init functionsDiego Biurrun2013-02-05
| |
* | Merge commit '25841dfe806a13de526ae09c11149ab1f83555a8'Michael Niedermayer2013-02-06
|\| | | | | | | | | | | | | | | | | | | | | * commit '25841dfe806a13de526ae09c11149ab1f83555a8': Use ptrdiff_t instead of int for {avg, put}_pixels line_size parameter. Conflicts: libavcodec/alpha/dsputil_alpha.c libavcodec/dsputil_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Use ptrdiff_t instead of int for {avg, put}_pixels line_size parameter.Diego Biurrun2013-02-05
| | | | | | | | | | This avoids SIMD-optimized functions having to sign-extend their line size argument manually to be able to do pointer arithmetic.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Use proper "" quotes for local header #includes ppc: fmtconvert: Drop two unused variables. bink demuxer: set framerate. Conflicts: libavcodec/kbdwin.c libavcodec/ppc/fmtconvert_altivec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Use proper "" quotes for local header #includesDiego Biurrun2013-02-01
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-01-27
|\| | | | | | | | | | | | | * qatar/master: arm: vp8: Fix the plain-armv6 version of vp8_luma_dc_wht Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * arm: vp8: Fix the plain-armv6 version of vp8_luma_dc_whtMartin Storsjö2013-01-27
| | | | | | | | | | | | | | | | | | This makes the plain-armv6 version use the same registers as the armv6t2 version above. This fixes fate-vp8 on plain-armv6 devices. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '33552a5f7b6ec7057516f487b1a902331f8c353e'Michael Niedermayer2013-01-25
|\| | | | | | | | | | | | | | | | | | | | | * commit '33552a5f7b6ec7057516f487b1a902331f8c353e': arm: Add mathops.h to ARCH_HEADERS list avstring: K&R formatting cosmetics Conflicts: libavutil/avstring.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * arm: Add mathops.h to ARCH_HEADERS listDiego Biurrun2013-01-24
| | | | | | | | It is an arch-specific header not suitable for standalone compilation.
* | Merge commit '6bdb841b46d170d58488deaed720729b79223b1d'Michael Niedermayer2013-01-25
|\| | | | | | | | | | | | | | | | | | | * commit '6bdb841b46d170d58488deaed720729b79223b1d': arm: h264qpel: use neon h264 qpel functions only if supported * bug was fixed previously (in merge of buggy code): h264: copy h264qpel dsp context to slice thread copies Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * arm: h264qpel: use neon h264 qpel functions only if supportedJanne Grunau2013-01-24
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-01-24
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: dsputil: Separate h264 qpel Conflicts: libavcodec/dsputil_template.c libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Separate h264 qpelMans Rullgard2013-01-24
| | | | | | | | | | | | | | | | | | | | The sh4 optimizations are removed, because the code is 100% identical to the C code, so it is unlikely to provide any real practical benefit. Signed-off-by: Diego Biurrun <diego@biurrun.de> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'baf35bb4bc4fe7a2a4113c50989d11dd9ef81e76'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | | | | | | | * commit 'baf35bb4bc4fe7a2a4113c50989d11dd9ef81e76': dsputil: remove one array dimension from avg_no_rnd_pixels_tab. Conflicts: libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: remove one array dimension from avg_no_rnd_pixels_tab.Ronald S. Bultje2013-01-22
| |
* | Merge commit '32ff6432284f713e9f837ee5b36fc8e9f1902836'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | | | | | | | * commit '32ff6432284f713e9f837ee5b36fc8e9f1902836': dsputil: remove avg_no_rnd_pixels8. Conflicts: libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: remove avg_no_rnd_pixels8.Ronald S. Bultje2013-01-22
| | | | | | | | This is never used.
* | Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f': Drop DCTELEM typedef Conflicts: libavcodec/alpha/dsputil_alpha.h libavcodec/alpha/motion_est_alpha.c libavcodec/arm/dsputil_init_armv6.c libavcodec/bfin/dsputil_bfin.h libavcodec/bfin/pixels_bfin.S libavcodec/cavs.c libavcodec/cavsdec.c libavcodec/dct-test.c libavcodec/dnxhdenc.c libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/dsputil_template.c libavcodec/eamad.c libavcodec/h264_cavlc.c libavcodec/h264idct_template.c libavcodec/mpeg12.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/ppc/dsputil_altivec.c libavcodec/proresdsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Drop DCTELEM typedefDiego Biurrun2013-01-22
| | | | | | | | | | | | It does not help as an abstraction and adds dsputil dependencies. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | Merge commit '73b704ac609d83e0be124589f24efd9b94947cf9'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '73b704ac609d83e0be124589f24efd9b94947cf9': arm: Add some missing header #includes floatdsp: move scalarproduct_float from dsputil to avfloatdsp. Conflicts: libavcodec/acelp_pitch_delay.c libavcodec/amrnbdec.c libavcodec/amrwbdec.c libavcodec/ra288.c libavcodec/x86/dsputil_mmx.c libavutil/x86/float_dsp.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * arm: Add some missing header #includesDiego Biurrun2013-01-22
| |
| * floatdsp: move scalarproduct_float from dsputil to avfloatdsp.Ronald S. Bultje2013-01-22
| | | | | | | | This makes the aac decoder and all voice codecs independent of dsputil.
* | Merge commit '5959bfaca396ecaf63a8123055f499688b79cae3'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '5959bfaca396ecaf63a8123055f499688b79cae3': floatdsp: move butterflies_float from dsputil to avfloatdsp. Conflicts: libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/imc.c libavcodec/mpegaudiodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * floatdsp: move butterflies_float from dsputil to avfloatdsp.Ronald S. Bultje2013-01-22
| | | | | | | | | | This makes wmadec/enc, twinvq and mpegaudiodec (i.e. mp2/mp3) independent of dsputil.
* | Merge commit '42d324694883cdf1fff1612ac70fa403692a1ad4'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '42d324694883cdf1fff1612ac70fa403692a1ad4': floatdsp: move vector_fmul_reverse from dsputil to avfloatdsp. Conflicts: libavcodec/arm/dsputil_init_vfp.c libavcodec/arm/dsputil_vfp.S libavcodec/dsputil.c libavcodec/ppc/float_altivec.c libavcodec/x86/dsputil.asm libavutil/x86/float_dsp.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * floatdsp: move vector_fmul_reverse from dsputil to avfloatdsp.Ronald S. Bultje2013-01-22
| | | | | | | | | | | | Now, nellymoserenc and aacenc no longer depends on dsputil. Independent of this patch, wmaprodec also does not depend on dsputil, so I removed it from there also.
* | Merge commit '55aa03b9f8f11ebb7535424cc0e5635558590f49'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | | | | | | | | | * commit '55aa03b9f8f11ebb7535424cc0e5635558590f49': floatdsp: move vector_fmul_add from dsputil to avfloatdsp. Conflicts: libavcodec/dsputil.c libavcodec/x86/dsputil.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * floatdsp: move vector_fmul_add from dsputil to avfloatdsp.Ronald S. Bultje2013-01-22
| |
* | Merge commit 'ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3'Michael Niedermayer2013-01-21
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3': fate: Use wmv2 IDCT for wmv2 tests vorbisdsp: change block_size type from int to intptr_t. Conflicts: tests/fate-run.sh tests/fate/vcodec.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vorbisdsp: change block_size type from int to intptr_t.Ronald S. Bultje2013-01-20
| | | | | | | | This saves one instruction in the x86-64 assembly.
* | Merge commit '68f18f03519ae550e25cf12661172641e9f0eaca'Michael Niedermayer2013-01-21
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '68f18f03519ae550e25cf12661172641e9f0eaca': videodsp_armv5te: remove #if HAVE_ARMV5TE_EXTERNAL dsputil: drop non-compliant "fast" qpel mc functions get_bits: change the failure condition in init_get_bits Conflicts: libavcodec/get_bits.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * videodsp_armv5te: remove #if HAVE_ARMV5TE_EXTERNALJanne Grunau2013-01-20
| | | | | | | | | | | | | | | | | | | | | | libavutil/arm/asm.S sets '.arch' depending on HAVE_ARMV5TE so that assembling armv5te code will always succeed even if the default -march flag does not support it. HAVE_ARMV5TE_EXTERNAL tests assembling code with the default arch. Fixes the missing symbol ff_prefetch_arm with --cpu= not including armv5te. CC: libav-stable@libav.org
* | Merge commit 'fef906c77c09940a2fdad155b2adc05080e17eda'Michael Niedermayer2013-01-20
|\| | | | | | | | | | | | | | | | | | | | | * commit 'fef906c77c09940a2fdad155b2adc05080e17eda': Move vorbis_inverse_coupling from dsputil to vorbisdspcontext. Conflicts: libavcodec/dsputil.c libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Move vorbis_inverse_coupling from dsputil to vorbisdspcontext.Ronald S. Bultje2013-01-19
| | | | | | | | | | Conveniently (together with Justin's earlier patches), this makes our vorbis decoder entirely independent of dsputil.
* | Merge commit 'aeaf268e52fc11c1f64914a319e0edddf1346d6a'Michael Niedermayer2013-01-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'aeaf268e52fc11c1f64914a319e0edddf1346d6a': vp3: integrate clear_blocks with idct of previous block. mpegvideo: fix loop condition in draw_line() dvdsubdec: parse the size from the extradata Conflicts: libavcodec/dvdsubdec.c libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vp3: integrate clear_blocks with idct of previous block.Ronald S. Bultje2013-01-19
| | | | | | | | | | | | | | | | | | This is identical to what e.g. vp8 does, and prevents the function call overhead (plus dependency on dsputil for this particular function). Arm asm updated by Janne Grunau <janne-libav@jannau.net>. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-01-16
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: lavc: Move vector_fmul_window to AVFloatDSPContext rtpdec_mpeg4: Check the remaining amount of data before reading Conflicts: libavcodec/dsputil.c Merged-by: Michael Niedermayer <michaelni@gmx.at>