Commit Graph

689 Commits

Author SHA1 Message Date
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
michael 156399b7aa Use isAnyRGB() where possible
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30435 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-26 08:03:28 +00:00
michael 60b76a958f Add 3 more RGB makros that allow specifying RGB in bytes and any rgb/bgr.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30434 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-26 08:01:50 +00:00
michael 378e6bf192 Rename isRGB() and isBGR() as their meaning is confusing.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30433 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-26 07:40:14 +00:00
stefano 2cded4ef2c Merge two "if (flags & SWS_PRINT_INFO) { ... }" blocks, slightly
simplify code.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30432 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-25 22:46:09 +00:00
stefano 196fea8c3b Fix mis-computation of the needsDither variable erroneously introduced
in r30419, which was causing a swscale-example regression.

Also increase my liter count by 20.0 units.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30431 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-24 21:28:17 +00:00
stefano 2e0a4996e3 Merge two "if (flags & SWS_PRINT_INFO) { ... }" blocks.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30425 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-24 17:44:43 +00:00
stefano 213092c8dc 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.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30419 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-24 12:55:05 +00:00
ramiro c9c95b9046 Indent.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30413 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-24 03:02:40 +00:00
ramiro 0ae7ed631b Don't redefine M_PI. It is already defined from libavutil/mathematics.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30412 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-24 02:16:26 +00:00
ramiro d9f2d9d62c Split swscale.c into scaler code (swscale.c) and utility code (utils.c).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30411 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-24 02:08:22 +00:00
mru 134976ee4d Move array specifiers outside DECLARE_ALIGNED() invocations
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30385 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-22 03:26:30 +00:00
conrad 450cef62b0 More const-correctness for sws_scale
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30381 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-21 09:52:11 +00:00
ramiro 06c49d538d Document some more of SwsContext.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30380 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-20 03:26:12 +00:00
stefano 39bcd6edcf Avoid more pointless tests, the input and output formats need to be
supported both as input and as output, as the conversion performed is:
yuva420p -> src -> dst -> yuva420p.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30379 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-20 00:22:31 +00:00
stefano e8da74db1f Split overly long line.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30378 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-19 22:36:46 +00:00
stefano 85d89af72e Make selfTest() perform tests where both the input and output formats
are supported, avoid pointless loops.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30377 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-19 21:52:00 +00:00
benoit de1ca7fb29 Make const prototypes for input sources of sws_scale_* stricter.
Patch by Alexis Ballier gmailify($firstname, $familyname)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30374 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-19 16:30:20 +00:00
ramiro 4277621a41 swscale-example: Add comment about the use of av_{malloc,free}.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30373 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-19 15:42:51 +00:00
ramiro d4e79342c1 Remove useless forward declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30371 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-19 11:35:04 +00:00
zuxy 4455af6720 User friendly warning message that gives out names of source and target formats
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30370 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-19 05:21:17 +00:00
mru 51f1113b15 swscale-example: use av_malloc()
Image buffers require 16-byte alignment, so av_malloc() should be used.
Fixes crash on PPC.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30369 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-19 03:47:11 +00:00
stefano d448df5add Split long line.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30368 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-18 23:34:07 +00:00
stefano 18f9a9bebc Convert int -> enum PixelFormat in doTest().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30367 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-18 23:33:17 +00:00
zuxy 2257b14a19 Define out currently unused static functions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30365 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-18 08:42:04 +00:00
stefano 91e4519ed0 Remove stray '\' at the end of macro definitions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30362 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-17 23:29:31 +00:00
stefano c60f68724c Remove duplicated or pointless newlines.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30361 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-17 23:17:47 +00:00
stefano aadf8843d7 Factorize error message logging, log it if the converter cannot be
set.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30360 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-17 23:07:37 +00:00
stefano 6db184bb80 Reindent after the last commit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30359 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-17 23:02:20 +00:00
stefano 3c54865aea Make the pal2rgbWrapper set and use the converter in pal2rgbWrapper
only if the input format is paletted.

Fix potential crashes/weirdness if the input format is non-paletted.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30358 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-17 23:00:01 +00:00
mru 1a8479b95e Remove double const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30357 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-17 19:26:35 +00:00
stefano acd1a4075d Factorize error message logging in rgb2rgbWrapper().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30356 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-17 15:11:25 +00:00
mru 1d08d54a97 Reindent
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30350 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-17 14:25:19 +00:00
mru 9c1aafc17c Remove inline from initFilter()
It makes no sense having that function inlined.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30349 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-17 14:25:17 +00:00
stefano f9569e1114 Add a const qualifier in a cast, fix the gcc warning:
swscale.c: In function ‘sws_scale’:
swscale.c:2968: warning: cast discards qualifiers from pointer target type


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30341 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-17 00:26:29 +00:00
stefano 21a572c8de Add a const qualifier in a cast, fix the gcc warning:
swscale.c: In function ‘planarCopy’:
swscale.c:2256: warning: cast discards qualifiers from pointer target type


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30340 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-17 00:21:50 +00:00
stefano d11d2ab242 Fix typo, "get rid off" -> "get rid of".
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30338 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-16 22:49:00 +00:00
stefano 68544d15da Revert r30331, which broke compilation.
swScale_C is not templated if any optimization is to be used and
!runtime_cpudetect.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30334 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-16 19:51:26 +00:00
stefano e1a3ac7fb2 Prefer enum PixelFormat to int as the parameter type of
fmt_depth(fmt).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30333 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-16 19:32:58 +00:00
stefano ae2e7d7298 Declare with av_unused the variable alpMmxFilter, fix the gcc warning:
swscale_template.c: In function ‘swScale_C’:
swscale_template.c:2580: warning: unused variable ‘alpMmxFilter’
swscale_template.c: In function ‘sws_init_swScale_C’:


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30332 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-16 19:22:30 +00:00