summaryrefslogtreecommitdiff
path: root/libavcodec/dsputil_template.c
Commit message (Collapse)AuthorAge
* Merge commit '619e0da19119bcd683f135fe9a164f37c0ca70d1'Michael Niedermayer2013-04-20
|\ | | | | | | | | | | | | | | | | | | | | * commit '619e0da19119bcd683f135fe9a164f37c0ca70d1': dsputil: Remove unused 32-bit functions Conflicts: libavcodec/dsputil.c libavcodec/dsputil_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Remove unused 32-bit functionsRonald S. Bultje2013-04-19
| | | | | | | | | | | | | | | | Previously, if dct_bits was set to 32, we used separate 32-bit versions of these functions. Since dct_bits now is removed, remove the unused 32-bit versions of the functions. Signed-off-by: Martin Storsjö <martin@martin.st>
| * dsputil: Remove hpel functions (moved to hpeldsp)Ronald S. Bultje2013-04-19
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * dsputil: Make square put/avg_pixels functions local to h264qpelRonald S. Bultje2013-04-10
| | | | | | | | | | | | | | Put a copy of the 8bit functions only in dsputil, where they are used for some other things (e.g. mpeg4qpel, mspel, cavsqpel). Signed-off-by: Martin Storsjö <martin@martin.st>
| * dsputil: convert remaining functions to use ptrdiff_t stridesLuca Barbato2013-03-12
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * h264: Add add_pixels4/8() to h264dsp, and remove add_pixels4 from dsputilRonald S. Bultje2013-02-19
| | | | | | | | | | | | | | | | | | These functions are mostly H264-specific (the only other user I can spot is bink), and this allows us to special-case some functionality for H264. Also remove the 16-bit-coeff with >8bpp versions (unused) and merge the duplicate 32-bit-coeff for >8bpp (identical). Signed-off-by: Martin Storsjö <martin@martin.st>
| * dsputil: convert remaining op_pixels_funcLuca Barbato2013-02-17
| | | | | | | | | | | | Convert to diffptr_t the line_size parameters still int. Remove all the warnings in dsputil.c
* | dsputil: remove non-8bpp draw_edge.Ronald S. Bultje2013-03-15
| | | | | | | | | | | | It is never used. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dsputil: remove duplicate or unused functions.Ronald S. Bultje2013-03-14
| | | | | | | | | | | | | | | | | | | | dct_bits is never set except in h264, where it is never used, thus remove it. Then, remove all functions that were set based on non-zero (32) values for dct_bits. Lastly, merge 9-14 bpp functions for get_pixels and draw_edge, which only care about pixel storage unit size, not actual bits used (i.e. they don't clip). Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dsputil: remove hpel functions (moved to hpeldsp).Ronald S. Bultje2013-03-13
| |
* | dsputil: make square put/avg_pixels functions local to h264qpel.Ronald S. Bultje2013-03-09
| | | | | | | | | | | | | | | | | | | | Put a copy of the 8bit functions only in dsputil, where they are used for some other things (e.g. mpeg4qpel, mspel, cavsqpel). We could perhaps also try to share specifically the 8bit functions from h264qpel between it and the others, but that will be slightly more complicated. H264qpel already had these functions, so we can simply remove the duplicates. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add add_pixels4/8() to h264dsp, and remove add_pixels4 from dsputil.Ronald S. Bultje2013-02-12
| | | | | | | | | | | | | | | | | | These functions are mostly H264-specific (the only other user I can spot is bink), and this allows us to special-case some functionality for H264. Also remove the 16-bit-coeff with >8bpp versions (unused) and merge the duplicate 32-bit-coeff for >8bpp (identical). Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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
| |
* | dsputil: fixup half a dozen bugs with ptrdiff vs int linesizeMichael Niedermayer2013-02-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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 commit 'a5ba798c16d0614d982a76755fdd72b37d437170'Michael Niedermayer2013-01-31
|\| | | | | | | | | | | | | * commit 'a5ba798c16d0614d982a76755fdd72b37d437170': dsputil: remove unused functions copy_block{2, 4, 8, 16}. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: remove unused functions copy_block{2, 4, 8, 16}.Ronald S. Bultje2013-01-30
| |
* | 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 '2612c4dc78e1750c4653bf5a9f2cbe95f7b4ed6e'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | * commit '2612c4dc78e1750c4653bf5a9f2cbe95f7b4ed6e': dsputil: remove 9/10 bits hpel functions. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: remove 9/10 bits hpel functions.Ronald S. Bultje2013-01-22
| | | | | | | | These are 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 remote-tracking branch 'qatar/master'Michael Niedermayer2013-01-22
|\| | | | | | | | | | | | | | | * qatar/master: proresdec: support mixed interlaced/non-interlaced content vp3/5: move put_no_rnd_pixels_l2 from dsputil to VP3DSPContext. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vp3/5: move put_no_rnd_pixels_l2 from dsputil to VP3DSPContext.Ronald S. Bultje2013-01-21
| | | | | | | | | | The function is only used in VP3 and VP5, so no need to have it in DSPContext.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-01-20
|\| | | | | | | | | | | | | * qatar/master: Remove put_no_rnd_pixels_l2 function pointer for w=16 from dsputil. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove put_no_rnd_pixels_l2 function pointer for w=16 from dsputil.Ronald S. Bultje2013-01-19
| | | | | | | | The function is never used.
* | Merge commit '6906b19346ae8a330bfaa1c16ce535be10789723'Michael Niedermayer2012-12-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6906b19346ae8a330bfaa1c16ce535be10789723': lavc: add missing files for arm lavc: introduce VideoDSPContext Conflicts: configure libavcodec/arm/dsputil_init_armv5te.c libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/dsputil_template.c libavcodec/h264.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: introduce VideoDSPContextRonald S. Bultje2012-12-20
| | | | | | | | | | | | | | | | Move some functions from dsputil. The idea is that videodsp contains functions that are useful for a large and varied set of video decoders. Currently, it contains emulated_edge_mc() and prefetch(). Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | ff_emulated_edge_mc: fix handling of w/h being 0Michael Niedermayer2012-12-05
| | | | | | | | | | | | | | Fixes assertion failure Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ff_emulated_edge_mc: fix integer anomalies, fix out of array readsMichael Niedermayer2012-11-16
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dsputil_template: replace assert() by av_assert2()Michael Niedermayer2012-10-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dsputil_template: Reindent after recent changeDerek Buitenhuis2012-09-09
| | | | | | | | | | | | | | Forgot to keep it pretty in e62e455f7b4c5b148f5a289ba823dcc71d6ca389. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dsputil/me/pixels: Actually use av_restrictDerek Buitenhuis2012-09-09
| | | | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dsputil_template: switch to av_assertMichael Niedermayer2012-08-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: limit 10bpp MC pading trick to 10bppMichael Niedermayer2012-07-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dsputil: extend things to 12 and 14 bitsMichael Niedermayer2012-07-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: dnxhddec: optimise dnxhd_decode_dct_block() rtp: remove disabled code eac3enc: use different numbers of blocks per frame to allow higher bitrates dnxhd: add regression test for 10-bit dnxhd: 10-bit support dsputil: update per-arch init funcs for non-h264 high bit depth dsputil: template get_pixels() for different bit depths dsputil: create 16/32-bit dctcoef versions of some functions jfdctint: add 10-bit version mov: add clcp type track as Subtitle stream. mpeg4: add Mpeg4 Profiles names. mpeg4: decode Level Profile for MPEG4 Part 2. ffprobe: display bitstream level. imgconvert: remove unused glue and xglue macros Conflicts: libavcodec/dsputil_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: template get_pixels() for different bit depthsMans Rullgard2011-07-21
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * dsputil: create 16/32-bit dctcoef versions of some functionsMans Rullgard2011-07-21
| | | | | | | | | | | | | | | | | | | | High bitdepth H.264 needs 32-bit transform coefficients, whereas dnxhd does not. This creates a conflict with the templated functions operating on DCTELEM data. This patch adds a field allowing the caller to choose the element size in dsputil_init() and adds the required functions. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rv30: return AVERROR(EINVAL) instead of EINVAL build: add -L flags before existing LDFLAGS simple_idct: whitespace cosmetics simple_idct: make repeated code a macro dsputil: remove huge #if 0 block simple_idct: change 10-bit add/put stride from pixels to bytes dsputil: allow 9/10-bit functions for non-h264 codecs dnxhd: rename some data tables dnxhdenc: remove inline from function only called through pointer dnxhdenc: whitespace cosmetics swscale: mark YUV422P10(LE,BE) as supported for output configure: add -xc99 to LDFLAGS for Sun CC Remove unused and non-compiling vestigial g729 decoder Remove unused code under G729_BITEXACT #ifdef. mpegvideo: fix invalid picture unreferencing. dsputil: Remove extra blank line at end. dsputil: Replace a LONG_MAX check with HAVE_FAST_64BIT. simple_idct: add 10-bit version Conflicts: Makefile libavcodec/g729data.h libavcodec/g729dec.c libavcodec/rv30.c tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: remove huge #if 0 blockMans Rullgard2011-07-21
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Add some missing mathematics.h #includes for av_rescale(). opencore-amr: Add missing initializer braces to shut up gcc warning. ARM: workaround for bug in GNU assembler dv: fix comment wording mistake Rename libavcodec/high_bit_depth.h ---> libavcodec/bit_depth_template.c dv: fix valgrind use of uninitialised value warnings. mxfenc: fix ignored drop flag in binary timecode representation. PPC: use Altivec IMDCT only for supported sizes dv: fix comment spelling configure: simplify -rpath-link linker flag Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Rename libavcodec/high_bit_depth.h ---> libavcodec/bit_depth_template.cDiego Biurrun2011-07-05
| | | | | | | | This naming scheme is used elsewhere, so it's sensible to be consistent.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: swscale: remove misplaced comment. ffmpeg: fix streaming to ffserver. swscale: split out RGB48 output functions from yuv2packed[12X]_c(). build: move vpath directives to main Makefile swscale: fix JPEG-range YUV scaling artifacts. build: move ALLFFLIBS to a more logical place ARM: factor some repetitive code into macros Fix SVQ3 after adding 4:4:4 H.264 support H.264: fix CODEC_FLAG_GRAY 4:4:4 H.264 decoding support ac3enc: fix allocation of floating point samples. Conflicts: ffmpeg.c libavcodec/dsputil_template.c libavcodec/h264.c libavcodec/mpegvideo.c libavcodec/snow.c libswscale/swscale.c libswscale/swscale_internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * 4:4:4 H.264 decoding supportJason Garrett-Glaser2011-06-13
| | | | | | | | Note: this is 4:4:4 from the 2007 spec revision, not the previous (now deprecated) 4:4:4 mode in H.264.
| * Roll back 4:4:4 H.264 for nowJason Garrett-Glaser2011-06-13
| | | | | | | | Needs some ARM/PPC asm modifications.
| * 4:4:4 H.264 decoding supportJason Garrett-Glaser2011-06-13
| | | | | | | | Note: this is 4:4:4 from the 2007 spec revision, not the previous (now deprecated) 4:4:4 mode in H.264.