generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
32,581 Commits 24 Branches 241 Tags 173 MiB
0a90b6a43e
Commit Graph

1117 Commits

Author SHA1 Message Date
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Michael Niedermayer
e528cdac8a Revert "replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION" 
This reverts commit 29ba091136.
 2011-03-17 17:26:45 +01:00
Michael Niedermayer
0cb88628fb Revert "use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_*" 
This reverts commit a03be6e1ba.
 2011-03-17 17:26:45 +01:00
Janne Grunau
a03be6e1ba use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_* 2011-03-16 21:54:39 +01:00
Janne Grunau
29ba091136 replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION 
also update the multiple inclusion guards in config.h|mak
 2011-03-16 21:54:39 +01:00
Reinhard Tartler
737eb5976f Merge libavcore into libavutil 
It is pretty hopeless that other considerable projects will adopt
libavutil alone in other projects. Projects that need small footprint
are better off with more specialized libraries such as gnulib or rather
just copy the necessary parts that they need. With this in mind, nobody
is helped by having libavutil and libavcore split. In order to ease
maintenance inside and around FFmpeg and to reduce confusion where to
put common code, avcore's functionality is merged (back) to avutil.

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-02-15 16:18:21 +01:00
Mans Rullgard
f344903ca5 Fix MMX rgb24 to yuv conversion with gcc 4.6 
When built with gcc 4.6, the MMX rgb24 to yuv conversion gives
wrong output.  The compiler produces this warning:

libswscale/swscale_template.c:1885:5: warning: use of memory input without lvalue in asm operand 4 is deprecated

Changing the memory operand to a register makes it work.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-02-13 01:42:32 +00:00
Clément Bœsch
523d9407d5 Remove a few if (p) av_freep(&p) forms 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-02-04 10:00:49 +00:00
Mans Rullgard
ef4a65149d Replace ASMALIGN() with .p2align 
This macro has unconditionally used .p2align for a long time and
serves no useful purpose.
 2011-01-18 20:48:24 +00:00
Janne Grunau
2c3589bfda consolidate .gitignore patters into a single file 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-18 21:32:05 +01:00
Janne Grunau
348b8218f7 convert svn:ignore properties to .gitignore files 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-17 15:50:14 +01:00
Ramiro Polla
b494baf0b0 colorspace-test: fix build 
rgb32tobgr32() has been removed in favour of shuffle_bytes_2103() in r32190

Originally committed as revision 32676 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-12-07 15:27:11 +00:00
Martin Storsjö
9c158e4947 Store src/dstFormat after calling handle_jpeg 
handle_jpeg may update the src/dstFormat variables, this makes sure the
updated version is stored in the context.

This fixes roundup issue 2302.

Patch by Troot, all_crap_goes_here at hotmail

Originally committed as revision 32562 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-10-29 13:48:12 +00:00
Reimar Döffinger
12eef0d1ba 100l, fix sws_getCachedContext. It did not set the colorspace details, 
but worse it did not set up destination dimensions, thus every user
of it would necessarily fail.

Originally committed as revision 32424 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-10-03 07:53:40 +00:00
Stefano Sabatini
f34fcdc8b6 Set default values for the scale context in sws_alloc_context(). 
Originally committed as revision 32415 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-29 22:06:44 +00:00
Stefano Sabatini
e60c906a82 Set the default value of param0 and param1 to SWS_PARAM_DEFAULT. 
Originally committed as revision 32414 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-29 22:06:40 +00:00
Stefano Sabatini
6d21d67b38 Set valid default values for the srcw, srch, dstw, dsth options in the 
scale context. Prevent pointless warnings when using
av_opt_set_defaults() for setting the default values, as in a pending
patch.

Originally committed as revision 32413 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-29 22:06:36 +00:00
Stefano Sabatini
fc7c40c2bd Cosmetics: put "if (...)" and "av_log(...)" in the same line for 
improving vertical alignment and readability.

Originally committed as revision 32405 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-29 16:15:42 +00:00
Stefano Sabatini
d29e863e1d Put if (...) av_log() in the same line, more compact and increase 
readibility.

Originally committed as revision 32404 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-29 13:02:31 +00:00
Stefano Sabatini
5abd626e20 Amend constraints for the src_format and dst_format options in the 
SWScale context.

Originally committed as revision 32403 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-29 13:02:28 +00:00
Stefano Sabatini
c24b404ba6 Cosmetics: fix braces placement. 
Originally committed as revision 32402 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-29 08:44:09 +00:00
Stefano Sabatini
0810a5846b Deprecate sws_getContext(), use sws_alloc_context() and 
sws_init_context() instead.

Originally committed as revision 32401 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-28 22:23:58 +00:00
Stefano Sabatini
499287e0a5 Add documentation for the returned value of sws_init_context(). 
Originally committed as revision 32400 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-28 22:23:53 +00:00
Stefano Sabatini
c508ab6736 Bump minor version after the addition of sws_alloc_context() and 
sws_init_context() of r32368.

Originally committed as revision 32396 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-28 15:29:23 +00:00
Baptiste Coudurier
bd8154d0b3 100l fix if condition 
Originally committed as revision 32395 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-27 23:47:54 +00:00
Baptiste Coudurier
df0743e01e Y400A (gray alpha) input support in libswscale 
Originally committed as revision 32394 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-27 22:24:03 +00:00
Janne Grunau
9f694f0b3d swscale: clear SWS_CPU_CAPS_SSE2 in update_flags_cpu() missed in r32068 
Originally committed as revision 32393 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-27 20:10:53 +00:00
Janne Grunau
829e5dafc2 cosmetics: break long line update_flags_cpu 
Originally committed as revision 32392 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-27 20:09:29 +00:00
Ramiro Polla
33ce384688 fix typos and grammar 
Originally committed as revision 32370 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-26 20:31:04 +00:00
Michael Niedermayer
8c26d83edb Make the avoptions list of sws more complete. 
Originally committed as revision 32369 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-26 19:48:49 +00:00
Michael Niedermayer
635d4aed60 Split alloc and init of context so that parameters can be set in the context 
instead of requireing being passed through function parameters. This also
makes sws work with AVOptions.

Originally committed as revision 32368 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-26 19:33:57 +00:00
Ramiro Polla
f4203ff3d9 swscale: use full chroma input for point scaler 
Originally committed as revision 32360 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-26 17:06:32 +00:00
Ramiro Polla
b9f5e3bd75 swscale-test: cosmetic alignment 
Originally committed as revision 32265 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-16 13:30:02 +00:00
Ramiro Polla
5a90173751 swscale: remove useless temporary variable 
Originally committed as revision 32258 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-16 01:09:59 +00:00
Ramiro Polla
cf1cd520c6 swscale: factorize plane copying code out of 2 functions 
Originally committed as revision 32257 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-16 01:07:55 +00:00
Ramiro Polla
f1084cb0cd swscale-test: always use bilinear scaler to get output for SSD 
Originally committed as revision 32256 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-16 00:41:08 +00:00
Ramiro Polla
c12f7b2d2c rgb2rgb: don't misuse HAVE_* defines 
Introduce and use COMPILE_TEMPLATE_* instead.

Originally committed as revision 32241 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-14 13:12:11 +00:00
Ramiro Polla
40b433b62b swscale: indentation and emtpy line cosmetics 
Originally committed as revision 32222 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-13 14:33:08 +00:00
Ramiro Polla
6527e56131 swscale: avoid reading prior to the source buffer in planar2x() MMX2 
Originally committed as revision 32221 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-13 14:25:18 +00:00
Ramiro Polla
9b4bf9c21d swscale-test: allow specifying src/dst pixel formats 
Originally committed as revision 32215 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-12 18:17:29 +00:00
Ramiro Polla
9075bc7c51 indent 
Originally committed as revision 32214 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-12 18:16:53 +00:00
Ramiro Polla
4bf4478598 swscale-test: take input from reference file 
If the CRC from the src->dst conversion matches a reference, it is not
necessary to perform a dst->yuva420p conversion and check the SSD.

Originally committed as revision 32213 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-12 18:16:33 +00:00
Ramiro Polla
6bbae4c8b3 swscale-test: always use SWS_BILINEAR to convert from ref to src 
Originally committed as revision 32212 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-12 18:15:34 +00:00
Ramiro Polla
3e1e78008b swscale-test: move conversion from ref to source back to doTest() 
The source format parameters are kept in static variables and conversion from
ref to source is only made when any parameter changes.

Originally committed as revision 32211 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-12 18:14:42 +00:00
Ramiro Polla
a51125b52f rgb2rgb: replace shuffle_bytes_2103() by optimized rgb32tobgr32() 
Originally committed as revision 32190 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-12 13:03:41 +00:00
Ramiro Polla
0132ab80a8 indent 
Originally committed as revision 32157 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-11 14:31:13 +00:00
Ramiro Polla
4d8617496f swscale: remove unused code 
yvu9ToYv12Wrapper() used to support yv12 with the chroma planes either in the
uv order or the vu order. FFmpeg no longer has a pixel format in vu order.

Originally committed as revision 32156 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-11 14:30:54 +00:00
Ramiro Polla
4821b4456f rgb2rgb: remove unused yvu9toyv12 function 
Originally committed as revision 32155 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-11 14:29:55 +00:00
Ramiro Polla
4389d606e6 av_fill_image_linesizes -> av_image_fill_linesizes 
Originally committed as revision 32106 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-08 23:36:02 +00:00
Ramiro Polla
539ff40c2d rgb2rgb: build SSE2 codepath 
Originally committed as revision 32068 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-08 13:16:15 +00:00
Ramiro Polla
c17f5a4e15 swscale: also update flags on sws_getCachedContext() 
Originally committed as revision 32052 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-06 14:42:25 +00:00
Ramiro Polla
a1899e0adc swscale: fix internal rgb->yv12 chroma conversion used by the main scaler path 
The shift must be applied before the masking.

Originally committed as revision 32051 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-06 02:02:53 +00:00
vle
87db37356c Fix mlib compilation: add mising include for SwsContext. 
Patch by [vle gmx net].

Originally committed as revision 32050 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-09-05 09:41:24 +00:00
Ramiro Polla
0fc29f2708 swscale: simplify selection of optimizations to compile. 
Originally committed as revision 32013 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-08-25 14:39:11 +00:00
Ramiro Polla
8f02861636 swscale: Always define COMPILE_xxx to either 0 or 1. 
Originally committed as revision 32012 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-08-25 14:38:30 +00:00
Måns Rullgård
66842fe874 swscale: fix unaligned accesses in (RGB|BGR)32_1 to YUV conversion 
Originally committed as revision 32011 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-08-23 21:22:24 +00:00
Måns Rullgård
83761d5b58 swscale: remove unused macro parameter in BGR2UV template 
Originally committed as revision 32010 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-08-23 21:22:20 +00:00
Grant Carver
53bc0dc2bd fix anonymous memory mapping for NetBSD 
mmap() with MAP_ANONYMOUS requires the file descriptor to be -1 in NetBSD.
Linux just ignores this parameter.

Patch by Grant Carver <grantc at cat dot co dot za>

Originally committed as revision 31984 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-08-19 23:48:19 +00:00
Ramiro Polla
8d88402013 swscale-test: add CRC output 
Originally committed as revision 31982 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-08-19 14:36:16 +00:00
Ramiro Polla
a42c29febc validate input data and linesizes 
Originally committed as revision 31976 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-08-18 19:37:37 +00:00
Ramiro Polla
a4fc3bd533 indent 
Originally committed as revision 31949 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-08-08 18:18:13 +00:00
Ramiro Polla
06c93cb705 swscale-test: get strides using av_fill_image_linesizes() from libavcore 
Originally committed as revision 31948 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-08-08 18:14:43 +00:00
Ramiro Polla
e07b1939e5 swscale-test: merge declaration and initialization 
Originally committed as revision 31879 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-07-31 22:02:55 +00:00
Stefano Sabatini
ed80ba7461 Revert commit: 
r31772 | stefano | 2010-07-23 01:01:31 +0200 (Fri, 23 Jul 2010) | 2 lines

  Prefer impersonal form over third person, for consistency with the
  rest of FFmpeg.

The change was not approved by the maintainer.

Originally committed as revision 31847 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-07-28 10:43:02 +00:00
Reimar Döffinger
6cce7cabdb Fix compilation, forgot to add const also to the 
definition of ff_yuv2packedX_altivec

Originally committed as revision 31782 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-07-24 14:43:55 +00:00
Reimar Döffinger
5a55d5b592 More const-correctness fixes to avoid warnings. 
Originally committed as revision 31781 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-07-24 11:37:58 +00:00
Reimar Döffinger
a4eef68f53 Add some "const" to avoid incompatible pointer type warnings 
Originally committed as revision 31780 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-07-24 11:33:28 +00:00
Stefano Sabatini
04f6ab1cef Add missing comma, fix rgb2yuv_table[SWS_CS_SMPTE240M] coefficients. 
Originally committed as revision 31779 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-07-24 11:19:39 +00:00
Stefano Sabatini
24911613a5 Add some comments to the rgb2yuv_table, clarifying the standard where 
are defined.

Originally committed as revision 31778 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-07-24 11:19:35 +00:00
Ramiro Polla
73016d29c9 swscale-test: scale from reference to source only once for each algorithm 
Originally committed as revision 31777 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-07-23 20:27:54 +00:00
Ramiro Polla
be1c5d35cc indent 
Originally committed as revision 31776 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-07-23 20:26:54 +00:00
Ramiro Polla
da78053af0 swscale-test: change order tests are run, maintaining the same algorithm for 
sequential geometries instead of running all algorithms sequentially for each
geometry.

Originally committed as revision 31775 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-07-23 20:26:32 +00:00
Stefano Sabatini
5b9eb68749 Prefer impersonal form over third person, for consistency with the 
rest of FFmpeg.

Originally committed as revision 31772 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-07-22 23:01:31 +00:00
Ramiro Polla
9bb9875eb7 swscale-test: use only 3 characters to print width/height since they're always 
smaller than 1000

Originally committed as revision 31771 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-07-22 19:05:10 +00:00
Ramiro Polla
b6f1e7ec44 swscale-test: print test name before running test, so that it's available in 
the output even if the test crashes.

Originally committed as revision 31770 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-07-22 19:02:49 +00:00
Ramiro Polla
67e1d52783 swscale-test: allocate more memory to prevent scalers from writing out of bounds 
Some converters (ie. unscaled rgb24 -> argb) may write some bytes out of
bounds. Ideally the converters should be fixed, but in the meantime we allocate
more memory to prevent heap corruption.

Originally committed as revision 31768 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-07-22 15:30:22 +00:00
Ramiro Polla
262b6dbad9 darwin: allow 64-bit darwin to allocate executable memory 
darwin requires _DARWIN_C_SOURCE to be defined for MAP_ANON, which is used by
swscale to determine whether to use malloc() or mmap(). 64-bit darwin does not
have an executable heap, so mmap() must be used instead of malloc(), and
therefore _DARWIN_C_SOURCE must be defined.

Originally committed as revision 31760 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-07-21 13:29:55 +00:00
Ramiro Polla
92bfd7461c swscale-test: use av_pix_fmt_descriptors[].name directly 
Originally committed as revision 31759 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-07-20 22:20:23 +00:00
Ramiro Polla
709c0181fd Restore vertical alignment in some defines 
Originally committed as revision 31758 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-07-20 01:45:25 +00:00
Martin Storsjö
e593826b93 Cosmetics: reindent and unify whitespace 
Originally committed as revision 31757 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-07-19 07:06:14 +00:00
Martin Storsjö
72ae5049e1 Do planar copy with a single memcpy only if the stride is equal to the length 
This avoids writing outside of the designated rectangle.

Originally committed as revision 31756 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-07-19 07:02:31 +00:00
Anton Mitrofanov
c85007d559 Another try at fixing swscale on win64, as per r31153. 
Don't change paramater passing, but instead use casts.
Shouldn't affect asm output on anything other than win64.
libswscale should work on win64 now.
The rest of ffmpeg still isn't win64 compatible due to the issue of xmm
clobbers, but swscale doesn't use any SSE.

Patch by Anton Mitrofanov <BugMaster AT narod DOT ru>.

Originally committed as revision 31751 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-07-18 21:39:57 +00:00
Martin Storsjö
c4e2b8268f In planarCopyWrapper, Only copy length, not stride of the last line in the plane 
If the destination planes are offset within the destination buffer,
writing the extra bytes at the end may write outside of the destination
buffer.

Originally committed as revision 31746 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-07-16 17:45:50 +00:00
Benoit Fouet
453d28af60 Change the type of Y table to pointer to void in fill_table(). 
This fixes warnings about wrong type being used, e.g.:
libswscale/yuv2rgb.c: In function ‘ff_yuv2rgb_c_init_tables’:
libswscale/yuv2rgb.c:778: warning: passing argument 4 of ‘fill_table’ from incompatible pointer type
libswscale/yuv2rgb.c:598: note: expected ‘uint8_t *’ but argument is of type ‘uint16_t *’

Originally committed as revision 31722 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-07-12 08:35:20 +00:00
Måns Rullgård
6a01eab73c Add av_ prefix to bswap macros 
Originally committed as revision 31679 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-07-10 22:12:38 +00:00
Eli Friedman
3483d87752 Fix 'assignment from incompatible pointer type' warning. 
Patch by Eli Friedman, eli d friedman a gmail

Originally committed as revision 31628 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-07-03 09:58:13 +00:00
Reinhard Tartler
2b991422f8 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

Originally committed as revision 31301 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-06-01 19:35:16 +00:00
Stefano Sabatini
0093ac5b9f Move internal scale context fields initialization from 
sws_setColorspaceDetails() to ff_yuv2rgb_c_init_tables().

Allow to factorize duplicated code.

Originally committed as revision 31300 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-06-01 11:30:07 +00:00
Reinhard Tartler
3d9408f4a7 remove palette8torgb15 and palette8tobgr15 
They contain exactly the same code as their 16bit variants, so this is
effectively code de-duplication.

Originally committed as revision 31298 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-06-01 06:53:56 +00:00
Diego Biurrun
870a6f4044 Rename yuv2rgb_template2.c --> yuv2rgb_template.c now that the other is gone. 
Originally committed as revision 31279 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-05-30 08:44:05 +00:00
Diego Biurrun
531f97b0c3 Remove GPL-licensed YUV to RGB MMX routines. 
We now have an LGPL replacement that is at least equally fast.

Originally committed as revision 31278 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-05-30 08:31:23 +00:00
Stefano Sabatini
d458b7d445 Add empty newline to separate function declarations, for better 
readability.

Originally committed as revision 31192 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-05-23 10:02:30 +00:00
Stefano Sabatini
b8dbff33bf Cosmetics: make more compact the code for handle_jpeg(), this also allows 
vertical alignment. Improve readability.

Originally committed as revision 31186 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-05-19 22:56:41 +00:00
Stefano Sabatini
4e74187db2 Remove PI definition and use M_PI instead. 
M_PI is defined by the included file libavutil/mathematics.h.

Originally committed as revision 31185 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-05-19 22:49:04 +00:00
Loren Merritt
8a26b2c665 13% faster yuv420 to rgb15 mmx. 
It is now faster than the old gpl version on conroe.

Originally committed as revision 31181 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-05-19 13:31:11 +00:00
Loren Merritt
bffc36e084 40% faster yuv420 to rgb24 mmx. 
It is now faster than the old gpl version on conroe.

Originally committed as revision 31180 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-05-19 08:21:56 +00:00
Ramiro Polla
c3ab0004ae 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.

Originally committed as revision 31170 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-05-12 20:47:32 +00:00
Ramiro Polla
d9d14dc607 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.

Originally committed as revision 31153 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-05-11 00:36:34 +00:00
Ronaldo Moura
447a5b1996 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>

Originally committed as revision 31142 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-05-07 21:59:18 +00:00
Diego Biurrun
f4ea7c8911 alternative LGPL-licensed, MMX-optimized YUV to RGB conversion routines 
written by Kostya Shishkov

Originally committed as revision 31135 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-05-04 09:11:01 +00:00
Diego Biurrun
353285d740 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.

Originally committed as revision 31050 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-04-20 14:47:31 +00:00
Reimar Döffinger
5b03661fa7 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.

Originally committed as revision 30978 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-03-31 17:00:33 +00:00
Diego Biurrun
819ee683d8 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.

Originally committed as revision 30965 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-03-27 11:31:02 +00:00
Diego Biurrun
f25b1c4b6b HAVE_MMX2 implies HAVE_MMX, so checking the latter is enough. 
Originally committed as revision 30961 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-03-26 07:57:54 +00:00
Diego Biurrun
f684f3c58a AltiVec implies a PPC CPU, so there is no need to check for both. 
Originally committed as revision 30954 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-03-23 22:59:14 +00:00
Diego Biurrun
13bc1ac31a Do not compile AltiVec code when AltiVec is not available; not even in 
runtime cpudetection mode.
Fixes compilation with '--enable-runtime-cpudetect --disable-altivec'.

Originally committed as revision 30952 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-03-23 20:12:52 +00:00
Diego Biurrun
f5af8f1625 Replace wrong condition name in #endif comment by correct instance. 
Originally committed as revision 30938 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-03-19 09:58:45 +00:00
Diego Biurrun
81bbd840fe 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.

Originally committed as revision 30937 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-03-19 09:57:36 +00:00
Janusz Krzysztofik
22e8222fd2 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

Originally committed as revision 30934 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-03-18 23:02:32 +00:00
Reinhard Tartler
07cea6d1cd Fix compilation on powerpc with --disable-altivec 
in case altivec is disabled, even compilation of code using altivec
keywords or asm must be avoided.

Originally committed as revision 30869 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-03-09 08:07:34 +00:00
Reimar Döffinger
97cda76a69 Check for allocation failure for c->lumMmx2FilterCode and c->chrMmx2FilterCode. 
Originally committed as revision 30864 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-03-08 19:41:57 +00:00
Reimar Döffinger
12423f170f Fix memleak due to incorrect VirtualFree arguments: size must be 0 for MEM_RELEASE. 
Originally committed as revision 30863 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-03-08 19:37:10 +00:00
Stefano Sabatini
3de42635bd Avoid duplication of usePal() macro. 
Originally committed as revision 30856 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-03-06 11:50:54 +00:00
Janusz Krzysztofik
a4e441301d Add support to BGR444/RGB444 foreign endian output in libswscale. 
Patch by Janusz Krzysztofik |jkrzyszt ^ tis icnet pl|.

Originally committed as revision 30855 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-03-06 11:27:31 +00:00
Michael Niedermayer
e5a1c20707 try to avoid returning odd slices. 
Originally committed as revision 30847 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-03-05 21:39:27 +00:00
Benoit Fouet
124cb45137 Cosmetics: fix vertical alignment. 
Originally committed as revision 30842 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-03-05 08:41:35 +00:00
Janusz Krzysztofik
601949b898 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

Originally committed as revision 30841 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-03-05 08:32:54 +00:00
Alexis Ballier
1379b58482 Support BGR555, BGR565, RGB555 and RGB565 foreign endian output in 
libswscale.

Patch by Alexis Ballier, alexis D ballier A gmail

Originally committed as revision 30840 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-03-04 16:57:04 +00:00
Stefano Sabatini
91cfeac668 Revert r30825, it was not supposed to be committed. 
127.32L to me, beware when using git svn dcommit for committing stuff
to svn...

Originally committed as revision 30827 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-03-04 01:02:24 +00:00
Stefano Sabatini
23bf3b2c97 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.

Originally committed as revision 30826 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-03-04 00:31:13 +00:00
Stefano Sabatini
3fec44c640 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.

Originally committed as revision 30825 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-03-04 00:31:10 +00:00
Carl Eugen Hoyos
627686e635 Make sws_dcVec static: It is only used inside libswscale/utils.c. 
Originally committed as revision 30787 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-02-28 02:18:16 +00:00
Stefano Sabatini
479e1e6170 Remove pointless empty line. 
Originally committed as revision 30730 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-02-25 21:21:29 +00:00
Stefano Sabatini
8ebed38e7a Apply consistency nit. 
Originally committed as revision 30729 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-02-25 21:12:38 +00:00
Ramiro Polla
f1d5a1f285 Reorder buffer debug. Also print out if slice was buffered. 
Originally committed as revision 30722 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-02-23 16:46:43 +00:00
Stefano Sabatini
b623d0cb03 Reindent and fix brace placement. 
Originally committed as revision 30643 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-02-18 21:20:37 +00:00
Stefano Sabatini
22b6a24c34 Vertically align a list of comparisons in sws_getCachedContext(). 
Originally committed as revision 30642 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-02-18 21:17:07 +00:00
Stefano Sabatini
5a011d8b08 Merge two if conditions, allow to decrese the level of indentation of 
the block.

Originally committed as revision 30641 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-02-18 21:12:05 +00:00
Stefano Sabatini
62bb4ca199 Simplify how usesVFilter and usesHFilter are set. 
Originally committed as revision 30520 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-02-05 23:53:25 +00:00
Stefano Sabatini
fbc0f6a973 Apply misc fixes to sws_getCoefficients() doxy. 
Originally committed as revision 30519 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-02-05 22:56:59 +00:00
Stefano Sabatini
89ee5c6897 Satisfy consistency need: 
int * sws_getCoefficients  -> int *sws_getCoefficients.

Originally committed as revision 30518 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-02-05 22:54:45 +00:00
David Conrad
3f3dc76cb1 Add function to translate SWS_CS_* to coefficient array 
Originally committed as revision 30513 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-02-05 16:09:03 +00:00
Stefano Sabatini
82e5f86bd5 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

Originally committed as revision 30501 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-02-03 23:46:00 +00:00
Stefano Sabatini
af0e662169 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

Originally committed as revision 30474 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-31 10:16:05 +00:00
Måns Rullgård
e62bd367ea Blackfin: use SRAM only when CONFIG_SRAM is set 
Originally committed as revision 30472 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-31 00:20:37 +00:00
Stefano Sabatini
909f659473 Reindent. 
Originally committed as revision 30467 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-30 21:58:09 +00:00
Stefano Sabatini
3ece3e524f Use a consistent convention for the names of the internal wrapper 
functions. Improve readability.
 -This line, and those below, will be ignored--

     swscale.c

Originally committed as revision 30466 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-30 21:56:33 +00:00
Stefano Sabatini
7dac0c4379 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

Originally committed as revision 30457 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-30 13:31:00 +00:00
Stefano Sabatini
b51de6d8c7 Rename swscale-example to swscale-test, to better reflect the intended 
use of the program.

Originally committed as revision 30439 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-27 00:25:23 +00:00
Michael Niedermayer
6022255774 Use isAnyRGB() where possible 
Originally committed as revision 30435 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-26 08:03:28 +00:00
Michael Niedermayer
81858371d9 Add 3 more RGB makros that allow specifying RGB in bytes and any rgb/bgr. 
Originally committed as revision 30434 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-26 08:01:50 +00:00
Michael Niedermayer
3b1ee70312 Rename isRGB() and isBGR() as their meaning is confusing. 
Originally committed as revision 30433 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-26 07:40:14 +00:00
Stefano Sabatini
7b87519b32 Merge two "if (flags & SWS_PRINT_INFO) { ... }" blocks, slightly 
simplify code.

Originally committed as revision 30432 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-25 22:46:09 +00:00
Stefano Sabatini
aa2ead8215 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.

Originally committed as revision 30431 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-24 21:28:17 +00:00
Stefano Sabatini
f632c4549b Merge two "if (flags & SWS_PRINT_INFO) { ... }" blocks. 
Originally committed as revision 30425 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-24 17:44:43 +00:00
Stefano Sabatini
30b6147521 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.

Originally committed as revision 30419 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-24 12:55:05 +00:00
Ramiro Polla
59398ea9c0 Indent. 
Originally committed as revision 30413 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-24 03:02:40 +00:00
Ramiro Polla
2658e7a6e7 Don't redefine M_PI. It is already defined from libavutil/mathematics.h. 
Originally committed as revision 30412 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-24 02:16:26 +00:00
Ramiro Polla
a4388ebd37 Split swscale.c into scaler code (swscale.c) and utility code (utils.c). 
Originally committed as revision 30411 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-24 02:08:22 +00:00
Måns Rullgård
4a88852623 Move array specifiers outside DECLARE_ALIGNED() invocations 
Originally committed as revision 30385 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-22 03:26:30 +00:00
David Conrad
01cc47dcd3 More const-correctness for sws_scale 
Originally committed as revision 30381 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-21 09:52:11 +00:00
Ramiro Polla
5d4d503fd0 Document some more of SwsContext. 
Originally committed as revision 30380 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-20 03:26:12 +00:00
Stefano Sabatini
613f2dc4ae 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.

Originally committed as revision 30379 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-20 00:22:31 +00:00
Stefano Sabatini
0e21dcdb13 Split overly long line. 
Originally committed as revision 30378 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-19 22:36:46 +00:00
Stefano Sabatini
731c04ad65 Make selfTest() perform tests where both the input and output formats 
are supported, avoid pointless loops.

Originally committed as revision 30377 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-19 21:52:00 +00:00
Alexis Ballier
f28cc5771f Make const prototypes for input sources of sws_scale_* stricter. 
Patch by Alexis Ballier gmailify($firstname, $familyname)

Originally committed as revision 30374 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-19 16:30:20 +00:00
Ramiro Polla
9e5f164dc1 swscale-example: Add comment about the use of av_{malloc,free}. 
Originally committed as revision 30373 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-19 15:42:51 +00:00
Ramiro Polla
3aca8b59f6 Remove useless forward declaration. 
Originally committed as revision 30371 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-19 11:35:04 +00:00
Zuxy Meng
d5206d3dd6 User friendly warning message that gives out names of source and target formats 
Originally committed as revision 30370 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-19 05:21:17 +00:00
Måns Rullgård
51d83986b1 swscale-example: use av_malloc() 
Image buffers require 16-byte alignment, so av_malloc() should be used.
Fixes crash on PPC.

Originally committed as revision 30369 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-19 03:47:11 +00:00
Stefano Sabatini
2d8d885b06 Split long line. 
Originally committed as revision 30368 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-18 23:34:07 +00:00
Stefano Sabatini
591e465acf Convert int -> enum PixelFormat in doTest(). 
Originally committed as revision 30367 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-18 23:33:17 +00:00
Zuxy Meng
3c52d4849f Define out currently unused static functions. 
Originally committed as revision 30365 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-18 08:42:04 +00:00
Stefano Sabatini
c36a4294dc Remove stray '\' at the end of macro definitions. 
Originally committed as revision 30362 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-17 23:29:31 +00:00
Stefano Sabatini
90eb284a77 Remove duplicated or pointless newlines. 
Originally committed as revision 30361 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-17 23:17:47 +00:00
Stefano Sabatini
398c193d0b Factorize error message logging, log it if the converter cannot be 
set.

Originally committed as revision 30360 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-17 23:07:37 +00:00
Stefano Sabatini
e36a545de5 Reindent after the last commit. 
Originally committed as revision 30359 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-17 23:02:20 +00:00
Stefano Sabatini
c0d1dc1c4f 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.

Originally committed as revision 30358 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-17 23:00:01 +00:00
Måns Rullgård
00c4127ec9 Remove double const 
Originally committed as revision 30357 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-17 19:26:35 +00:00
Stefano Sabatini
9a180390b9 Factorize error message logging in rgb2rgbWrapper(). 
Originally committed as revision 30356 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-17 15:11:25 +00:00
Måns Rullgård
1b5d46c6a6 Reindent 
Originally committed as revision 30350 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-17 14:25:19 +00:00
Måns Rullgård
d39d7cf693 Remove inline from initFilter() 
It makes no sense having that function inlined.

Originally committed as revision 30349 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-17 14:25:17 +00:00
Stefano Sabatini
e922e34c96 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

Originally committed as revision 30341 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-17 00:26:29 +00:00
Stefano Sabatini
5090d8e16a 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

Originally committed as revision 30340 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-17 00:21:50 +00:00
Stefano Sabatini
a630ed3ee9 Fix typo, "get rid off" -> "get rid of". 
Originally committed as revision 30338 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-16 22:49:00 +00:00
Stefano Sabatini
730cb9dab3 Revert r30331, which broke compilation. 
swScale_C is not templated if any optimization is to be used and
!runtime_cpudetect.

Originally committed as revision 30334 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-16 19:51:26 +00:00
Stefano Sabatini
73cadb4f13 Prefer enum PixelFormat to int as the parameter type of 
fmt_depth(fmt).

Originally committed as revision 30333 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-16 19:32:58 +00:00
Stefano Sabatini
bc45751f7f 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’:

Originally committed as revision 30332 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-16 19:22:30 +00:00
Stefano Sabatini
80853cfc6a Factorize the code which calls the non optimized C functions in 
getSwsFunc().

Originally committed as revision 30331 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-16 19:19:54 +00:00
Stefano Sabatini
c70f1401df Prefer "to %s%s" over "to%s %s", slightly more readable. 
Originally committed as revision 30330 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-16 19:14:29 +00:00
Stefano Sabatini
a9e2878c48 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.

Originally committed as revision 30329 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-16 19:11:03 +00:00
Ramiro Polla
9556124c97 Document some of SwsContext. 
Originally committed as revision 30328 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-16 19:04:55 +00:00
Ramiro Polla
0cc854e377 Reuse h{lum,chr}Filter{,Pos} variables for MMX2 fast_bilinear horizontal scaler. 
Originally committed as revision 30327 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-16 18:39:06 +00:00
Stefano Sabatini
d95c863850 Factorize code which logs the source and destination formats in 
sws_getContext().

Originally committed as revision 30326 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-16 18:36:21 +00:00
Stefano Sabatini
3e906f4cfb Simplify reset_ptr(): employ usePal() macro rather than enumerating 
all the paletted formats.

Originally committed as revision 30317 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-16 11:08:16 +00:00
Måns Rullgård
e8393e1cb8 Add symbol versioning for shared libraries 
Based on patch by Reinhard Tartler <siretart tauware de>

Originally committed as revision 30315 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-16 04:48:55 +00:00
Ramiro Polla
2e3e8031ec Don't initialize normal horizontal filter if MMX2 filter is used. 
Originally committed as revision 30313 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-15 19:50:59 +00:00
Zuxy Meng
a959e24780 Const correctness for src pointer. Remove all constness related warnings in 
libswscale.

Originally committed as revision 30306 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-15 08:51:51 +00:00
Stefano Sabatini
3bfbbef64d Fix typo. 
Originally committed as revision 30304 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-15 00:39:25 +00:00
Ramiro Polla
00c081a8f0 Remove unused clip_table code. 
Originally committed as revision 30303 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-14 19:12:42 +00:00
Ramiro Polla
efc034cc0f Add const qualifier to rgb48 to YV12 functions' src. 
Originally committed as revision 30301 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-14 06:19:45 +00:00
Ramiro Polla
a3e35e2852 Add missing parameter to rgb48 to YV12 functions. 
Originally committed as revision 30300 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-14 06:19:10 +00:00
David Conrad
28b2866f45 /nop is illegal with Apple's older version of gas, this was fixed elsewhere 
but not here since it was unused before now.

Originally committed as revision 30289 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-12 19:03:09 +00:00
Zuxy Meng
845e37e770 Make sure that sfence is used after any non temporal stores. 
Originally committed as revision 30287 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-12 02:34:33 +00:00
Zuxy Meng
52c0fcaf52 Avoid redefinition of RGB_PLANAR2PACKED24 as the template is included for 
multiple times.

Originally committed as revision 30273 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-11 08:21:31 +00:00
Ramiro Polla
996de2fefa cosmetics: {} placement. 
Originally committed as revision 30272 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-11 07:30:28 +00:00
Zuxy Meng
23b0072ad7 MMX(2) accelerated yuv420->rgb24 routine, trivial as essentially as it just 
swaps R and B inputs for the existing yuv420->bgr24 routine.

Originally committed as revision 30254 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-09 17:20:49 +00:00
Zuxy Meng
4b19045566 Remove unused PREFETCHW macro 
Originally committed as revision 30253 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-09 14:44:20 +00:00
Reimar Döffinger
1b168a428d Ignore 0-height slice in sws_scale, otherwise a final 0-height slice will 
cause libswscale to assume the incorrect slice order and complain about
slices starting in the middle.

Originally committed as revision 30246 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-08 19:31:33 +00:00
Stefano Sabatini
8e9767f6fd Implement sws_isSupportedInput() and sws_isSupportedOutput(). 
Originally committed as revision 30236 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-07 19:07:47 +00:00
Zuxy Meng
bb34acd8a4 Remove const to avoid a bunch of GCC warnings against discarded qualifiers and 
incompatible pointer type.

Originally committed as revision 30234 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-07 07:13:18 +00:00
Stefano Sabatini
634116df3e Prefer enum PixelFormat over int for the type of the format parameter 
of getSubSampleFactors().

Originally committed as revision 30184 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-03 15:20:07 +00:00
Stefano Sabatini
997980f0d8 Prefer "*FUNC_NAME(" over "* FUNC_NAME(" for the 
swscale_configuration() and swscale_license() functions, consistent
with the rest of FFmpeg.

Originally committed as revision 30180 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-03 14:35:20 +00:00
Stefano Sabatini
f412d5e97a Simplify usePal() macro, make it use av_pix_fmt_descriptors. 
Originally committed as revision 30172 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-03 00:22:49 +00:00
Stefano Sabatini
b3cf7cb144 Simplify getSubSampleFactors(), make it use the values provided by 
av_pix_fmt_descriptors().

Originally committed as revision 30171 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-03 00:09:24 +00:00
Reimar Döffinger
f514b4f937 Do not needlessly use the BP register in x86_64-specific code, there are 
enough other registers available that are less likely to cause issues.

Originally committed as revision 30160 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2010-01-01 09:46:24 +00:00
Diego Biurrun
c887b30d79 Remove unused variable, fixes the warning: 
libswscale/swscale_template.c:2575: warning: unused variable ‘srcFormat’

Originally committed as revision 30132 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-12-28 12:05:20 +00:00
Ramiro Polla
aaba7e6c66 Remove parameters no longer used in h[yc]scale(). 
Originally committed as revision 30099 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-12-21 01:59:34 +00:00
Ramiro Polla
a1f4b4bb6e Move fast bilinear scaler code to the existing h[yc]scale_fast() functions. 
Originally committed as revision 30098 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-12-21 01:54:59 +00:00
Ramiro Polla
bb53e1d188 Rename function pointers used to convert from the input pixel format to the 
intermediate YV12 to a more descriptive name.

Originally committed as revision 30097 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-12-21 01:41:29 +00:00
Ramiro Polla
e7a47515ab Check if chroma horizontal scaler is needed in sws_init_swScale(). 
Originally committed as revision 30096 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-12-21 01:34:45 +00:00
Ramiro Polla
6f9771d7a6 Remove unused fields from SwsContext. 
Originally committed as revision 30095 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-12-21 01:30:55 +00:00
Ramiro Polla
d3243d1431 Indentation. 
Originally committed as revision 30087 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-12-20 17:42:35 +00:00
Ramiro Polla
e77ddfa293 Indent. 
Originally committed as revision 30086 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-12-20 17:15:01 +00:00
Ramiro Polla
b501a1f56a Set fast_bilinear functions in sws_init_swScale(). 
Originally committed as revision 30085 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-12-20 17:09:46 +00:00
Ramiro Polla
bae76dc3eb Set horizontal scaler's range conversion in context in sws_init_swScale(). 
Originally committed as revision 30082 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-12-20 16:32:58 +00:00
Ramiro Polla
84011f10d5 Set horizontal scaler's src offsets in context in sws_init_swScale(). 
Originally committed as revision 30081 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-12-20 16:21:25 +00:00
Ramiro Polla
a8bcc7b42b Document the differences between the two asm fragments in initMMX2HScaler(). 
Originally committed as revision 29978 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-12-07 03:52:55 +00:00
Ramiro Polla
75084e47ff Start using intermediate buffers at index 0. 
These index variables are incremented before each use, so they should be
initialized to -1.

Originally committed as revision 29977 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-12-06 22:01:25 +00:00
Ramiro Polla
e470691aa8 Fix compilation with runtime cpu detection. 
All functions in swscale_template.c should be declared with the RENAME macro.

Originally committed as revision 29976 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-12-05 09:44:19 +00:00
Ramiro Polla
f415be684d Add support for nv12/nv21 input. 
Originally committed as revision 29974 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-12-03 18:18:13 +00:00
Stefano Sabatini
a9af75ae85 Make sws_format_name() use av_pix_fmt_descriptors. 
This also introduces a dependency of libswscale on libavutil.

Originally committed as revision 29968 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-11-26 21:08:45 +00:00
Diego Biurrun
bd381fd3f6 Add functions to return library license and library configuration. 
Originally committed as revision 29932 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-11-18 17:16:02 +00:00
NVIDIA Corporation
8cbcb1c732 Support VDPAU hardware accelerated decoding of MPEG-4 ASP on capable 
hardware.

Original patch by NVIDIA corporation.

Originally committed as revision 29885 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-11-10 19:11:13 +00:00
Carl Eugen Hoyos
b411dfff4c Use enum PixelFormat instead of int for srcFormat and dstFormat. 
Originally committed as revision 29857 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-11-08 23:31:43 +00:00
Stefano Sabatini
2e0a80a128 Document sws_freeContext(). 
Originally committed as revision 29844 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-11-07 09:23:11 +00:00
Stefano Sabatini
a520e9f235 Document slice ordering assumption done by sws_scale(). 
Originally committed as revision 29804 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-10-30 14:13:25 +00:00
Diego Biurrun
53e5462040 Replace manual gcc version check by AV_GCC_VERSION_AT_LEAST macro. 
Originally committed as revision 29701 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-09-22 14:38:49 +00:00
Ramiro Polla
c866c7d041 Cleanup buffer debugs in swScale(). 
Originally committed as revision 29686 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-09-16 22:34:48 +00:00
Ramiro Polla
953c821f9b Use correct buffers in vertical scaler in unscaled YV12 case. 
Originally committed as revision 29685 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-09-16 22:31:43 +00:00
Ramiro Polla
749fac310c Reset slice direction at end of each frame. 
Originally committed as revision 29675 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-09-13 01:49:40 +00:00
Ramiro Polla
9451b59fc6 Remove ; after while(0) in macros. 
Originally committed as revision 29674 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-09-12 20:10:22 +00:00
Ramiro Polla
30715d4273 Document that slices can be bottom to top or top to bottom. 
Originally committed as revision 29665 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-09-09 21:43:25 +00:00
Ramiro Polla
7d73d1c336 Indent. 
Originally committed as revision 29654 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-09-07 16:29:32 +00:00
Ramiro Polla
9cf484d06e Rename CHECKED_ALLOC(Z) to FF_ALLOC(Z)_OR_GOTO and add context and label 
parameters.

Originally committed as revision 29652 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-09-06 00:07:35 +00:00
Ramiro Polla
c2613a3137 Indent. 
Originally committed as revision 29651 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-09-05 23:35:59 +00:00
Lars Täuber
991e579cae Make 16bit YUV formats compatible with NE avcodec_get_pix_fmt(). 
Patch by Lars Täuber <lars <dot> taeuber <at> gmx <dot> net>.

Originally committed as revision 29650 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-09-05 23:33:11 +00:00
Ramiro Polla
67c2c5bb2e Curly brackets cosmetics for previous commit. 
Originally committed as revision 29587 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-29 23:08:32 +00:00
Ramiro Polla
1ddb5747df Check for return value of initFilter(). 
Originally committed as revision 29586 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-29 23:06:22 +00:00
Ramiro Polla
dd653355fa Revert mistakenly commited hunk. 
Originally committed as revision 29585 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-29 23:03:14 +00:00
Ramiro Polla
7248797c03 swscale: Check for return values of malloc. 
Originally committed as revision 29584 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-29 23:02:01 +00:00
Ramiro Polla
111641a97a swscale-example: Free memory used by input data. 
Originally committed as revision 29583 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-29 03:36:09 +00:00
Ramiro Polla
0607b09069 Restore comment that was partially removed. 
Originally committed as revision 29582 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-29 02:44:03 +00:00
Ramiro Polla
89fb9516af swscale-example: Rename src->ref so as to not confuse with src being used in doTest(). 
Originally committed as revision 29548 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-23 20:31:38 +00:00
Ramiro Polla
7da35acdab swscale-example: Use SWS_BILINEAR instead of hardcoded value. 
Originally committed as revision 29547 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-23 20:29:49 +00:00
Ramiro Polla
a48ce2c3a7 Fix inconsistent indentation. 
Originally committed as revision 29545 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-22 19:30:19 +00:00
Ramiro Polla
1b03a9d607 Check return values of sws_allocVec() and sws_getConstVec(). 
Originally committed as revision 29543 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-20 01:55:45 +00:00
Reimar Döffinger
64d39b7c76 Free initial swscale context, too. Avoids a valgrind warning. 
Originally committed as revision 29538 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-19 08:21:55 +00:00
Reimar Döffinger
7b67bd92f4 Remove useless casts of malloc return value. 
Originally committed as revision 29537 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-19 08:18:53 +00:00
Ramiro Polla
1aff375d41 Introduce and use sws_allocVec(). 
Originally committed as revision 29536 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-19 01:33:17 +00:00
Ramiro Polla
20484b90ec Reuse sws_getConstVec() where possible. 
Originally committed as revision 29535 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-19 01:32:06 +00:00
Ramiro Polla
6b052ba88f swscale-example: Make selection of dstW, dstH, and flags more clear. 
Originally committed as revision 29527 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-17 02:06:00 +00:00
Ramiro Polla
c255994b29 More indentation changes leftover from r29522: 
- Align asm code to the column 4 spaces after the call to __asm__();
- Align cases in switch statements to the same column as "switch".

Originally committed as revision 29524 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-16 21:37:07 +00:00
Ramiro Polla
dd68318cee Cosmetics: 
- Place curly brackets in the same line as while/for/if/switch/else/do;
- Place curly brackets at column 0 in the next line starting a function.

Originally committed as revision 29523 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-16 21:11:28 +00:00
Ramiro Polla
9b734d44ab Indent libswscale: 
- Use 4 spaces throughout for indentation;
- Fix inconsistent indentation;
- Indent function calls and declarations aligning arguments on multiple lines
  to the column after the opening parentheses;
- Align asm code to the column 4 spaces after the call to __asm__();
- Align cases in switch statements to the same column as "switch".

Originally committed as revision 29522 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-16 00:32:04 +00:00
Ramiro Polla
ebe5dec22b Indent. 
Originally committed as revision 29518 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-15 02:35:55 +00:00
Ramiro Polla
52154148f4 Vertical yuv -> yuv16 scaler. 
Originally committed as revision 29517 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-14 15:52:40 +00:00
Peter Schlaile
562f685307 BGR32 MMX special convertor. 
Patch by Peter Schlaile < peter at schlaile dot de >

Originally committed as revision 29515 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-14 02:15:28 +00:00
Ramiro Polla
737cbcde08 Indent. 
Originally committed as revision 29512 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-13 19:03:14 +00:00
Ramiro Polla
d426ea20c9 swscale-example: Don't check for chroma planes in mono formats. 
Originally committed as revision 29511 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-13 18:39:39 +00:00
Ramiro Polla
48f4c61252 MMX2 horizontal scaler: Determine code size at runtime. 
Originally committed as revision 29510 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-13 18:31:07 +00:00
Ramiro Polla
0728778885 Protect mmx2 filter code buffers so they are not executable and writeable at 
the same time (only mmap for now).

Originally committed as revision 29509 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-13 18:29:54 +00:00
Ramiro Polla
b0e1343b85 Remove duplicate define (it is the same in the lum code). 
Originally committed as revision 29508 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-13 18:28:55 +00:00
Ramiro Polla
bcdedf675f Rename "funny" code to "mmx2 filter" code. 
Originally committed as revision 29507 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-13 18:28:17 +00:00
Ramiro Polla
475f361308 Indent. 
Originally committed as revision 29506 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-13 13:18:59 +00:00
Ramiro Polla
e55ed689a2 swscale-example: Remove hack to end loop by setting variables to break. 
Originally committed as revision 29505 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-13 11:48:06 +00:00
Ramiro Polla
d7cf0a6ff7 swscale-example: Don't return random value from main(). 
Originally committed as revision 29504 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-13 11:34:27 +00:00
Ramiro Polla
f5a9c4ee50 swscale-example: Check for Gray formats. 
Originally committed as revision 29503 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-13 11:33:18 +00:00
Diego Biurrun
9bb3f3edfe Remove disabled debug code. 
Originally committed as revision 29485 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-10 10:53:32 +00:00
Ramiro Polla
184410e60b Put some altivec code under COMPILE_ALTIVEC, and not HAVE_ALTIVEC. 
Originally committed as revision 29484 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-09 15:34:57 +00:00
Kostya Shishkov
df226e6369 Remove 'offset' argument from PUTRGB* macros since it's unneeded and caused 
pixel swapping during some YUV2RGB conversions.

Originally committed as revision 29483 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-09 15:04:17 +00:00
Diego Biurrun
0bf18ed32d Remove disabled crufty code. 
Originally committed as revision 29482 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-08 15:18:48 +00:00
Guennadi Liakhovetski
062394e07c Fix regression when converting to nv12/nv21. 
Patch by Guennadi Liakhovetski,  g D liakhovetski A gmx D de

Originally committed as revision 29464 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-08-01 21:30:36 +00:00
Ramiro Polla
469fd9b0e1 MMX2 scaler: Remove {} block leftover from factorization in initMMX2Scaler(). 
Merge variable declarations to previous {} block and indent.

Originally committed as revision 29454 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-07-28 05:45:47 +00:00
Ramiro Polla
f1c6dfa371 MMX2 scaler: factorize initMMX2Scaler(). 
Originally committed as revision 29453 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-07-28 05:42:46 +00:00
Ramiro Polla
901775c714 MMX2 scaler: add variable to ease factorization of initMMX2Scaler(). 
Originally committed as revision 29452 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-07-28 05:41:22 +00:00
Ramiro Polla
cbdc08d5a6 Indent. 
Originally committed as revision 29451 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-07-28 05:14:47 +00:00
Ramiro Polla
fb91df397a Remove duplicate horizontal scaling when there aren't enough lines in a slice 
to output the dstY line.

Originally committed as revision 29450 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-07-28 05:13:36 +00:00
Ramiro Polla
571d9587cf Remove useless code. 
flags can never be any other kind of scaling algorithm inside this if().

Originally committed as revision 29449 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-07-28 04:46:39 +00:00
Ramiro Polla
94daf2e94c Do not misuse HAVE_ defines. Introduce COMPILE_TEMPLATE_ defines and use them 
instead.

Originally committed as revision 29446 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-07-27 06:47:41 +00:00
Ramiro Polla
18c61752fd Factorize x86 fast_bilinear assembly. 
Originally committed as revision 29445 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-07-27 06:22:00 +00:00
Ramiro Polla
6d08d7f3c8 Fix assembly comments for x86 fast_bilinear so they match the C code. 
Originally committed as revision 29444 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-07-27 06:20:17 +00:00
Måns Rullgård
a898cdc995 Replace WORDS_BIGENDIAN with HAVE_BIGENDIAN 
Originally committed as revision 29439 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-07-26 12:26:32 +00:00
Måns Rullgård
78d01adaa7 Remove unnecessary #include <unistd.h> 
Originally committed as revision 29437 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-07-23 15:23:03 +00:00
Ramiro Polla
804db4466d Remove unused variables. 
Originally committed as revision 29435 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-07-21 20:17:15 +00:00
Ramiro Polla
71ed6c8f06 Remove dependency from swscale_internal.h to lavu/internal.h, it is no longer 
needed for DECLARE_ALIGNED.
Remove dependency from swscale-example.c to swscale_internal.h by duplicating
the necessary code. The duplicated code is a hack and should be removed once a
cleaner pixel format information system exists. swscale-example.c is example
code on how to use the library and therefore shouldn't rely on internal
headers.

Originally committed as revision 29415 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-07-09 02:27:39 +00:00
Diego Biurrun
29ce043374 The AltiVec code in libswscale no longer is under GPL. 
Remove one erroneous preprocessor check for CONFIG_GPL in the AltiVec code.

Originally committed as revision 29412 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-07-05 20:10:59 +00:00
Måns Rullgård
b4b9170234 Use enum PixelFormat in sws_format_name() prototype 
Originally committed as revision 29409 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-07-01 12:40:28 +00:00
Diego Biurrun
8b1a644177 AltiVec code and runtime cpudetect do not require CONFIG_GPL. 
Make sure the latter is only checked for x86 optimizations, which are GPL.

Originally committed as revision 29390 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-06-25 20:06:03 +00:00
Diego Biurrun
57f6d52a22 The AltiVec optimizations of libswscale are no longer under GPL. 
Originally committed as revision 29389 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-06-25 11:27:36 +00:00
Diego Biurrun
e912c13ad7 PPC: Make sure that COMPILE_C is not deactivated if RUNTIME_CPUDETECT is set. 
Originally committed as revision 29388 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-06-25 10:14:05 +00:00
Vitor Sessak
fa8c408b26 Do not call rgb2rgbWrapper() for rgb48*, there is no special converter 
yet for those formats

Originally committed as revision 29371 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-06-17 18:40:19 +00:00
Ramiro Polla
fdf70cc5c9 Kill warnings of possibly unused variables by using av_unused. 
Originally committed as revision 29355 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-06-11 17:10:54 +00:00
Diego Biurrun
dc8229015c Fix compilation: #undef standard library functions that are 
forbidden within FFmpeg, but allowed in example code.

Originally committed as revision 29354 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-06-11 15:15:43 +00:00
Diego Biurrun
02163b799d Add libavutil/internal.h #include, required for the DECLARE_ALIGNED macro. 
This fixes swscale-example compilation.

Originally committed as revision 29353 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-06-11 10:19:04 +00:00
Stefano Sabatini
532ec28360 Remove '\p' doxygen markup, as it should improve plain text doxy 
readability.

Originally committed as revision 29351 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-06-06 09:37:46 +00:00
Ramiro Polla
c0cf20a24a Use DECLARE_ALIGNED macro instead of __attribute__((aligned)) for ppc code. 
Originally committed as revision 29350 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-06-04 22:50:38 +00:00
Ramiro Polla
934626a9f9 Replace more uses of __attribute__((aligned)) by DECLARE_ALIGNED. 
Originally committed as revision 29349 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-06-04 22:10:52 +00:00
Pavel Pavlov
92db623584 Use DECLARE_ALIGNED macro instead of gcc __attribute__. 
Patch by Pavel Pavlov <pavel at summit-tech dot ca>

Originally committed as revision 29348 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-06-04 21:55:52 +00:00
Kostya Shishkov
5d5a8813fc Testing RGB48 variants requires bigger stride in swscale-example.c 
Originally committed as revision 29343 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-06-02 15:35:58 +00:00
Kostya Shishkov
68e7f4828d YUV into RGB48 BE/LE conversion support 
Originally committed as revision 29342 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-06-02 12:30:11 +00:00
Kostya Shishkov
e8417235d0 Partial (low bits ignored, no direct transcoding into other RGB formats) support 
for inputting RGB48BE/LE.

Originally committed as revision 29341 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-06-02 12:28:49 +00:00
Kostya Shishkov
80704c47c4 Move colorspace conversion functions implemented in pure C from template 
into swscale.c

Originally committed as revision 29320 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-05-25 16:42:54 +00:00
Kostya Shishkov
5b21719ea2 Let SwScaler know that RGB48 BE/LE is 16-bits per component format. 
Originally committed as revision 29317 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-05-19 17:37:58 +00:00
Kostya Shishkov
075ec82c54 Make SwScaler recognize RGB48 BE/LE colourspaces (not support though). 
Originally committed as revision 29316 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-05-19 17:26:22 +00:00
Diego Biurrun
0020c54cb8 Add const qualifier to param argument of sws_getContext() and 
sws_getCachedContext().  Fixes the warning:
swscale.c:3408: warning: assignment discards qualifiers from pointer target type

Originally committed as revision 29288 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-05-10 14:00:00 +00:00
Diego Biurrun
465477e1fb Move preprocessor condition before variable declaration, fixes the warning: 
libswscale/swscale.c:1795: warning: unused variable 'flags'

Originally committed as revision 29287 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-05-10 11:37:04 +00:00
Diego Biurrun
f1933e436c Add missing const qualifiers to AltiVec function parameters where appropriate. 
Fixes a couple of 'discards qualifiers from pointer target type' warnings.

Originally committed as revision 29281 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-05-09 10:56:37 +00:00
Vitor Sessak
5f9ae1983d Fix sliced yuv410 -> yuv420 conversion 
Originally committed as revision 29272 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-05-07 20:41:04 +00:00
Michael Niedermayer
9507d91150 Change VOFW for x86 to 5120, it allows larger images to be scaled and was 
not slower. Other archs are not changed as the larger VOFW was slower on PPC.

Originally committed as revision 29256 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-05-05 01:34:16 +00:00
Cédric Schieli
f267119786 Fix chroma shift when scaling from ARGB on LE and BGRA on BE 
Originally committed as revision 29242 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-05-02 08:40:53 +00:00
Cédric Schieli
b78c8e2103 Remove useless duplicated code in yuv2rgb_c_32, yuva2rgba_c and yuva2argb_c 
Originally committed as revision 29240 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-04-27 14:25:44 +00:00
Carl Eugen Hoyos
8e86dd1241 Make reset_ptr() void. 
Originally committed as revision 29229 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-04-23 22:19:53 +00:00
Michael Niedermayer
de1275d5e8 Planar 16bit 420 422 444 YUV support (output is only supported in some 
unscaled convertions).
This, like gray16 converts down to 8bit, which is a big FIXME & patch welcome,
we should preserve more bits.

Originally committed as revision 29217 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-04-21 01:08:03 +00:00
Michael Niedermayer
61a3f379e0 Merge gray->gray converters into planarCopy(), this should also make planarCopy() 
useable for other 16bit formats once we support them.

Originally committed as revision 29216 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-04-21 00:08:06 +00:00
Michael Niedermayer
714f32bf15 Add macro to check for 16bit per sample. 
Originally committed as revision 29215 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-04-21 00:03:00 +00:00
Michael Niedermayer
b87fae9f56 Make sure src/dst are NULL when they arent used, some code uses this to 
simpify checks.

Originally committed as revision 29214 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-04-21 00:01:59 +00:00
Michael Niedermayer
081aa41db9 Use generic BE check instead of checking for gray16LE. 
Originally committed as revision 29213 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-04-20 21:05:32 +00:00
Michael Niedermayer
c3dc6c5a6b add isBE() 
Originally committed as revision 29212 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-04-20 21:04:55 +00:00
Michael Niedermayer
b36da2c215 Remove 2 useless += at the end of rgb16to15(), found by CSA. 
Originally committed as revision 29189 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-04-18 22:27:36 +00:00
Stefano Sabatini
a208350c3c Rename swscale_avoption.c to options.c. 
Consistent with lavc and lavf.

Originally committed as revision 29188 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-04-18 13:52:00 +00:00
Stefano Sabatini
0c067dc34b Make sws_setColorspaceDetails() return -1 if the destination format is 
not supported.

Originally committed as revision 29187 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-04-18 11:53:59 +00:00
Stefano Sabatini
2d26fa2822 Move sws_[gs]etColorspaceDetails() documentation from swscale.c to 
swscale.h.

Originally committed as revision 29186 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-04-18 11:45:31 +00:00
Diego Biurrun
d648c720af whitespace cosmetics: Break some overly long lines. 
Originally committed as revision 29180 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-04-14 14:39:04 +00:00
Cédric Schieli
39e5f87b1a Do not use abgrToA for both luma and alpha channel in hyscale. 
This fixes RGB32 (et al.) scaling.

Originally committed as revision 29179 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-04-14 14:11:57 +00:00
Diego Biurrun
cc3a248603 Move addition of MMX-OBJS to OBJS into common.mak instead of duplicating it. 
Originally committed as revision 29175 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-04-12 22:49:58 +00:00
Diego Biurrun
457eed7204 whitespace cosmetics: Reindent a few lines and break a few excessively long lines. 
Originally committed as revision 29174 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-04-12 22:43:03 +00:00
Ramiro Polla
10a7d21672 Rename RUNTIME_CPUDETECT to CONFIG_RUNTIME_CPUDETECT and always define it. 
Originally committed as revision 29154 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-04-08 20:21:21 +00:00
Ramiro Polla
dd4090256c swscale: Remove X86 commented out code. 
Originally committed as revision 29149 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-04-05 19:17:53 +00:00
Ramiro Polla
40fa514033 swscale: Use function pointers for swScale functions. 
Originally committed as revision 29145 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-04-04 22:45:02 +00:00
Ramiro Polla
14d5c18c98 swscale: {}-related cosmetics. 
Originally committed as revision 29144 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-04-04 22:43:24 +00:00
Ramiro Polla
7ac4032784 swscale: Add const to some swScale functions' parameters. 
Originally committed as revision 29143 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-04-04 22:41:46 +00:00
Ramiro Polla
95b5770bc7 swscale: Remove mmx2 params from h[yc]scale(). 
Originally committed as revision 29129 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-04-02 18:34:11 +00:00
Ramiro Polla
392b656764 swscale: Split h[yc]scale_fast() into their own functions. 
Originally committed as revision 29128 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-04-02 18:32:49 +00:00
Ramiro Polla
5b7c7dd329 swscale: Execute sfence and emms depending on runtime flags. 
Originally committed as revision 29127 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-04-02 18:31:22 +00:00
Måns Rullgård
99cc563f26 Make examples and test progs depend on libraries 
Originally committed as revision 29119 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-04-01 00:54:23 +00:00
Diego Biurrun
e7f98e4e94 Add missing $(EXESUF) to example/test program dependency declaration. 
Originally committed as revision 29114 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-03-31 16:52:24 +00:00
Reimar Döffinger
4ed886430c Use correct PRId64 instead of "lld" in printf string, fixes compiler warnings. 
Originally committed as revision 29107 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-03-30 12:23:28 +00:00
Diego Biurrun
4b086e7f21 Generalize example target rule in common.mak so that it sets a -example$(EXESUF) 
suffix for all example files instead of doing this in individual Makefiles.

Originally committed as revision 29100 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-03-29 14:35:38 +00:00
Diego Biurrun
009d2d74c2 Move swscale AltiVec template code to ppc subdirectory. 
Originally committed as revision 29099 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-03-29 14:18:44 +00:00
Diego Biurrun
4d02387f74 Relicense file to LGPL with the permission of Romain Dolbeau, the author. 
Originally committed as revision 29097 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-03-29 13:47:30 +00:00
Ramiro Polla
d5e9bc0636 Move bfin specific code to its subdir. 
Originally committed as revision 29079 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-03-27 22:56:56 +00:00
Diego Biurrun
66e6aec589 Rename cs_test.c --> colorspace-test.c. This is more consistent with the names 
of other test programs and more descriptive of what the program does.

Originally committed as revision 29067 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-03-26 14:20:15 +00:00
Ramiro Polla
befa8e665c Move yuv2rgb code to subdirs. 
Originally committed as revision 29063 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-03-26 01:30:10 +00:00
Diego Biurrun
e43f34bd44 swscale-example is an API example, not a test program. 
Originally committed as revision 29056 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-03-25 18:08:52 +00:00
Cédric Schieli
4626ee1a8c Adds "YUYV422 to YUVA420P" and "UYVY422 to YUVA420P" unscaled convertion 
Originally committed as revision 29048 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-03-24 07:11:35 +00:00
Cédric Schieli
08218e6d83 Fix some places where "non-alpha to YUVA420P" do not fill the alpha plane 
Originally committed as revision 29047 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-03-24 07:10:19 +00:00
Cédric Schieli
0928f1eb53 Simpler and more elegant fix to the x86_32/OSX+PIC build failure 
Originally committed as revision 29046 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-03-24 07:09:19 +00:00
Diego Biurrun
9e12268c57 Rename 'tests' target to 'testprogs'. It is too easily confused with the 
'test' target and a directory named tests exists.

Originally committed as revision 29039 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-03-22 23:15:54 +00:00
Diego Biurrun
f1c5438fbb Remove unnecessary CLEANFILES declaration. Test programs do not require it. 
Originally committed as revision 29038 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
 2009-03-22 23:09:20 +00:00