aboutsummaryrefslogtreecommitdiffstats
path: root/libswscale/x86
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-291-76/+83
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) swscale: Add Doxygen for hyscale_fast/hScale. fate: enable lavfi-pixmt tests on big endian systems PPC: swscale: disable altivec functions for unsupported formats fate: merge identical pixdesc_be/le tests swscale: Add Doxygen for yuv2planar*/yuv2packed* functions. build: call texi2pod.pl with full path instead of symlink build: include sub-makefiles using full path instead of symlinks swscale: update big endian reference values after dff5a835. wavpack: skip blocks with no samples cosmetics: remove outdated comment that is no longer true build: replace some addprefix/addsuffix with substitution refs avutil: Remove unused arbitrary precision integer code. configure: Drop check for availability of ten assembler operands. aacenc: Save channel configuration for later use. aacenc: Fix codebook trellising for zeroed bands. swscale: change prototypes of scaled YUV output functions. swscale: re-add support for non-native endianness. swscale: disentangle yuv2rgbX_c_full() into small functions. swscale: split yuv2packed[12X]_c() remainders into small functions. swscale: split yuv2packedX_altivec in smaller functions. ... Conflicts: Makefile configure libavcodec/x86/dsputil_mmx.c libavfilter/Makefile libavformat/Makefile libavutil/integer.c libavutil/integer.h libswscale/swscale.c libswscale/swscale_internal.h libswscale/x86/swscale_template.c tests/ref/lavfi/pixdesc_le tests/ref/lavfi/pixfmts_scale Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: change prototypes of scaled YUV output functions.Ronald S. Bultje2011-06-271-76/+83
| | | | | | | | | | | | | | | | Remove unused variables "flags" and "dstFormat" in yuv2packed1, merge source rows per plane for yuv2packed[12], and make every source argument int16_t (some where invalidly set to uint16_t). This prevents stack pollution and is part of the Great Evil Plan to simplify swscale.
| * swscale: don't use planar output functions to write to NV12/21.Ronald S. Bultje2011-06-271-1/+2
| | | | | | | | | | This prevents a crash when converting to NV12/21 without the bitexact flags enabled.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-271-2/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: build: improve rules for test programs build: factor out the .c and .S compile commands as a macro swscale: remove unused xInc/srcW arguments from hScale(). H.264: disable 2tap qpel with CODEC_FLAG2_FAST and >8-bit H.264: make filter_mb_fast support 4:4:4 mpeg4videoenc: Remove disabled variant of mpeg4_encode_block(). configure: allow post-fixed cpu strings for athlon64, k8, and opteron when setting the -march flag. Move some variable declarations below the proper #ifdefs. Conflicts: Makefile ffplay.c libswscale/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: remove unused xInc/srcW arguments from hScale().Ronald S. Bultje2011-06-261-2/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-163-3/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ac3enc: use correct alignment and length in channel coupling dsp functions. ffmpeg: don't abuse a global for passing framerate from input to output ffmpeg: don't abuse a global for passing channels from input to output ffmpeg: don't abuse a global for passing samplerate from input to output ARM: update ff_h264_idct8_add4_neon for 4:4:4 changes swscale: use SwsContext for av_log when available swscale: Remove HAVE_MMX from files that are only compiled with MMX enabled. swscale: Fix compilation with --disable-mmx2. Conflicts: ffmpeg.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: Remove HAVE_MMX from files that are only compiled with MMX enabled.Diego Biurrun2011-06-152-2/+2
| |
| * swscale: Fix compilation with --disable-mmx2.Diego Biurrun2011-06-152-1/+5
| | | | | | | | Some MMX2 functions were being referenced without proper #ifdefs.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-101-185/+206
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavf: make compute_pkt_fields2() return meaningful error values matroskadec: set timestamps for RealAudio packets. intelh263dec: aspect ratio processing fix. intelh263dec: fix "Strict H.263 compliance" file playback oss,sndio: simplify by using FFMIN. swscale: extract monowhite/black output from yuv2packed[12X]_c(). swscale: de-macro'ify RGB15/16/32 input functions. swscale: rearrange code. movdec: Add support for the 'wfex' atom. ffmpeg.c: Add a necessary const qualifier riff: Fix potential memleak. swscale: change 48bit RGB input macros to inline functions. swscale: change 9/10bit YUV input macros to inline functions. swscale: extract gray16 output functions from yuv2packed[12X](). swscale: use standard clipping functions. swscale: merge macros that are used only once. swscale: fix function declarations in swscale.c. swscale: fix function declaration keywords in x86/swscale_template.c. Conflicts: ffmpeg.c libavcodec/intelh263dec.c libswscale/swscale.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: fix function declaration keywords in x86/swscale_template.c.Ronald S. Bultje2011-06-091-181/+202
| | | | | | | | | | | | | | Remove inline keyword for functions that are only called through their function pointers (and thus cannot be inlined); add av_cold keyword to init function, and use av_always_inline instead of inline for functions that must be inlined for performance reasons.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-091-37/+31
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: crypto: Use av_freep instead of av_free lavf: don't try to free private options if priv_data is NULL. swscale: fix types of assembly arguments. swscale: move two macros that are only used once into caller. swscale: remove unused function. options: Add missing braces around struct initializer. mov: Remove leftover crufty debug statement with references to a local file. dvbsubdec: Fix compilation of debug code. Remove all uses of now deprecated metadata functions. Move metadata API from lavf to lavu. Conflicts: doc/APIchanges libavformat/aiffdec.c libavformat/asfdec.c libavformat/avformat.h libavformat/avidec.c libavformat/cafdec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/mp3enc.c libavformat/wtv.c libavutil/avutil.h libavutil/internal.h libswscale/swscale.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: fix types of assembly arguments.Ronald S. Bultje2011-06-081-4/+4
| | | | | | | | | | | | | | | | This prevents the following compiler warnings: "warning: initialization from incompatible pointer type". Since the variables are only ever used in inline assembly, their type is actually irrelevant (so the part where it was wrong did not invoke any buggy behaviour).
| * swscale: move two macros that are only used once into caller.Ronald S. Bultje2011-06-081-36/+30
| | | | | | | | | | This way, they look like regular code, which is easier to understand.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-081-32/+40
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (28 commits) Remove some non-compiling debug messages. ffplay: Fix non-compiling debug printf and replace it by av_dlog. H264: x86 predict init cosmetics. ac3enc: Fix linking of AC-3 encoder without the E-AC-3 encoder. Move E-AC-3 encoder functions to a separate eac3enc.c file. ac3enc: remove convenience macro, #define DEBUG ac3enc: remove unused #define vc1: re-initialize tables after width/height change. APIchanges: fill-in git commit hash for av_get_bytes_per_sample() addition samplefmt: add av_get_bytes_per_sample() iirfilter: fix biquad filter coefficients. swscale: remove duplicate conversion routine in swScale(). swscale: add yuv2planar/packed function typedefs. swscale: integrate yuv2nv12X_C into yuv2yuvX() function pointers. swscale: reindent x86 init code. swscale: extract SWS_FULL_CHR_H_INT conditional into init code. swscale: cosmetics. swscale: remove alp/chr/lumSrcOffset. swscale: un-special-case yuv2yuvX16_c(). shorten: Remove stray DEBUG #define and corresponding av_dlog statement. ... Conflicts: doc/APIchanges libavcodec/ac3enc.c libavutil/avutil.h libavutil/samplefmt.c libswscale/swscale.c libswscale/swscale_internal.h libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: reindent x86 init code.Ronald S. Bultje2011-06-071-35/+35
| |
| * swscale: extract SWS_FULL_CHR_H_INT conditional into init code.Ronald S. Bultje2011-06-071-0/+6
| |
| * swscale: un-special-case yuv2yuvX16_c().Ronald S. Bultje2011-06-071-1/+4
| | | | | | | | | | Make yuv2yuvX16_c a function pointer for yuv2yuvX(), so that the function pointer becomes bitdepth-independent.
* | swscale: override the lack of the accurate rounding flag when needed for dither.Michael Niedermayer2011-06-051-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-043-161/+187
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) build: simplify commands for clean target swscale: split swscale.c in unscaled and generic conversion routines. swscale: cosmetics. swscale: integrate (literally) swscale_template.c in swscale.c. swscale: split out x86/swscale_template.c from swscale.c. swscale: enable hScale_altivec_real. swscale: split out ppc _template.c files from main swscale.c. swscale: remove indirections in ppc/swscale_template.c. swscale: split out unscaled altivec YUV converters in their own file. mpegvideoenc: fix multislice fate tests with threading disabled. mpegts: Wrap #ifdef DEBUG and av_hex_dump_log() combination in a macro. build: Simplify texi2html invocation through the --output option. Mark some variables with av_unused Replace avcodec_get_pix_fmt_name() by av_get_pix_fmt_name(). svq3: Check negative mb_type to fix potential crash. svq3: Move svq3-specific fields to their own context. rawdec: initialize return value to 0. Remove unused get_psnr() prototype rawdec: don't leak option strings. bktr: get default framerate from video standard. ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: split out x86/swscale_template.c from swscale.c.Ronald S. Bultje2011-06-033-161/+187
| |
* | In libswscale, use all lines when converting from 422p to rgb with mmx, ↵Baptiste Coudurier2011-06-031-14/+11
| | | | | | | | | | | | improve quality. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale: dither for planar yuv outputsMichael Niedermayer2011-06-021-26/+38
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master' into masterMichael Niedermayer2011-05-292-185/+170
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (27 commits) ac3enc: fix LOCAL_ALIGNED usage in count_mantissa_bits() ac3dsp: do not use the ff_* prefix when referencing ff_ac3_bap_bits. ac3dsp: fix loop condition in ac3_update_bap_counts_c() ARM: unbreak build ac3enc: modify mantissa bit counting to keep bap counts for all values of bap instead of just 0 to 4. ac3enc: split mantissa bit counting into a separate function. ac3enc: store per-block/channel bap pointers by reference block in a 2D array rather than in the AC3Block struct. get_bits: add av_unused tag to cache variable sws: replace all long with int. ARM: aacdec: fix constraints on inline asm ARM: remove unnecessary volatile from inline asm ARM: add "cc" clobbers to inline asm where needed ARM: improve FASTDIV asm ac3enc: use LOCAL_ALIGNED macro APIchanges: fill in git hash for av_get_pix_fmt_name (0420bd7). lavu: add av_get_pix_fmt_name() convenience function cmdutils: remove OPT_FUNC2 swscale: fix crash in bilinear scaling. vpxenc: add VP8E_SET_STATIC_THRESHOLD mapping webm: support stereo videos in matroska/webm muxer ... Conflicts: Changelog cmdutils.c cmdutils.h doc/APIchanges doc/muxers.texi ffmpeg.c ffplay.c libavcodec/ac3enc.c libavcodec/ac3enc_float.c libavcodec/avcodec.h libavcodec/get_bits.h libavcodec/libvpxenc.c libavcodec/version.h libavdevice/libdc1394.c libavformat/matroskaenc.c libavutil/avutil.h libswscale/rgb2rgb.c libswscale/swscale.c libswscale/swscale_template.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * sws: replace all long with int.Anton Khirnov2011-05-282-107/+107
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * swscale: fix crash in bilinear scaling.Ronald S. Bultje2011-05-281-78/+63
| |
| * swscale: Remove unused variables in x86 code.Diego Biurrun2011-05-271-4/+0
| | | | | | | | | | | | | | libswscale/x86/swscale_template.c:2072: warning: unused variable ‘canMMX2BeUsed’ libswscale/x86/swscale_template.c:2145: warning: unused variable ‘canMMX2BeUsed’ libswscale/x86/swscale_template.c:2209: warning: unused variable ‘chrVPixBuf’ libswscale/x86/swscale_template.c:2237: warning: unused variable ‘chrVSrcPtr’
| * swscale: fix build with --disable-swscale-alpha.Ronald S. Bultje2011-05-271-4/+4
| |
| * swscale: fix non-bitexact yuv2yuv[X2]() MMX/MMX2 functions.Ronald S. Bultje2011-05-271-4/+6
| |
| * swscale: fix compile on x86-32.Ronald S. Bultje2011-05-261-1/+1
| |
| * swscale: split chroma buffers into separate U/V planes.Ronald S. Bultje2011-05-261-160/+220
| | | | | | | | Preparatory step to implement support for sizes > VOFW.
| * rgb2rgb: remove duplicate mmx/mmx2/3dnow/sse2 functions.Ronald S. Bultje2011-05-262-35/+41
| | | | | | | | | | | | | | Many functions have such a prefix, but do not actually use any instructions or features from that set, thus giving the false impression that swscale is highly optimized for a particular system, whereas in reality it is not.
| * swscale: reindent h[cy]scale_fast() and updateDitherTables().Ronald S. Bultje2011-05-261-131/+132
| |
| * swscale: reformat x86/swscale_template.c.Ronald S. Bultje2011-05-261-852/+868
| | | | | | | | | | | | Interleave macros and code so that it's easier to find the actual code that belongs to a function. Also reindent where appropriate and remove dead code.
| * swscale: remove duplicate mmx/mmx2 functions if they are identical.Ronald S. Bultje2011-05-261-1/+12
| |
| * swscale: remove if (c->dstFormat) branch from yuv2packed[12X]().Ronald S. Bultje2011-05-261-136/+234
| | | | | | | | | | This allows cutting up the function in much smaller and easier- to-maintain chunks.
| * swscale: remove if(full_chr_int) from yuv2packed1().Ronald S. Bultje2011-05-261-5/+0
| | | | | | | | | | | | If that flag is set, swScale() already proxies the call to yuv2rgbXinC_full(). Therefore, this flag is never set when yuv2packed1() is called.
| * swscale: remove if(accurate_rnd) branch from functions.Ronald S. Bultje2011-05-261-16/+42
| |
| * swscale: Remove commented-out printf cruft.Diego Biurrun2011-05-261-1/+0
| |
| * swscale: Eliminate rgb24toyv12_c() duplication.Michael Niedermayer2011-05-261-46/+1
| | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | swscale: Commits that could not be pulled earlier due to bugs #2Michael Niedermayer2011-05-292-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 5a5a0f161359ca6c3fd03eac88a57bd026b8bc1d Author: Diego Biurrun <diego@biurrun.de> Date: Fri May 27 19:46:39 2011 +0200 swscale: Remove unused variables in x86 code. libswscale/x86/swscale_template.c:2072: warning: unused variable ‘canMMX2BeUsed’ libswscale/x86/swscale_template.c:2145: warning: unused variable ‘canMMX2BeUsed’ libswscale/x86/swscale_template.c:2209: warning: unused variable ‘chrVPixBuf’ libswscale/x86/swscale_template.c:2237: warning: unused variable ‘chrVSrcPtr’ commit 389e2000ebc299b9da24f7e5faf9a68a88f9ee7c Author: Ronald S. Bultje <rsbultje@gmail.com> Date: Fri May 27 12:23:32 2011 -0400 swscale: delay allocation of formatConvBuffer(). That means it won't be allocated when not needed. Alongside this, it fixes valgrind/fate-detected memory leaks. commit f327bfa6dcdbce4593213c30a328d8aaf7a4b86b Author: Ronald S. Bultje <rsbultje@gmail.com> Date: Fri May 27 11:36:43 2011 -0400 swscale: fix build with --disable-swscale-alpha. commit 9f5d45025e8df9d5f39832caad16b94cb6ac11c5 Author: Ronald S. Bultje <rsbultje@gmail.com> Date: Fri May 27 09:28:38 2011 -0400 swscale: fix non-bitexact yuv2yuv[X2]() MMX/MMX2 functions.
* | Commits that could not be pulled earlier due to bugs.Michael Niedermayer2011-05-291-163/+221
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 93681fbd5082a3af896b7a730dacdd27a3052406 Author: Ronald S. Bultje <rsbultje@gmail.com> Date: Thu May 26 11:32:32 2011 -0400 swscale: fix compile on ppc. commit e758573a887cfb1155e81499ca54f433127cf24e Author: Ronald S. Bultje <rsbultje@gmail.com> Date: Thu May 26 10:36:47 2011 -0400 swscale: fix compile on x86-32. commit 0f4eb8b04341081591bf401eaa2c07d6bc3ff52e Author: Ronald S. Bultje <rsbultje@gmail.com> Date: Thu May 26 09:17:52 2011 -0400 swscale: remove VOF/VOFW. commit b4a224c5e4109cb2cca8bac38628673d685fe763 Author: Ronald S. Bultje <rsbultje@gmail.com> Date: Wed May 25 14:30:09 2011 -0400 swscale: split chroma buffers into separate U/V planes. Preparatory step to implement support for sizes > VOFW.
* | rgb2rgb: remove duplicate mmx/mmx2/3dnow/sse2 functions.Ronald S. Bultje2011-05-282-35/+41
| | | | | | | | | | | | | | Many functions have such a prefix, but do not actually use any instructions or features from that set, thus giving the false impression that swscale is highly optimized for a particular system, whereas in reality it is not.
* | swscale: reindent h[cy]scale_fast() and updateDitherTables().Ronald S. Bultje2011-05-281-131/+132
| |
* | swscale: reformat x86/swscale_template.c.Ronald S. Bultje2011-05-281-851/+868
| | | | | | | | | | | | Interleave macros and code so that it's easier to find the actual code that belongs to a function. Also reindent where appropriate and remove dead code.
* | swscale: remove duplicate mmx/mmx2 functions if they are identical.Ronald S. Bultje2011-05-281-2/+13
| |
* | swscale: remove if (c->dstFormat) branch from yuv2packed[12X]().Ronald S. Bultje2011-05-281-136/+234
| | | | | | | | | | This allows cutting up the function in much smaller and easier- to-maintain chunks.
* | swscale: remove if(full_chr_int) from yuv2packed1().Ronald S. Bultje2011-05-281-5/+0
| | | | | | | | | | | | If that flag is set, swScale() already proxies the call to yuv2rgbXinC_full(). Therefore, this flag is never set when yuv2packed1() is called.
* | swscale: remove if(accurate_rnd) branch from functions.Ronald S. Bultje2011-05-281-16/+42
| |
* | swscale: Remove commented-out printf cruft.Diego Biurrun2011-05-281-1/+0
| |
* | swscale: Do not loose precission on yuv values after rgb->yuv.Michael Niedermayer2011-05-262-25/+25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>