summaryrefslogtreecommitdiffstats
path: root/libavcodec/vc1dsp.c
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/vc1dsp: add () to protect the arguments of the op* macrosMichael Niedermayer2015-02-171-4/+4
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'adf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed'Michael Niedermayer2014-08-051-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'adf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed': vc-1: Add platform-specific start code search routine to VC1DSPContext. Conflicts: configure libavcodec/arm/vc1dsp_init_arm.c libavcodec/vc1dsp.c libavcodec/vc1dsp.h See: 9d8ecdd8ca6d248e7439e8fdf255e39eda14e0f2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc-1: Add platform-specific start code search routine to VC1DSPContext.Ben Avison2014-08-041-0/+3
| | | | | | | | | | | | | | Initialise VC1DSPContext for parser as well as for decoder. Note, the VC-1 code doesn't actually use the function pointer yet. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * vc1dsp: Add wrappers for {avg|put}_vc1_mspel_mc00_cDiego Biurrun2014-07-251-2/+15
| | | | | | | | This avoids invoking the wrapped functions with too many arguments.
* | Merge commit '368f50359eb328b0b9d67451f56fda20b3255f9a'Michael Niedermayer2014-05-301-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '368f50359eb328b0b9d67451f56fda20b3255f9a': dsputil: Split off quarterpel bits into their own context Conflicts: configure libavcodec/dsputil.c libavcodec/h263dec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/vc1dec.c libavcodec/vc1dsp.c libavcodec/x86/dsputil_init.c libavcodec/x86/qpeldsp.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Split off quarterpel bits into their own contextDiego Biurrun2014-05-291-1/+1
| |
* | vc-1: Add platform-specific start code search routine to VC1DSPContext.Ben Avison2014-04-251-0/+3
| | | | | | | | | | | | | | Initialise VC1DSPContext for parser as well as for decoder. Note, the VC-1 code doesn't actually use the function pointer yet. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vc1dsp: introduce cases for 8x8 and 16x16Christophe Gisquet2014-04-201-33/+108
| | | | | | | | | | | | | | | | | | | | | | | | This allows further unrolling the DSP implementation where possible. x86 and ARM DSP modified by simply moving the multiple calls from vc1dec to the DSP code. Decoding improvements should only occurs because of the compiler actually able to unroll more. Decoding time: ~8.80s -> 8.64s (ie around 2%) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '3dc6272bed7890a49080e18eacf3c7a4a6594b0d'Michael Niedermayer2014-04-051-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '3dc6272bed7890a49080e18eacf3c7a4a6594b0d': Remove a number of unnecessary dsputil.h #includes Conflicts: libavcodec/h264pred.c libavcodec/vc1dsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove a number of unnecessary dsputil.h #includesDiego Biurrun2014-04-041-0/+1
| |
* | Merge commit 'ed9625eb62be1e1c44cecdd73ea0d80077a15d48'Michael Niedermayer2014-03-131-0/+1
|\ \ | |/ | | | | | | | | | | * commit 'ed9625eb62be1e1c44cecdd73ea0d80077a15d48': dsputil: Move intreadwrite.h #include from header file to .c files Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '71617884a2a673908bd5c0f73d4f91fdca3da82a'Michael Niedermayer2014-01-151-0/+2
|\ \ | |/ | | | | | | | | | | * commit '71617884a2a673908bd5c0f73d4f91fdca3da82a': aarch64: h264 chroma motion compensation NEON optimizations Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aarch64: h264 chroma motion compensation NEON optimizationsJanne Grunau2014-01-151-0/+2
| | | | | | | | | | Since RV40 and VC-1 use almost the same algorithm so optimizations for those two decoders are easy to do and included.
* | Merge commit '6d98959c8a5a749592a878b9523b31eccea5d102'Michael Niedermayer2014-01-131-14/+16
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '6d98959c8a5a749592a878b9523b31eccea5d102': vc1: Add avg_no_rnd_vc1_chroma_mc4_c() Conflicts: libavcodec/vc1dsp.c See: dd6e291e4083b7af53968c0ae06330841f63405b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1: Add avg_no_rnd_vc1_chroma_mc4_c()Michael Niedermayer2014-01-131-0/+23
| | | | | | | | | | | | Needed for proper interlaced support. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'c798a6fedc3dd9ed3ac1fb2d95819af58705a87e'Michael Niedermayer2014-01-131-48/+23
|\ \ | |/ | | | | | | | | | | * commit 'c798a6fedc3dd9ed3ac1fb2d95819af58705a87e': vc1: Factorize out chroma MC Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1: Factorize out chroma MCLuca Barbato2014-01-131-48/+23
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-121-321/+403
|\ \ | |/ | | | | | | | | | | | | | | | | * qatar/master: vc1dsp: K&R formatting cosmetics Conflicts: libavcodec/vc1dsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1dsp: K&R formatting cosmeticsLuca Barbato2014-01-121-321/+403
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '832e19063209a5f355af733d1a45f5051f49ce33'Michael Niedermayer2013-12-201-0/+2
|\ \ | |/ | | | | | | | | | | * commit '832e19063209a5f355af733d1a45f5051f49ce33': vc1: arm: Add NEON assembly Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1: arm: Add NEON assemblyMason Carter2013-12-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | For: ff_vc1_inv_trans_{8,4}x{8,4}_{dc_,}neon ff_put_pixels8x8_neon ff_put_vc1_mspel_mc{0,1,2,3}{0,1,2,3}_neon (except for 00) Based on ARM assembly code in libavcodec/arm by Rob Clark and Mans Rullgard. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-08-291-2/+2
|\ \ | |/ | | | | | | | | | | * qatar/master: cosmetics: Place arch initialization calls in alphabetical order Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Place arch initialization calls in alphabetical orderDiego Biurrun2013-08-291-2/+2
| |
* | Merge commit '38282149b6ce8f4b8361e3b84542ba9aa8a1f32f'Michael Niedermayer2013-05-011-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '38282149b6ce8f4b8361e3b84542ba9aa8a1f32f': ppc: More consistent arch initialization Conflicts: libavcodec/fft.h libavcodec/mpegaudiodsp.c libavcodec/mpegaudiodsp.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ppc: More consistent arch initializationDiego Biurrun2013-04-301-2/+2
| |
* | vc1dsp: add avg_no_rnd_vc1_chroma_mc4_c()Michael Niedermayer2013-04-251-0/+21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vc1: fix int/ptrdiff_t mismatchesMichael Niedermayer2013-03-131-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a8b6015823e628047a45916404c00044c5e80415'Michael Niedermayer2013-03-131-5/+11
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'a8b6015823e628047a45916404c00044c5e80415': dsputil: convert remaining functions to use ptrdiff_t strides Conflicts: libavcodec/dsputil.h libavcodec/dsputil_template.c libavcodec/h264qpel_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: convert remaining functions to use ptrdiff_t stridesLuca Barbato2013-03-121-5/+11
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'bf6b3ec924b4fb64d14df33077f4d4541d525dbf'Michael Niedermayer2013-02-091-0/+1
|\ \ | |/ | | | | | | | | | | * commit 'bf6b3ec924b4fb64d14df33077f4d4541d525dbf': dsputil: Move rnd_avg inline functions to a separate header Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '79dad2a932534d1155079f937649e099f9e5cc27'Michael Niedermayer2013-02-071-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * 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-061-1/+2
| |
* | Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'Michael Niedermayer2013-01-231-14/+14
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-221-14/+14
| | | | | | | | | | | | It does not help as an abstraction and adds dsputil dependencies. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | vc1dsp: fix the warning fix, make it work with --disable-asmMichael Niedermayer2012-12-261-5/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vc1dsp: fix pointer type warningsMichael Niedermayer2012-12-261-2/+11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-081-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: x86: vc1: call ff_vc1dsp_init_x86() under if (ARCH_X86) x86: cavs: call ff_cavsdsp_init_x86() under if (ARCH_X86) x86: call most of the x86 dsp init functions under if (ARCH_X86) doc: support the new website layout doc: remove a warning from filters.texi doc: initial nut documentation segment: drop global headers setting lavu: fix typo in Makefile Conflicts: doc/Makefile doc/filters.texi doc/t2h.init libavcodec/fmtconvert.c libavcodec/proresdsp.c libavcodec/x86/Makefile libavcodec/x86/vc1dsp_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: vc1: call ff_vc1dsp_init_x86() under if (ARCH_X86)Janne Grunau2012-10-081-2/+2
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-161-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Fix even more missing includes after the common.h removal build: Factor out rangecoder dependencies to CONFIG_RANGECODER build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE x86: avcodec: Consistently name all init files Add more missing includes after removing the implicit common.h Add some more missing includes after removing the implicit common.h Don't include common.h from avutil.h rtmp: Automatically compute the hash for SWFVerification Conflicts: configure doc/APIchanges doc/examples/decoding_encoding.c libavcodec/Makefile libavcodec/assdec.c libavcodec/audio_frame_queue.c libavcodec/avpacket.c libavcodec/dv_profile.c libavcodec/dwt.c libavcodec/libtheoraenc.c libavcodec/rawdec.c libavcodec/rv40dsp.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/v210dec.h libavcodec/vc1dsp.c libavcodec/x86/Makefile libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/buffer.c libavfilter/formats.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_select.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/version.h libavutil/audioconvert.c libavutil/error.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Don't include common.h from avutil.hMartin Storsjö2012-08-151-0/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | vc1dsp: use av_assert2Michael Niedermayer2012-07-021-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-081-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * qatar/master: float_dsp: ppc: add a separate header for Altivec function prototypes ARM: fix float_dsp breakage from d5a7229 Add a float DSP framework to libavutil PPC: Move types_altivec.h and util_altivec.h from libavcodec to libavutil ARM: Move asm.S from libavcodec to libavutil vc1dsp: mark put/avg_vc1_mspel_mc() always_inline Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1dsp: mark put/avg_vc1_mspel_mc() always_inlineMans Rullgard2012-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | This ensures that these functions are inlined into the per-position entry points, allowing constant propagation as needed for proper optimisation. 18% faster VC1 decoding on Cortex-A9. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-071-36/+26
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: SBR DSP: fix SSE code to not use SSE2 instructions. cpu: initialize mask to -1, so that by default, optimizations are used. error_resilience: initialize s->block_index[]. svq3: protect against negative quantizers. Don't use ff_cropTbl[] for IDCT. swscale: make filterPos 32bit. FATE: add CPUFLAGS variable, mapping to -cpuflags avconv option. avconv: add -cpuflags option for setting supported cpuflags. cpu: add av_set_cpu_flags_mask(). libx264: Allow overriding the sliced threads option avconv: fix counting encoded video size. Conflicts: doc/APIchanges doc/fate.texi doc/ffmpeg.texi ffmpeg.c libavcodec/h264idct_template.c libavcodec/svq3.c libavutil/avutil.h libavutil/cpu.c libavutil/cpu.h libswscale/swscale.c tests/Makefile tests/fate-run.sh tests/regression-funcs.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Don't use ff_cropTbl[] for IDCT.Ronald S. Bultje2012-03-061-55/+42
| | | | | | | | | | | | | | | | Results of IDCT can by far outreach the range of ff_cropTbl[], leading to overreads and potentially crashes. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | vc1: fix out of array reads in vc1_inv_trans_4x4_c()Michael Niedermayer2012-03-011-5/+4
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vc1: fix out of array reads in vc1_inv_trans_4x8_c()Michael Niedermayer2012-03-011-9/+8
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vc1: fix out of array reads in vc1_inv_trans_8x4_c()Michael Niedermayer2012-03-011-5/+4
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-121-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: x86: cabac: replace explicit memory references with "m" operands avplay: don't request a stereo downmix wmapro: use av_float2int() lavc: avoid invalid memcpy() in avcodec_default_release_buffer() lavu: replace int/float punning functions lavfi: install libavfilter/vsrc_buffer.h Remove extraneous semicolons sdp: Restore the original mp4 format h264 extradata if converted rtpenc: Add support for mp4 format h264 rtpenc: Simplify code by introducing a separate end pointer movenc: Use the actual converted sample for RTP hinting Fix a bunch of common typos. Conflicts: doc/developer.texi doc/eval.texi doc/filters.texi doc/protocols.texi ffmpeg.c ffplay.c libavcodec/mpegvideo.h libavcodec/x86/cabac.h libavfilter/Makefile libavformat/avformat.h libavformat/cafdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/gxfenc.c libavformat/img2.c libavformat/movenc.c libavformat/mpegts.c libavformat/rtpenc_h264.c libavformat/utils.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove extraneous semicolonsMans Rullgard2011-12-111-2/+2
| | | | | | | | | | | | These semicolons cause invalid empty top-level declarations. Signed-off-by: Mans Rullgard <mans@mansr.com>
OpenPOWER on IntegriCloud