aboutsummaryrefslogtreecommitdiff
path: root/libswscale/rgb2rgb.h
AgeCommit message (Collapse)Author
2012-01-14Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: FATE: add tests for targa ARM: fix Thumb-mode simple_idct_arm ARM: 4-byte align start of all asm functions rgb2rgb: rgb12to15() swscale-test: fix stack overread. swscale: fix invalid conversions and memory problems. cabac: split cabac.h into declarations and function definitions cabac: Mark ff_h264_mps_state array as static, it is only used within cabac.c. cabac: Remove ff_h264_lps_state array. Conflicts: libswscale/rgb2rgb.h libswscale/swscale_unscaled.c tests/fate/image.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-12rgb2rgb: rgb12to15()Paul B Mahol
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2012-01-11rgb2rgb: rgb12tobgr12()Paul B Mahol
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2012-01-10rgb2rgb: remove unused bgr8torgb8()Paul B Mahol
RGB8 and BGR8 are paletted formats now.
2012-01-10rgb2rgb: rgb12tobgr12()Paul B Mahol
2012-01-10Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: fate: Add tests for more AAC features. aacps: Add missing newline in error message. fate: Add tests for vc1/wmapro in ism. aacdec: Add a fate test for 5.1 channel SBR. aacdec: Turn off PS for multichannel files that use PCE based configs. cabac: remove put_cabac_u/ueg from cabac-test. swscale: RGB4444 and BGR444 input FATE: add test for xWMA demuxer. FATE: add test for SMJPEG demuxer and associated IMA ADPCM audio decoder. mpegaudiodec: optimized iMDCT transform mpegaudiodec: change imdct window arrangment for better pointer alignment mpegaudiodec: move imdct and windowing function to mpegaudiodsp mpegaudiodec: interleave iMDCT buffer to simplify future SIMD implementations swscale: convert yuy2/uyvy/nv12/nv21ToY/UV from inline asm to yasm. FATE: test to exercise WTV demuxer. mjpegdec: K&R formatting cosmetics swscale: K&R formatting cosmetics for code examples swscale: K&R reformatting cosmetics for header files FATE test: cvid-grayscale; ensures that the grayscale Cinepak variant is exercised. Conflicts: libavcodec/cabac.c libavcodec/mjpegdec.c libavcodec/mpegaudiodec.c libavcodec/mpegaudiodsp.c libavcodec/mpegaudiodsp.h libavcodec/mpegaudiodsp_template.c libavcodec/x86/Makefile libavcodec/x86/imdct36_sse.asm libavcodec/x86/mpegaudiodec_mmx.c libswscale/swscale-test.c libswscale/swscale.c libswscale/swscale_internal.h libswscale/x86/swscale_template.c tests/fate/demux.mak tests/fate/microsoft.mak tests/fate/video.mak tests/fate/wma.mak tests/ref/lavfi/pixfmts_scale Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-08swscale: K&R reformatting cosmetics for header filesDiego Biurrun
2011-08-04lsws: remove deprecated and unused stuff after the 0->1 major bumpStefano Sabatini
2011-05-29Merge remote-tracking branch 'qatar/master' into masterMichael Niedermayer
* 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>
2011-05-28sws: replace all long with int.Anton Khirnov
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-05-26Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (32 commits) doc: create separate section for audio encoders swscale: Remove orphaned, commented-out function declaration. swscale: Eliminate rgb24toyv12_c() duplication. Remove h263_msmpeg4 from MpegEncContext. APIchanges: Fill in git hash for fps_probe_size (30315a8) avformat: Add fpsprobesize as an AVOption. avoptions: Return explicitly NAN or {0,0} if the option isn't found rtmp: Reindent rtmp: Don't try to do av_malloc(0) tty: replace AVFormatParameters.sample_rate abuse with a private option. Fix end time of last chapter in compute_chapters_end ffmpeg: get rid of useless AVInputStream.nb_streams. ffmpeg: simplify managing input files and streams ffmpeg: purge redundant AVInputStream.index. lavf: deprecate AVFormatParameters.channel. libdc1394: add a private option for channel. dv1394: add a private option for channel. v4l2: reindent. v4l2: add a private option for channel. lavf: deprecate AVFormatParameters.standard. ... Conflicts: doc/APIchanges doc/encoders.texi ffmpeg.c libavdevice/alsa-audio.h libavformat/version.h libavutil/opt.c libswscale/rgb2rgb.h libswscale/rgb2rgb_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-26swscale: Remove orphaned, commented-out function declaration.Diego Biurrun
2011-05-26swscale: Eliminate rgb24toyv12_c() duplication.Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-05-25swscale: remove duplicatiopn of rgb24toyv12_c()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-25Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (22 commits) configure: enable memalign_hack automatically when needed swscale: unbreak the build on non-x86 systems. swscale: remove if(bitexact) branch from functions. swscale: remove if(canMMX2BeUsed) conditional. swscale: remove swScale_{c,MMX,MMX2} duplication. swscale: use emms_c(). Move emms_c() from libavcodec to libavutil. tiff: set palette in the context when specified in TIFF_PAL tag rtsp: use strtoul to parse rtptime and seq values. pgssubdec: fix incorrect colors. dvdsubdec: fix incorrect colors. ape: Allow demuxing of files with metadata tags. swscale: remove dead macro WRITEBGR24OLD. swscale: remove AMD3DNOW "optimizations". swscale: remove duplicate code in ppc/ subdirectory. swscale: remove duplicated x86/ functions. swscale: force --enable-runtime-cpudetect and remove SWS_CPU_CAPS_*. vsrc_buffer.h: add file doxy vsrc_buffer: tweak error message in init() msmpeg4: reindent. ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-25Merge swscale bloatupMichael Niedermayer
This will be cleaned up in the next merge Authorship / merged commits: commit f668afd4896ee65683619b6f165dda4cdd46766f Author: Janne Grunau <janne-libav@jannau.net> Date: Fri Apr 15 09:12:34 2011 +0200 swscale: fix "ISO C90 forbids mixed declarations and code" warning only hit with --enable-runtime-cpudetect commit 7f2ae5c7af374dfe254195a9375974a2ff9395a7 Author: Janne Grunau <janne-libav@jannau.net> Date: Fri Apr 15 02:09:44 2011 +0200 swscale: fix compilation with --enable-runtime-cpudetect commit b6cad3df822969b31bb93eaf677e52a72416bc97 Author: Janne Grunau <janne-libav@jannau.net> Date: Fri Apr 15 00:31:04 2011 +0200 swscale: correct include path to fix ppc altivec build commit 6216fc70b74e01a5272085329aa92f5ac797f9cf Author: Luca Barbato <lu_zero@gentoo.org> Date: Thu Apr 14 22:03:45 2011 +0200 swscale: simplify rgb2rgb templating MMX is always built. Drop the ifdefs commit 33a0421bbaa64f4e9c3d852b7f225ede8dad1388 Author: Josh Allmann <joshua.allmann@gmail.com> Date: Wed Apr 13 20:57:32 2011 +0200 swscale: simplify initialization code Simplify the fallthrough case when no accelerated functions can be initialized. commit 735bf1951171a1e0ee4292e84a1b1beac45dd0ab Author: Josh Allmann <joshua.allmann@gmail.com> Date: Wed Apr 13 20:57:31 2011 +0200 swscale: further cleanup swscale.c Move x86-specific constants out of swscale.c commit 86330b4c9258d5e583c0db033d1e68f46443307c Author: Luca Barbato <lu_zero@gentoo.org> Date: Wed Apr 13 20:57:30 2011 +0200 swscale: partially move the arch specific code left PPC and x86 code is split off from swscale_template.c. Lots of code is still duplicated and should be removed later. Again uniformize the init system to be more similar to the dsputil one. Unset h*scale_fast in the x86 init in order to make the output consistent with the previous status. Thanks to Josh for spotting it. commit c0038328830d7b341c28d7c99b0236a33617fd21 Author: Luca Barbato <lu_zero@gentoo.org> Date: Wed Apr 13 20:57:29 2011 +0200 swscale: move away x86 specific code from rgb2rgb Keep only the plain C code in the main rgb2rgb.c and move the x86 specific optimizations to x86/rgb2rgb.c Change the initialization pattern a little so some of it can be factorized to behave more like dsputils. Conflicts: libswscale/rgb2rgb.c libswscale/swscale_template.c
2011-05-24swscale: force --enable-runtime-cpudetect and remove SWS_CPU_CAPS_*.Ronald S. Bultje
2011-04-19sws: remove disabled cruft.Anton Khirnov
2011-04-14swscale: move away x86 specific code from rgb2rgbLuca Barbato
Keep only the plain C code in the main rgb2rgb.c and move the x86 specific optimizations to x86/rgb2rgb.c Change the initialization pattern a little so some of it can be factorized to behave more like dsputils.
2011-03-19Replace FFmpeg with Libav in licence headersMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2010-09-12rgb2rgb: replace shuffle_bytes_2103() by optimized rgb32tobgr32()Ramiro Polla
Originally committed as revision 32190 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-06-01deprecate palette8topacked32 in favor of public API functions ↵Reinhard Tartler
sws_convertPalette8ToPacked32 and -24 additionallym deprecate palette8torgb16 and its bgr variant without replacement. These functions are not meant to be used by applications. Discussed at: http://comments.gmane.org/gmane.comp.video.ffmpeg.devel/109340 Originally committed as revision 31301 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-06-01remove palette8torgb15 and palette8tobgr15Reinhard Tartler
They contain exactly the same code as their 16bit variants, so this is effectively code de-duplication. Originally committed as revision 31298 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-02-03Implement shuffle_bytes_abcd() functions and use them for shufflingStefano Sabatini
bytes when converting between RGB32 variants. In particular fix the argb -> rgba and abgr -> bgra conversions. See the thread: Subject: [FFmpeg-devel] [RFC] RGB32 / BGR32 ethernal bug Date: Tue, 26 Jan 2010 01:06:18 +0100 Originally committed as revision 30501 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-15Const correctness for src pointer. Remove all constness related warnings inZuxy Meng
libswscale. Originally committed as revision 30306 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-16Indent libswscale:Ramiro Polla
- Use 4 spaces throughout for indentation; - Fix inconsistent indentation; - Indent function calls and declarations aligning arguments on multiple lines to the column after the opening parentheses; - Align asm code to the column 4 spaces after the call to __asm__(); - Align cases in switch statements to the same column as "switch". Originally committed as revision 29522 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-03-19Unscaled converters forMichael Niedermayer
YUYV->YUV420P YUYV->YUV422P UYVY->YUV420P UYVY->YUV422P Originally committed as revision 28997 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-12-03Delete unnecessary 'extern' keywords.Diego Biurrun
Originally committed as revision 28082 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-10-23Fix broken palette8to*.Vitor Sessak
Originally committed as revision 27817 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-09-10spelling/wording cosmeticsDiego Biurrun
Originally committed as revision 27563 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-09-05enable yuv422p to uyvy converterBaptiste Coudurier
Originally committed as revision 27527 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-09-04rgb vs bgr fix for the unscaled converters.Michael Niedermayer
Originally committed as revision 27518 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-08-31Change headers' guardnames consistently with r15120.Stefano Sabatini
Originally committed as revision 27499 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-07-04spelling/grammar/wording overhaulDiego Biurrun
Originally committed as revision 27190 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-10-181l: Update wrong #endif comment.Diego Biurrun
Originally committed as revision 24801 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-10-18Add FFMPEG_ prefix to all multiple inclusion guards.Diego Biurrun
Originally committed as revision 24800 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-07-05license header consistency cosmeticsDiego Biurrun
Originally committed as revision 23722 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-07-02Fix 'make checkheaders'.Diego Biurrun
Originally committed as revision 23701 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-07-02Remove obsolete and misleading comment.Diego Biurrun
Originally committed as revision 23700 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-28cosmetics attack, part I: Remove all tabs and prettyprint/reindent the code.Diego Biurrun
Originally committed as revision 23158 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-26cosmetics: Remove trailing whitespace.Diego Biurrun
Originally committed as revision 23147 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-11-19Clarify that some of the non-SIMD code is now LGPLed.Luca Abeni
All the authours of such code agreed. Originally committed as revision 21045 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-07Change license headers to say 'FFmpeg' instead of 'this program'.Diego Biurrun
Originally committed as revision 20100 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-09-09Add proper GPL headers.Diego Biurrun
Originally committed as revision 19772 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-07-01Remove unneeded codeLuca Abeni
Originally committed as revision 18880 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-06-30Move postproc ---> libswscaleLuca Abeni
Originally committed as revision 18866 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 18:17:16 +0000