1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Commit Graph

237 Commits

Author SHA1 Message Date
Michael Niedermayer
dd9bdeb9f3 a small step toward 4 plane support
Originally committed as revision 22411 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-03-02 13:33:18 +00:00
Michael Niedermayer
0c84001325 copy src to prevent the user supplied argumet from being changed
Originally committed as revision 22410 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-03-02 13:32:10 +00:00
Reimar Döffinger
9340a99588 Fix a possible crash on 64 bit systems when the lumSrcPtr or chrSrcPtr
does not fit in 32 bits. The SWS_ACCURATE_RND is still broken though.

Originally committed as revision 22401 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-03-01 19:48:40 +00:00
Diego Biurrun
2bfdde2435 Remove useless conditional.
Originally committed as revision 22355 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-02-27 00:19:01 +00:00
Reimar Döffinger
adcec46a83 Add av_ prefix to clip functions
Originally committed as revision 22339 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-02-25 10:27:43 +00:00
Diego Biurrun
606f68bd10 cosmetics: typo fixes, usefuLL --> useful and aswell --> as well
Originally committed as revision 22307 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-02-22 00:18:10 +00:00
Michael Niedermayer
20da77449d negative stride and h_size-=8 fix
Originally committed as revision 22247 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-02-17 13:28:44 +00:00
Michael Niedermayer
18064f5cf3 BGR/RGB4 byte formats as input
fixing isRGB/BGR() for the byte formats

Originally committed as revision 22244 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-02-17 11:36:02 +00:00
Michael Niedermayer
e28630fc70 pal8 input
this is not optimized or anything (that is easy to add just use the existing unscaled converters if possible ...)

Originally committed as revision 22236 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-02-16 21:17:15 +00:00
Luca Barbato
94d122e96e stray fflush spotted by Aurel
Originally committed as revision 22051 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-01-28 20:38:35 +00:00
Luca Barbato
66e9de3891 Make example and test build and link correctly
Originally committed as revision 22048 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-01-28 17:52:59 +00:00
Luca Barbato
da095a23a1 av_logify
Originally committed as revision 22047 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-01-28 17:51:41 +00:00
Diego Biurrun
91f2de5e18 Simplify conditional compilation handling.
Originally committed as revision 22009 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-01-25 00:35:29 +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
Diego Biurrun
10ef990d96 cosmetics: typo pallete --> palette
Originally committed as revision 21892 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-01-13 04:32:14 +00:00
Luca Abeni
d28ef27031 deprecate sws_scale_ordered(), as it now is a duplicate of sws_scale()
Originally committed as revision 21888 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-01-12 15:45:47 +00:00
Luca Abeni
703b56fb5d Add "support for both orderings of the slices (top->down / bottom->up)"
(r15249) to sws_scale() too (until now, it only was in sws_scale_ordered())

Originally committed as revision 21887 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-01-12 15:40:08 +00:00
Luca Abeni
0dea6433fd replace some av_malloc();memset(...,0,...) sequences with av_mallocz()
Originally committed as revision 21835 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-01-06 12:11:25 +00:00
Luca Abeni
b2afecbe02 change all the occurrences of "FFMIN(FFMAX())" to clip_uint8() or clip()
Originally committed as revision 21776 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-12-26 18:08:40 +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
Luca Abeni
7d19628b14 Add some explicit casts to avoid some warnings
Originally committed as revision 21772 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-12-26 16:21:13 +00:00
Luca Abeni
9effd94abc Remove some void pointers arithmetic
Originally committed as revision 21771 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-12-26 16:12:37 +00:00
Luca Abeni
d32d303568 Clarify that yuv2rgb_init.c cannot be used under LGPL
Originally committed as revision 21730 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-12-22 17:57:19 +00:00
Luca Abeni
19a6be3463 Remove useless include (not needed now that libswscale uses libavutil)
Originally committed as revision 21728 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-12-22 11:22:49 +00:00
Luca Abeni
0683a5c558 Fix compilation of non-MMX code with gcc 2.95
Originally committed as revision 21702 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-12-20 15:58:15 +00:00
Luca Abeni
9bde778e73 Allow to compile swscale's non-SIMD code under the LGPL license.
Since mplayer always define CONFIG_GPL, this commit should not change
anything for mplayer.

Originally committed as revision 21699 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-12-20 13:09:29 +00:00
Reimar Döffinger
e96da13bc7 Change "p" asm constraints to "g", since "p" was a no longer necessary hack to
make AMD64 compilation work and ICC can not handle "p".

Originally committed as revision 21341 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-11-27 21:59:13 +00:00
Luca Abeni
807e0c6645 Clarify that some of the non-SIMD code is now LGPLed.
All the authours of such code agreed.

Originally committed as revision 21045 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-11-19 10:38:12 +00:00
Michael Niedermayer
6264a515d0 forgotten 2 converters (yeah svn up, svn di svn ci isnt enough i should actually look at the code after svn up not just the diff ...)
Originally committed as revision 20962 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-11-16 14:49:04 +00:00
Michael Niedermayer
c2271987f8 fixing the lamest bug in swscale, all the rgb/bgr->* code did 2x2 downsampling for chroma, it should just be 2x1 (the rest of the code also belived its 2x1 ...)
Originally committed as revision 20961 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-11-16 14:44:00 +00:00
Diego Biurrun
4cedbe5c8a Remove stray newline.
Originally committed as revision 20959 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-11-16 12:49:27 +00:00
Luca Abeni
7964ed71e9 Synch with ffmpeg's r6938 "allow spaces in source and build directory names..."
Originally committed as revision 20816 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-11-09 15:13:56 +00:00
Nigel Pearson
d904b5fc66 Fix MacIntel build: "/nop" is illegal on Apple's older version of GAS
Patch by Nigel Pearson % nigel A ind P tansu P com P au %
Original thread:
Date: Nov 6, 2006 10:43 PM
Subject: [Ffmpeg-devel] [PATCH] swscale uses /nop, illegal for old versions of GAS

Originally committed as revision 20740 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-11-07 07:07:05 +00:00
Luca Abeni
a43fb6b37e Add support for conversions from the rgb565 and rgb555 formats
Originally committed as revision 20605 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-11-02 09:01:01 +00:00
Diego Biurrun
484267f3d3 Do not mix declarations and statements.
Originally committed as revision 20600 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-11-01 19:44:35 +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
Kostya Shishkov
4884b9e50d 16-bit grayscale support
Originally committed as revision 20427 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-24 05:02:33 +00:00
Luca Abeni
7c9c296648 Properly set EXTRALIBS
(fixes compilation of shared libswscale on cygwin and other platforms)

Originally committed as revision 20413 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-23 14:03:49 +00:00
Diego Biurrun
05749630e8 Rename ABS macro to FFABS.
Originally committed as revision 20169 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-11 23:18:34 +00:00
Diego Biurrun
086b05cdad Move CFLAGS handling to common.mak.
Originally committed as revision 20154 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-11 08:30:22 +00:00
Diego Biurrun
d026b45e73 Change license headers to say 'FFmpeg' instead of 'this program'.
Originally committed as revision 20100 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-07 15:33:14 +00:00
Diego Biurrun
21423ad9b7 Replace -I.. by -I$(BUILD_ROOT).
Originally committed as revision 20094 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-07 09:23:09 +00:00
Diego Biurrun
aae0bc19b1 Simplify test program build.
Originally committed as revision 20073 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-05 17:11:05 +00:00
Diego Biurrun
6a07717908 Test programs depend on $(LIB).
Originally committed as revision 20059 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-05 00:57:48 +00:00
Diego Biurrun
777938e190 FFmpeg uses -D_ISOC9X_SOURCE and not -D_GNU_SOURCE in CFLAGS.
Originally committed as revision 20057 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-04 22:18:40 +00:00
Diego Biurrun
c55f606397 Remove cs_test and swscale-example on clean.
Originally committed as revision 20040 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-04 14:02:42 +00:00
Diego Biurrun
69402a1073 Remove redundant EXTRALIBS declaration.
Originally committed as revision 20039 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-04 14:00:14 +00:00
Diego Biurrun
7fe1cbd814 Simplify compilation call by using $(EXTRALIBS).
Originally committed as revision 20038 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-04 13:56:24 +00:00
Diego Biurrun
632d873994 Fix warnings:
swscale-example.c:87: warning: implicit declaration of function 'sws_format_name'
swscale-example.c:214: warning: implicit declaration of function 'sws_rgb2rgb_init'

Originally committed as revision 20037 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-04 13:54:56 +00:00
Diego Biurrun
b2c4e3547b Fix warnings:
cs_test.c:62: warning: return type defaults to 'int'
cs_test.c:64: warning: implicit declaration of function 'memalign'

Originally committed as revision 20036 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-04 13:51:12 +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
Diego Biurrun
f8d6112850 Fix unused variable warning when compiling with MMX disabled.
Originally committed as revision 20021 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-03 17:11:43 +00:00
Diego Biurrun
0fe89aca42 Remove unused variables.
Originally committed as revision 20012 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-10-01 14:17:45 +00:00
Luca Abeni
44cdb42386 Add support for YUVJ formats
Originally committed as revision 19993 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-09-27 11:41:36 +00:00
Luca Abeni
87656472f4 Improve swscale-example to test conversions between all the possible
pixel formats

Originally committed as revision 19965 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-09-24 09:55:18 +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
Luca Abeni
5784b620d2 Fix the PIX_FMT_* ---> IMGFMT_* conversion (PIX_FMT_RGB32 is IMGFMT_BGR32)
Originally committed as revision 19875 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-09-17 14:59:55 +00:00
Diego Biurrun
2111440ae9 Add proper GPL headers.
Originally committed as revision 19772 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-09-09 21:10:26 +00:00
Diego Biurrun
4fadc2b4f1 Add official GPL header to make license explicit as discussed on ffmpeg-devel.
Originally committed as revision 19709 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-09-06 10:24:19 +00:00
Víctor Paesa
22e4695905 Add sws_getCachedContext(), which checks if context is valid or reallocs a new one instead.
Patch by Victor Paesa <wzrlpy@arsystel.com>
Original thread:
Date: Aug 31, 2006 7:15 PM
Subject: [Ffmpeg-devel] [PATCH] Add sws_getCachedContext() to swscale library

Originally committed as revision 19667 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-09-04 09:38:24 +00:00
Michael Niedermayer
d1a7ae1a37 make the C code of the swscaler which i wrote LGPL
Originally committed as revision 19600 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-08-30 10:50:20 +00:00
Luca Abeni
7f3f497a0b Allow to compile swscale tests
Originally committed as revision 19476 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-08-21 12:15:29 +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
751b900479 Move all internal -I parameters to the front of CFLAGS to avoid using external
header files that happen to have the same name as internal ones.
based on a patch by Vladislav Naumov, vladislav.naumov **at** gmail **dot** com

Originally committed as revision 19426 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-08-17 17:19:56 +00:00
Luca Abeni
1246640aa2 Fix compilation as a win32 shared library (libavutil must be explicitly linked)
Originally committed as revision 19416 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-08-16 20:09:47 +00:00
Uoti Urpala
91d0bda26d Fix compilation with -no-PIC and without -fomit-frame-pointer (used by
--enable-debug).
Fix from Jason Tackaberry for his previous -fPIC patch.

Originally committed as revision 19406 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-08-15 14:50:24 +00:00
Jason Tackaberry
83c89c7885 -fPIC support for libswscale
patch by Jason Tackaberry, tack /at/ urandom /dot/ ca

Originally committed as revision 19402 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-08-15 08:47:03 +00:00
Diego Biurrun
4bff9ef9d0 Replace asmalign.h hack by ASMALIGN cpp macros from config.h.
Originally committed as revision 19378 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-08-13 00:21:14 +00:00
Uoti Urpala
17c613ef34 Use COMPILE_MMX2 instead of HAVE_MMX2 to determine whether to compile
MMX2 code, because the HAVE_ defines do not have sane values here if
runtime cpudetection is used. Hopefully fixes runtime cpudetection
breakage from r19339.

Originally committed as revision 19374 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-08-12 17:46:40 +00:00
Diego Biurrun
49a0122c99 Fix compilation with MMX disabled, the mmx_null and mmx_one constants don't need to
be protected by HAVE_MMX.

Originally committed as revision 19367 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-08-11 12:50:14 +00:00
Luca Abeni
c792037176 Another PIX_FMT_ ---> IMGFMT_ conversion
Originally committed as revision 19342 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-08-05 13:14:34 +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
Luca Abeni
80d0ded2f7 Add support for ffmpeg's pixel format names in libswscale
Originally committed as revision 19276 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-07-31 12:35:04 +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
Alan Curry
e50bc5a4ea Fix compile error due to extra "FF" at beginning of file in the FF{MIN,MAX}
update

Originally committed as revision 19205 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-07-27 19:35:30 +00:00
Luca Abeni
6f209cb549 Replace MIN() and MAX() with FFMIN() and FFMAX()
Originally committed as revision 19186 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-07-26 13:19:02 +00:00
Michael Niedermayer
8422aa888b a tiny bit of cleanup
Originally committed as revision 19178 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-07-24 10:48:54 +00:00
Michael Niedermayer
bca11e75fb vertical scaler with accurate rounding, some people on doom9 can see +-1 errors
the +-1 issue is limited to >2tap vertical filters, so bilinear upscale was unaffected
the new code is sometime faster sometimes slower but the difference is significant (~20%) so its optional and enabled with arnd=1

Originally committed as revision 19177 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-07-24 10:36:06 +00:00
Alan Curry
d8cfa5534a Fix typo introduced in the memalign->av_malloc conversion (there is no
mv_malloc)

Originally committed as revision 19174 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-07-23 21:16:11 +00:00
Reimar Döffinger
8dfe90941a Missing part of the malloc -> av_malloc patch: memalign must be replaced as well!
Originally committed as revision 19173 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-07-23 18:07:26 +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
57b3c36d0f make libswscale build system similar to the libav* one
Originally committed as revision 18994 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-07-10 12:35:52 +00:00
Luca Abeni
2df19ea53a Remove unneeded code
Originally committed as revision 18880 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2006-07-01 14:39:14 +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