Commit Graph

728 Commits

Author SHA1 Message Date
diego 89a63012c5 Rename yuv2rgb_template2.c --> yuv2rgb_template.c now that the other is gone.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31279 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-30 08:44:05 +00:00
diego 02c0705f98 Remove GPL-licensed YUV to RGB MMX routines.
We now have an LGPL replacement that is at least equally fast.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31278 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-30 08:31:23 +00:00
stefano 505326f6df Add empty newline to separate function declarations, for better
readability.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31192 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-23 10:02:30 +00:00
stefano 764539a98c Cosmetics: make more compact the code for handle_jpeg(), this also allows
vertical alignment. Improve readability.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31186 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-19 22:56:41 +00:00
stefano 3c88e5fdc3 Remove PI definition and use M_PI instead.
M_PI is defined by the included file libavutil/mathematics.h.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31185 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-19 22:49:04 +00:00
lorenm f53f31894c 13% faster yuv420 to rgb15 mmx.
It is now faster than the old gpl version on conroe.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31181 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-19 13:31:11 +00:00
lorenm d919d834fe 40% faster yuv420 to rgb24 mmx.
It is now faster than the old gpl version on conroe.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31180 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-19 08:21:56 +00:00
ramiro 210601a953 Revert r31153. It failed to build on:
x86_64 / Mac OS X gcc 4.0.1
x86_64 / Linux icc (all)
x86_64 / Linux gcc 4.0.4
x86_64 / OpenBSD gcc 3.3.5
x86_64 / Linux suncc 5.10
and there are some reports of crashes.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31170 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-12 20:47:32 +00:00
ramiro ce3fb0c4f9 Use int instead of long to pass width parameters in non-public functions.
long was being incorrectly used as an x86-sized register, both for 32 and 64
bits, but this is not the case in win64.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31153 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-11 00:36:34 +00:00
mru 668854c7dc blackfin: fix yuv422 to yuv420 conversion
The old code is correct only when stride = 2*width.

Patch by Ronaldo Moura <ronaldo d moura monity com br>

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31142 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-07 21:59:18 +00:00
diego 68f481d741 alternative LGPL-licensed, MMX-optimized YUV to RGB conversion routines
written by Kostya Shishkov


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31135 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-04 09:11:01 +00:00
diego 91a84df7d0 Remove explicit filename from Doxygen @file commands.
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31050 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-20 14:47:31 +00:00
reimar e969acde38 Replace some "m" constraints by MANGLE to avoid issues with some compilers not
being able to compile it and deduplicate the code at the same time.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30978 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-31 17:00:33 +00:00
diego 28ff7246a0 libswscale: Relicense almost all x86 assembler optimizations as LGPL.
This is of course done with permissions from the authors. The only GPL
component left are MMX optimizations for YUV to RGB conversion.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30965 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-27 11:31:02 +00:00
diego a6e3a9ff23 HAVE_MMX2 implies HAVE_MMX, so checking the latter is enough.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30961 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-26 07:57:54 +00:00
diego 1b58868670 AltiVec implies a PPC CPU, so there is no need to check for both.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30954 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-23 22:59:14 +00:00
diego 5b7bffa713 Do not compile AltiVec code when AltiVec is not available; not even in
runtime cpudetection mode.
Fixes compilation with '--enable-runtime-cpudetect --disable-altivec'.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30952 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-23 20:12:52 +00:00
diego 0f759a5da0 Replace wrong condition name in #endif comment by correct instance.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30938 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-19 09:58:45 +00:00
diego 2406c23406 Check whether COMPILE_ALTIVEC is defined, not if it is set to a 0/1 value.
COMPILE_ALTIVEC is never set to 1, it is just #defined.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30937 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-19 09:57:36 +00:00
cehoyos e3e6f84258 Extend the generic path of the yuv2rgb converter with support for rgb444
output format.

Patch by Janusz Krzysztofik, jkrzyszt A tis D icnet D pl 


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30934 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-18 23:02:32 +00:00
siretart 26dbd2fc7c Fix compilation on powerpc with --disable-altivec
in case altivec is disabled, even compilation of code using altivec
keywords or asm must be avoided.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30869 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-09 08:07:34 +00:00
reimar f6f655549b Check for allocation failure for c->lumMmx2FilterCode and c->chrMmx2FilterCode.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30864 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-08 19:41:57 +00:00
reimar 4bd0c66548 Fix memleak due to incorrect VirtualFree arguments: size must be 0 for MEM_RELEASE.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30863 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-08 19:37:10 +00:00
stefano 5f43c89d8b Avoid duplication of usePal() macro.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30856 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-06 11:50:54 +00:00
stefano 387aa47084 Add support to BGR444/RGB444 foreign endian output in libswscale.
Patch by Janusz Krzysztofik |jkrzyszt ^ tis icnet pl|.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30855 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-06 11:27:31 +00:00
michael 75f3bd09ea try to avoid returning odd slices.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30847 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-05 21:39:27 +00:00
benoit de6f717b09 Cosmetics: fix vertical alignment.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30842 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-05 08:41:35 +00:00
benoit 11d73c297d 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


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30841 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-05 08:32:54 +00:00
cehoyos 487b94aa88 Support BGR555, BGR565, RGB555 and RGB565 foreign endian output in
libswscale.

Patch by Alexis Ballier, alexis D ballier A gmail


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30840 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-04 16:57:04 +00:00
stefano 6cf92cd32a Revert r30825, it was not supposed to be committed.
127.32L to me, beware when using git svn dcommit for committing stuff
to svn...


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30827 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-04 01:02:24 +00:00
stefano ff232e1f6f Fill the r, g, b values used for computing the c->pal_yuv table in the
case where the source format is PIX_FMT_GRAY8.

This is required as PIX_FMT_GRAY8 has been declared as a paletted
format in FFmpeg r22191, fix GRAY8 -> RGB conversion.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30826 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-04 00:31:13 +00:00
stefano a2a9a53d3f Make swscale-test take in input the name of the input and the output
format.

Make swscale-test only perform the test from the input to the output
format rather than perform all.

Also implement swscale-test-all.sh, for performing all the tests.

Improve flexibility of the swscale-test tool, this way is simpler to
perform only a subset of tests.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30825 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-04 00:31:10 +00:00
cehoyos ba66200023 Make sws_dcVec static: It is only used inside libswscale/utils.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30787 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-28 02:18:16 +00:00
stefano 150de6566f Remove pointless empty line.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30730 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-25 21:21:29 +00:00
stefano 83b756a65d Apply consistency nit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30729 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-25 21:12:38 +00:00
ramiro eb846cb700 Reorder buffer debug. Also print out if slice was buffered.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30722 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-23 16:46:43 +00:00
stefano 2aafb80828 Reindent and fix brace placement.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30643 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-18 21:20:37 +00:00
stefano 8090adeed3 Vertically align a list of comparisons in sws_getCachedContext().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30642 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-18 21:17:07 +00:00
stefano b07bf5bddc Merge two if conditions, allow to decrese the level of indentation of
the block.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30641 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-18 21:12:05 +00:00
stefano 83a3ca618f Simplify how usesVFilter and usesHFilter are set.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30520 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-05 23:53:25 +00:00
stefano 0943df2e29 Apply misc fixes to sws_getCoefficients() doxy.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30519 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-05 22:56:59 +00:00
stefano b6a3b71cb2 Satisfy consistency need:
int * sws_getCoefficients  -> int *sws_getCoefficients.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30518 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-05 22:54:45 +00:00
conrad 2e9988220c Add function to translate SWS_CS_* to coefficient array
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30513 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-05 16:09:03 +00:00
stefano 81b1285123 Implement shuffle_bytes_abcd() functions and use them for shuffling
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


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30501 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-03 23:46:00 +00:00
stefano 3949328e2c Declare support for the pixel formats:
PIX_FMT_YUVJ420P
PIX_FMT_YUVJ422P
PIX_FMT_YUVJ440P
PIX_FMT_YUVJ444P

in the isSupported{In,Out} macros. 

These pixel formats are not true pixel formats but hacks specific to
JPEG in libavcodec. They are deprecated and should be removed (that is
from libavcodec first and libswscale second)...  but they must be
tested by swscale-test.

See thread:
Subject: [FFmpeg-devel] [PATCH] Extend show_pix_fmts() to make it print the input/output support
Date: 2010-01-30 15:54:08 GMT


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30474 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-31 10:16:05 +00:00
mru 0d3fe701b0 Blackfin: use SRAM only when CONFIG_SRAM is set
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30472 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-31 00:20:37 +00:00
stefano 279a334729 Reindent.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30467 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-30 21:58:09 +00:00
stefano 9058c03d7a Use a consistent convention for the names of the internal wrapper
functions. Improve readability.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30466 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-30 21:56:33 +00:00
stefano c84231c037 Fix randomness of the swscale-test output.
See the thread:
Subject: [FFmpeg-devel] [RFC] Make swscale-test perform only one convertion
Date: Fri, 29 Jan 2010 01:52:23 +0100


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30457 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-30 13:31:00 +00:00
stefano 7be89f904d Rename swscale-example to swscale-test, to better reflect the intended
use of the program.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30439 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-27 00:25:23 +00:00