Commit Graph

137 Commits

Author SHA1 Message Date
Stefano Sabatini
e1197b9e17 swscale: remove sws_format_name()
Use av_get_pix_fmt_name() instead.
2011-05-30 09:07:43 +02:00
Michael Niedermayer
5a35cef4b1 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  ARM: enable UAL syntax in asm.S
  v4l2: don't leak video standard string on error.
  swscale: Remove disabled code.
  avfilter: Surround function only used in debug mode by appropriate #ifdef.
  vf_crop: Replace #ifdef DEBUG + av_log() by av_dlog().
  build: remove BUILD_ROOT variable
  vp8: use av_clip_uintp2() where possible

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-30 01:29:11 +02:00
Diego Biurrun
06b5facd4b swscale: Remove disabled code. 2011-05-29 14:32:08 +02:00
Michael Niedermayer
034fc7bf12 Merge remote-tracking branch 'qatar/master'
* 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-25 06:32:45 +02:00
Ronald S. Bultje
e66149e714 swscale: force --enable-runtime-cpudetect and remove SWS_CPU_CAPS_*. 2011-05-24 10:03:26 -04:00
Peter Ross
1afbae100b libswcale: PIX_FMT_BGR48LE and PIX_FMT_BGR48BE scaler implementation
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-04-28 07:25:27 +02:00
Peter Ross
3e2523db20 libswcale: PIX_FMT_BGR48LE and PIX_FMT_BGR48BE scaler implementation 2011-03-26 13:24:32 +11:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Benoit Fouet
453d28af60 Change the type of Y table to pointer to void in fill_table().
This fixes warnings about wrong type being used, e.g.:
libswscale/yuv2rgb.c: In function ‘ff_yuv2rgb_c_init_tables’:
libswscale/yuv2rgb.c:778: warning: passing argument 4 of ‘fill_table’ from incompatible pointer type
libswscale/yuv2rgb.c:598: note: expected ‘uint8_t *’ but argument is of type ‘uint16_t *’

Originally committed as revision 31722 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-07-12 08:35:20 +00:00
Måns Rullgård
6a01eab73c Add av_ prefix to bswap macros
Originally committed as revision 31679 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-07-10 22:12:38 +00:00
Stefano Sabatini
0093ac5b9f Move internal scale context fields initialization from
sws_setColorspaceDetails() to ff_yuv2rgb_c_init_tables().

Allow to factorize duplicated code.

Originally committed as revision 31300 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-06-01 11:30:07 +00:00
Diego Biurrun
f4ea7c8911 alternative LGPL-licensed, MMX-optimized YUV to RGB conversion routines
written by Kostya Shishkov

Originally committed as revision 31135 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-05-04 09:11:01 +00:00
Diego Biurrun
f25b1c4b6b HAVE_MMX2 implies HAVE_MMX, so checking the latter is enough.
Originally committed as revision 30961 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-03-26 07:57:54 +00:00
Janusz Krzysztofik
a4e441301d Add support to BGR444/RGB444 foreign endian output in libswscale.
Patch by Janusz Krzysztofik |jkrzyszt ^ tis icnet pl|.

Originally committed as revision 30855 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-03-06 11:27:31 +00:00
Benoit Fouet
124cb45137 Cosmetics: fix vertical alignment.
Originally committed as revision 30842 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-03-05 08:41:35 +00:00
Janusz Krzysztofik
601949b898 libswscale: Extend the unaccelerated path of the unscaled yuv2rgb special
converter with support for rgb444 output format.
Patch by Janusz Krzysztofik jkrzyszt chez tis icnet pl

Originally committed as revision 30841 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-03-05 08:32:54 +00:00
Alexis Ballier
1379b58482 Support BGR555, BGR565, RGB555 and RGB565 foreign endian output in
libswscale.

Patch by Alexis Ballier, alexis D ballier A gmail

Originally committed as revision 30840 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-03-04 16:57:04 +00:00
Stefano Sabatini
8ebed38e7a Apply consistency nit.
Originally committed as revision 30729 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-02-25 21:12:38 +00:00
David Conrad
3f3dc76cb1 Add function to translate SWS_CS_* to coefficient array
Originally committed as revision 30513 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-02-05 16:09:03 +00:00
Stefano Sabatini
30b6147521 Use av_get_bits_per_pixel() for computing the bits per pixel of the
source and destination format, cache those values in the newly added
SwsContext:srcFormatBpp and SwsContext:dstFormatBpp fields, and remove
the fmt_depth() function.

Originally committed as revision 30419 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-24 12:55:05 +00:00
Zuxy Meng
d5206d3dd6 User friendly warning message that gives out names of source and target formats
Originally committed as revision 30370 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-19 05:21:17 +00:00
Zuxy Meng
3c52d4849f Define out currently unused static functions.
Originally committed as revision 30365 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-18 08:42:04 +00:00
Zuxy Meng
a959e24780 Const correctness for src pointer. Remove all constness related warnings in
libswscale.

Originally committed as revision 30306 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2010-01-15 08:51:51 +00:00
Ramiro Polla
dd68318cee Cosmetics:
- Place curly brackets in the same line as while/for/if/switch/else/do;
- Place curly brackets at column 0 in the next line starting a function.

Originally committed as revision 29523 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-16 21:11:28 +00:00
Kostya Shishkov
df226e6369 Remove 'offset' argument from PUTRGB* macros since it's unneeded and caused
pixel swapping during some YUV2RGB conversions.

Originally committed as revision 29483 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-08-09 15:04:17 +00:00
Diego Biurrun
29ce043374 The AltiVec code in libswscale no longer is under GPL.
Remove one erroneous preprocessor check for CONFIG_GPL in the AltiVec code.

Originally committed as revision 29412 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-07-05 20:10:59 +00:00
Kostya Shishkov
68e7f4828d YUV into RGB48 BE/LE conversion support
Originally committed as revision 29342 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-06-02 12:30:11 +00:00
Cédric Schieli
b78c8e2103 Remove useless duplicated code in yuv2rgb_c_32, yuva2rgba_c and yuva2argb_c
Originally committed as revision 29240 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-04-27 14:25:44 +00:00
Ramiro Polla
befa8e665c Move yuv2rgb code to subdirs.
Originally committed as revision 29063 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-03-26 01:30:10 +00:00
Cédric Schieli
0928f1eb53 Simpler and more elegant fix to the x86_32/OSX+PIC build failure
Originally committed as revision 29046 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-03-24 07:09:19 +00:00
Cédric Schieli
986b6f8f73 Fix build failure on x86_32 Mac OS X with PIC enabled
Originally committed as revision 29022 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-03-21 12:16:32 +00:00
Cédric Schieli
3acd545f0c Add YUVA420P -> RGBA/BGRA/ARGB/ABGR unscaled converters
Originally committed as revision 29010 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-03-20 14:14:28 +00:00
Ramiro Polla
d0ce212a7a Do not assume long is same width as x86 register.
Originally committed as revision 28992 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-03-18 17:07:30 +00:00
Diego Biurrun
780daf2b09 Consistently use ff_ prefixes for internal symbols.
Originally committed as revision 28988 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-03-18 08:06:08 +00:00
Diego Biurrun
852ca0e57d Fix ff_bfin_yuv2rgb_get_func_ptr() vs. sws_ff_bfin_yuv2rgb_get_func_ptr() name
mismatch. The function is now called sws_yuv2rgb_get_func_ptr_bfin().

Originally committed as revision 28982 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-03-17 12:05:56 +00:00
Cédric Schieli
9a10a0767c Add an alpha parameter to the YUV2RGBFUNC macro to ease the upcoming yuva2rgb patch
Originally committed as revision 28978 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-03-16 20:04:32 +00:00
Reimar Döffinger
f78b9c0656 Fix braindead and broken way to calculate abase, fixes regression tests on
big-endian systems.

Originally committed as revision 28773 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-03-01 11:33:10 +00:00
Cédric Schieli
f8a138be52 When converting from a non alpha format to an alpha format, defaults
Originally committed as revision 28756 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-02-28 08:01:52 +00:00
Diego Biurrun
1e5304c69e Rename yuv2rgb2.c --> yuv2rgb.c.
Originally committed as revision 28723 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-02-24 22:40:20 +00:00
Diego Biurrun
876a4dc013 Remove GPL version of yuv2rgb.c that has been replaced by an LGPL substitute.
Originally committed as revision 28716 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-02-24 14:50:28 +00:00
Kostya Shishkov
e2a004ad4e Prefix visible YUV2RGB functions with sws_
Originally committed as revision 28496 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-02-09 14:31:53 +00:00
Kostya Shishkov
fa58ba15f8 Give better name to Inverse_Table_6_9
Originally committed as revision 28495 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-02-09 14:17:30 +00:00
Diego Biurrun
2907deed0f Remove file name from file headers.
It provides no useful information and breaks on renames.

Originally committed as revision 28494 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-02-09 11:19:19 +00:00
Diego Biurrun
f4406ec177 HAVE_3DNOW --> HAVE_AMD3DNOW to sync with latest configure changes.
Originally committed as revision 28358 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-01-25 19:58:33 +00:00
Aurelien Jacobs
b63f641e9b Change semantic of CONFIG_*, HAVE_* and ARCH_*.
They are now always defined to either 0 or 1.

Originally committed as revision 28311 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-01-14 00:13:56 +00:00
Diego Pettenò
d0b69b2855 Mark dither_2x2_{8,4} static to swscale.c
These two tables are not used outside swscale.c even though they are
declared also in yuv2rgb.c.

Originally committed as revision 27736 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-10-09 11:12:38 +00:00
Carl Eugen Hoyos
88e2a9aebc Remove b5Dither, g5Dither and r5Dither from libswscale.
Originally committed as revision 27718 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-10-04 18:50:39 +00:00
Carl Eugen Hoyos
92c7b4713d Remove g6Dither from libswscale.
Originally committed as revision 27715 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-10-04 16:40:35 +00:00
Michael Niedermayer
45e18be87d Move dither tables from yuv2rgb to swscale, they have been written by me and
can be used under LGPL.

Originally committed as revision 27609 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-09-14 18:00:49 +00:00
Michael Niedermayer
85a51e6bd5 Fix chroma yuv->rgb tables for jpeg style yuv, this was missed as it
only affects the C code while mmx uses different tables.

Originally committed as revision 27576 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-09-11 00:09:01 +00:00
Michael Niedermayer
9990e4269c Support PIX_FMT_RGB32_1 and PIX_FMT_BGR32_1.
Fixes issue248.

Originally committed as revision 27522 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-09-04 21:59:15 +00:00
Michael Niedermayer
688b5e8020 Fix rgb15/16 vs. bgr part1.
Originally committed as revision 27516 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-09-04 18:14:29 +00:00
Diego Biurrun
8a3227968c spelling/grammar/wording overhaul
Originally committed as revision 27190 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-07-04 13:49:45 +00:00
Luca Barbato
5478959b8f Build sparc arch specific code using the Makefile
Originally committed as revision 26670 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-05-04 20:19:33 +00:00
Diego Biurrun
5202ed315b Fix wrong #endif comment.
Originally committed as revision 26300 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-03-29 15:51:05 +00:00
Diego Biurrun
bfffdb81c2 Classify mlib as a configurable option, not as a hardware feature.
Originally committed as revision 26275 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-03-25 21:30:46 +00:00
Diego Biurrun
a04e32407d Mark Y variable in EPILOG macro as av_unused to avoid unused variable warnings.
Originally committed as revision 26220 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-03-11 09:01:38 +00:00
Carl Eugen Hoyos
0cb2559445 Discard two symbols from libswscale.
Originally committed as revision 26060 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-02-22 08:08:19 +00:00
Carl Eugen Hoyos
ae797914dd Make dither4 & dither8 const.
Originally committed as revision 25967 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-02-09 22:57:37 +00:00
Reimar Döffinger
5802683a97 Make some assembler constants global instead of declaring them multiple times.
Originally committed as revision 25910 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-01-29 14:58:10 +00:00
Reimar Döffinger
d334c7c237 Use DECLARE_ASM_CONST where possible in libswscale code
Originally committed as revision 25903 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2008-01-28 14:38:11 +00:00
Diego Biurrun
721d5e3b95 Revert wrong ARCH_BFIN --> HAVE_BFIN change.
Originally committed as revision 24627 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-09-27 08:00:22 +00:00
Marc Hoffman
49488d12bf renaming ARCH_BFIN to HAVE_BFIN
Originally committed as revision 24309 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-08-31 14:57:50 +00:00
Denes Balatoni
90c1d7b400 UltraSPARC VIS yuv2rgb
patch by Denes Balatoni: [dbalatoni interware hu]
original thread: [FFmpeg-devel] [PATCH] UltraSPARC VIS yuv2rgb third try
date: 07/17/2007 08:35 PM

Originally committed as revision 23825 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-07-19 07:24:43 +00:00
Diego Biurrun
fc69cc615e Remove redundant "all rights reserved" statement, OKed by Walken.
Originally committed as revision 23791 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-07-16 17:48:02 +00:00
Diego Biurrun
cabc90c2ce typo
Originally committed as revision 23780 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-07-14 14:39:51 +00:00
Diego Biurrun
7ed8ccb50e ISO8859-1 --> UTF-8
Originally committed as revision 23752 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-07-09 18:55:31 +00:00
Diego Biurrun
c1578479d3 Group all copyright and author notices together.
Originally committed as revision 23721 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-07-05 10:18:27 +00:00
Reimar Döffinger
1a18eaf760 Fix yuv2rgb C functions to work for widths divisible by 4 but not by 8
Originally committed as revision 23508 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-06-08 07:49:59 +00:00
Carl Eugen Hoyos
2db27aadcb rename attribute_unused to av_unused as it is declared in common.h
patch by Carl Eugen Hoyos cehoyos chez ag or at
original thread: [FFmpeg-devel] [PATCH] attribute_unused -> av_unused
date: 05/29/2007 01:23 PM

Originally committed as revision 23418 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-05-30 09:33:09 +00:00
Marc Hoffman
d3f3eea92d Blackfin optimized YUV420 to RGB CSC Color Space Converters.
YUV2 -> RGB BGR for 565, 555 and 888 a.k.a. 24bit color.
Speed-up compared to C version compiled with -O3  187.28%
Patch by Marc Hoffman %mmh A pleasantst P com%
Original thread:
Date: May 9, 2007 2:46 AM
Subject: [FFmpeg-devel] PATCH BlackFin yuv2rgb color space conversion

Originally committed as revision 23307 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-05-13 19:22:32 +00:00
Diego Biurrun
428098165d cosmetics attack, part III: Remove all tabs and prettyprint/reindent the code.
Originally committed as revision 23175 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-29 21:36:43 +00:00
Diego Biurrun
6a4970abd1 cosmetics: Remove trailing whitespace.
Originally committed as revision 23147 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-04-26 23:07:11 +00:00
Michael Niedermayer
edf97a75f9 fix full range (jpeg yuv) chroma
Originally committed as revision 22713 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-03-18 12:31:53 +00:00
Luca Abeni
2d529db50f Pass a context to av_log(), when possible
Originally committed as revision 21999 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-01-23 13:41:45 +00:00
Diego Biurrun
2c86a5786a Fix license headers and FSF postal address.
Originally committed as revision 21994 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-01-22 01:21:36 +00:00
Luca Abeni
789237cad0 Mark some variables as possibly unused to avoid warnings
Originally committed as revision 21775 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-12-26 17:59:28 +00:00
Luca Abeni
628bc5e862 Add some explicit casts to avoid "assignment from incompatible pointer type"
warnings

Originally committed as revision 21774 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-12-26 17:41:38 +00:00
Luca Abeni
44060a7391 Add some other casts, to remove void pointers arithmetic
Originally committed as revision 21773 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-12-26 16:28:34 +00:00
Diego Biurrun
3d6a30d948 Use common define for x86_32 and x86_64.
Originally committed as revision 20592 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-11-01 18:36:20 +00:00
Aurelien Jacobs
a90ce38634 make some global var static (fix a build failure with shared lib on x86_64)
Originally committed as revision 20024 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-03 23:51:32 +00:00
Luca Abeni
e9e12f0e11 Remove the dependency of libswscale on img_format.h
Originally committed as revision 19878 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-09-17 15:15:13 +00:00
Diego Biurrun
db3924f1fd Explicitly include libmpcodecs/img_format.h and libvo/fastmemcpy.h.
Originally committed as revision 19437 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-08-18 13:58:03 +00:00
Diego Biurrun
dbdae6ec54 Do not assemble MMX, MMX2 or 3DNOW code unconditionally on X86 and X86_64.
Originally committed as revision 19339 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-08-05 10:00:54 +00:00
Diego Biurrun
6979600818 Comment some #endif lines.
Originally committed as revision 19211 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-07-28 09:07:09 +00:00
Luca Abeni
94c4def23c Use libavutil in libswscale, and allow it to be built out of the mplayer tree
Originally committed as revision 19148 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-07-20 12:13:57 +00:00
Luca Abeni
73435f006b Move postproc ---> libswscale
Originally committed as revision 18866 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-06-30 12:00:31 +00:00