1
0
mirror of https://github.com/mpv-player/mpv synced 2025-04-27 22:00:23 +00:00
Commit Graph

306 Commits

Author SHA1 Message Date
siretart
b2dc062825 deprecate palette8topacked32 in favor of public API functions sws_convertPalette8ToPacked32 and -24
additionallym deprecate palette8torgb16 and its bgr variant without
replacement. These functions are not meant to be used by applications.

Discussed at: http://comments.gmane.org/gmane.comp.video.ffmpeg.devel/109340


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31301 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-01 19:35:16 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
stefano
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
stefano
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
ramiro
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
stefano
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
stefano
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
ramiro
87e34c3f3f Don't initialize normal horizontal filter if MMX2 filter is used.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30313 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-15 19:50:59 +00:00
zuxy
0bd2e793c1 Const correctness for src pointer. Remove all constness related warnings in
libswscale.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30306 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-15 08:51:51 +00:00
stefano
32c03dd8c2 Fix typo.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30304 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-15 00:39:25 +00:00
ramiro
8af165c26f Remove unused clip_table code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30303 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-14 19:12:42 +00:00