Commit Graph

149 Commits

Author SHA1 Message Date
vitor 9a33429014 Silence GCC warnings:
ibswscale/swscale.c: In function ‘sws_scale’:
libswscale/swscale.c:2678: warning: ‘b’ may be used uninitialized in 
this function
libswscale/swscale.c:2678: warning: ‘g’ may be used uninitialized in 
this function
libswscale/swscale.c:2678: warning: ‘r’ may be used uninitialized in 
this function


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27837 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-27 19:59:01 +00:00
vitor e2b8d3f60d Silence the following GCC warning:
libswscale/swscale.c: In function ‘pal2rgbWrapper’:
libswscale/swscale.c:1744: warning: passing argument 4 of ‘conv’ from 
incompatible pointer type



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27834 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-26 15:41:11 +00:00
michael e3fc47b713 Do not attempt to use the unscaled yuv2rgb converter when height is odd because
it will overflow the buffer by 1 line. This might have been exploitable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27826 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-25 15:00:28 +00:00
vitor d979a142fd Cosmetics: alignment
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27818 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-23 19:20:14 +00:00
vitor f42e50f367 Fix broken palette8to*.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27817 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-23 19:13:11 +00:00
flameeyes 3679961515 Convert asm keyword into __asm__.
Neither the asm() nor the __asm__() keyword is part of the C99
standard, but while GCC accepts the former in C89 syntax, it is not
accepted in C99 unless GNU extensions are turned on (with -fasm). The
latter form is accepted in any syntax as an extension (without
requiring further command-line options).

Sun Studio C99 compiler also does not accept asm() while accepting
__asm__(), albeit reporting warnings that it's not valid C99 syntax.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27778 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-16 13:34:30 +00:00
flameeyes 3035850d27 Mark some symbols in swscale.c as constant.
These are only used in swscale_template.c (and thus don't need to be
made extern), and can be declared as ASM constants.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27737 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-09 11:13:14 +00:00
flameeyes 98fb4aebc2 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.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27736 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-09 11:12:38 +00:00
cehoyos a0d55235a7 Change variable types from int to enum PixelFormat.
Fixes icc warning #188: enumerated type mixed with another type


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27733 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-09 08:36:04 +00:00
vitor 74bb6be453 Do not set src[1] to the palette, it is now in the context
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27731 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-08 17:48:23 +00:00
vitor c51fe849d6 Add a new unscaled PAL8 -> RGB converter.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27730 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-08 17:46:22 +00:00
aurel 9bbe7f1131 Change one more variable type from int to enum PixelFormat.
This one was missing from r27727.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27728 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-08 11:59:01 +00:00
cehoyos 878e88cd5c Change variable types from int to enum PixelFormat.
Fixes icc warning #188: enumerated type mixed with another type


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27727 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-07 19:44:39 +00:00
cehoyos 99877b2fc6 Remove b5Dither, g5Dither and r5Dither from libswscale.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27718 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-04 18:50:39 +00:00
cehoyos 15d516ffdf Remove g6Dither from libswscale.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27715 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-04 16:40:35 +00:00
michael f627d46a0d Fix infinite loop with spline, bug was introduced in r27612 by me.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27669 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-29 01:08:01 +00:00
michael e4a71d0818 Fix segfault with rgb24 and full_internal_chroma due to non-existing alpha
byte being written after the array.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27628 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-16 03:49:54 +00:00
michael da1f355a05 Avoid using floating point for calculating filter coefficients.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27612 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-15 03:33:09 +00:00
michael c9a70bb478 Avoid some explicit types in sizeof().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27611 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-14 19:29:14 +00:00
michael aee49d5e58 Use av_mallocz() instead of for() =0;
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27610 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-14 19:25:16 +00:00
michael 5f9a7d91b9 Move dither tables from yuv2rgb to swscale, they have been written by me and
can be used under LGPL.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27609 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-14 18:00:49 +00:00
michael f5a4bd86cb Rename yuv2rgb variables to avoid name clashes with the ones used by bfin asm.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27599 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-13 11:52:03 +00:00
michael 07fd651300 Ensure that additional filter coeffs that exist due to alignment
are 0 if bitexact mode is requested.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27595 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-13 02:04:10 +00:00
michael 57db6892cf yvu9toyv12Wrapper is not bitexact so disable it when the user wants
bitexactness to C.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27594 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-12 23:52:37 +00:00
michael e5f0ead24f The yuv->rgb tables are too small for cliping to be avoidable,
thus revert the respective optimization. The table generator code
has to be rewritten anyway one day by some volunteer because its
not LGPL, fixing the GPL table generator thus seems like wasted time.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27591 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-12 21:25:42 +00:00
michael 02da3e1bf9 Add support for PIX_FMT_YUV440P.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27589 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-12 17:51:13 +00:00
michael 296ccc70ea Support mono as input format.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27587 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-12 16:46:38 +00:00
michael fc855e63d2 Add support for PIX_FMT_MONOWHITE as output format.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27586 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-12 16:01:17 +00:00
michael 229dec600d rgb24toyv12 is not accurately rounding, so disable it as well when the
user asks for accurate rounding.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27585 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-12 04:40:51 +00:00
michael cc3ec5b4f2 Do not use the unscaled yuv->rgb converters if SWS_ACCURATE_RND is set,
because they do not accurately round.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27584 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-12 02:05:37 +00:00
michael 42643629cd Remove mistakely commited code i used for testing.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27581 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-11 14:40:29 +00:00
michael 6009a04a23 Implement full horizontal chroma for rgb/bgr24/32 output.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27580 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-11 14:39:12 +00:00
michael 3ea1657e65 Do not do unneeded clipping in YSCALE_YUV_2_PACKEDX_C.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27579 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-11 03:22:39 +00:00
michael 9c49671d8b Factorize yuv2packedXinC().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27578 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-11 02:36:51 +00:00
michael 4abaf837d9 Set rgb2yuv constants more accurately, makes no real difference though.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27577 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-11 01:49:35 +00:00
michael d351b78abd Correct normalization constant for the vertical filter.
I am not completely sure why this was at such an incorrect value,
but I could not find any problems when it was set correctly.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27575 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-10 23:23:47 +00:00
michael a92e68d5a8 Change RGB2YUV_SHIFT from 16 to 15 to make it able to work
with 16bit signed constants (like SIMD might use).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27568 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-10 16:39:56 +00:00
michael 50e3ffeacb Make SWS_FULL_CHR_H_INP work.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27564 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-10 02:28:38 +00:00
michael 0382fdf50a More accurate rounding for 8bit inputs.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27562 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-09 23:39:32 +00:00
michael 0c6d92bfda Rewrite bgr24->yuv mmx code, the new code is cleaner, more accurate,
and does not throw half the chroma away.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27561 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-09 23:30:06 +00:00
michael c3c284f8d2 Add table of rgb->yuv conversion coefficients.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27558 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-09 18:01:25 +00:00
michael b128f3e558 Fix jpeg yuv.
Fixes issue504.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27547 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-08 12:36:38 +00:00
michael 7dd7068c7a Fix accurate rounding mode on x86_64.
Fixes issue222.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27545 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-07 21:06:21 +00:00
michael 1333189983 Make fast bilinear scaler work again.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27543 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-07 16:59:04 +00:00
bcoudurier 244d3d1622 simplify function selection code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27528 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-05 01:44:33 +00:00
bcoudurier 3178a5606a enable yuv422p to uyvy converter
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27527 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-05 00:25:39 +00:00
michael a0d85f9301 Make 16bit grayscale output work.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27524 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-04 22:58:16 +00:00
michael c1fa10dc7e Fix SWS_FAST_BILINEAR and SWS_POINT with some unscaled rgb<->bgr converters.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27523 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-04 22:31:22 +00:00
michael 172a4bfaea Support PIX_FMT_RGB32_1 and PIX_FMT_BGR32_1.
Fixes issue248.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27522 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-04 21:59:15 +00:00
michael 1a636fc7f9 Fix 4 and 8 bit RGB/BGR input.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27521 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-04 20:46:36 +00:00