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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
5cd08a9945
Factorize the code which calls the non optimized C functions in
...
getSwsFunc().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30331 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-16 19:19:54 +00:00
5ffab28a7c
Prefer "to %s%s" over "to%s %s", slightly more readable.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30330 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-16 19:14:29 +00:00
d77dc477c5
Simplify code in sws_getContext() which logs if the destination format
...
support dithering, remove the const char *dither variable and use a
literal string instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30329 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-16 19:11:03 +00:00
3c8de6d006
Document some of SwsContext.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30328 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-16 19:04:55 +00:00
14fe9544f9
Reuse h{lum,chr}Filter{,Pos} variables for MMX2 fast_bilinear horizontal scaler.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30327 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-16 18:39:06 +00:00
5d8bd54019
Factorize code which logs the source and destination formats in
...
sws_getContext().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30326 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-16 18:36:21 +00:00
4644bd6293
Simplify reset_ptr(): employ usePal() macro rather than enumerating
...
all the paletted formats.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30317 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-16 11:08:16 +00:00
stefano
michael
ramiro
mru
conrad
benoit
zuxy