ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-22 14:26:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,125 Commits 36 Branches 398 Tags 535 MiB
06b320ad78
Commit Graph

1042 Commits

Author SHA1 Message Date
Ronald S. Bultje
7d7bacf0f1 swscale: fix overflow in 16-bit vertical scaling. 
We operated on 31-bits, but with e.g. lanczos scaling, values can
add up to beyond 0x80000000, thus leading to output of zeroes. Drop
one bit of precision fixes this.
 2011-07-08 15:15:30 -07:00
Ronald S. Bultje
bf2cba4532 swscale: fix crash in 8-bpc bilinear output without alpha. 
We accessed the alpha array even it wasn't used and didn't
exist, hence leading to a NULL pointer segfault.
 2011-07-08 15:15:30 -07:00
Ronald S. Bultje
f44d50a94c swscale: fix 16-bit horizontal scaling underflow. 
When using e.g. lanczos scaling, values can drop below 0, so they
should never be unsigned.
 2011-07-08 15:15:30 -07:00
Ronald S. Bultje
42d622fab3 swscale: fix 16-bit scaling when output is 8-bits. 
We would use the second half of the U plane buffer, rather than the
V plane buffer, to output the V plane pixels.
 2011-07-08 15:15:30 -07:00
Ronald S. Bultje
f28aaae1c5 swscale: amend documentation to mention use of native depth for scaling. 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-07-06 03:33:36 +02:00
Diego Biurrun
e589e4b82d Remove unused static tables and static inline functions. 2011-07-04 14:59:35 +02:00
Mans Rullgard
abc78a5a7c Do not include log.h in avutil.h 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-03 21:42:07 +01:00
Mans Rullgard
d49ea4afb4 Do not include pixfmt.h in avutil.h 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-03 21:42:07 +01:00
Diego Biurrun
01c17c88ed doxygen: Remove spurious documentation for non-existing function parameters. 2011-07-03 18:30:02 +02:00
Ronald S. Bultje
8f440223f6 swscale: disable full_chroma_int when converting to non-24/32bpp RGB. 
This functionality is only implemented for RGB24/32 and causes crashes
otherwise.
 2011-07-02 08:33:52 -07:00
Ronald S. Bultje
8a8d0ce208 swscale: for >8bit scaling, read in native bit-depth. 
For 9/10bit, it means we don't have to upscale to 16bit before
actual scaling or pixel format conversion, and thus a performance
gain.
 2011-07-01 09:08:26 -07:00
Ronald S. Bultje
81cc7d0bd1 swscale: fix another yuv range conversion overflow in 16bit scaling. 2011-06-30 07:05:52 -07:00
Mohamed Naufal
705b21a06e swscale: Unbreak build with --enable-small 
This fixes building with --enable-small, by using the correct
variable name.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-06-30 11:58:38 +03:00
Ronald S. Bultje
e0b8fff6c7 swscale: fix yuv range correction when using 16-bit scaling. 2011-06-29 21:04:45 -07:00
Ronald S. Bultje
ef1ee362b3 swscale: implement >8bit scaling support. 
This means that precision is retained when scaling between sample
formats with >8 bits per component (48bit RGB, 16bit grayscale,
9/10/16bit YUV).
 2011-06-29 09:45:52 -07:00
Ronald S. Bultje
4578435f35 swscale: Add Doxygen for hyscale_fast/hScale. 2011-06-29 01:20:34 +02:00
Mans Rullgard
635930d466 PPC: swscale: disable altivec functions for unsupported formats 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-28 23:22:31 +01:00
Ronald S. Bultje
d6cc6ac6b8 swscale: Add Doxygen for yuv2planar*/yuv2packed* functions. 2011-06-28 20:18:58 +02:00
Mans Rullgard
57b4a3dd2b build: include sub-makefiles using full path instead of symlinks 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-28 18:15:19 +01:00
Ronald S. Bultje
13a099799e swscale: change prototypes of scaled YUV output functions. 
Remove unused variables "flags" and "dstFormat" in yuv2packed1,
merge source rows per plane for yuv2packed[12], and make every
source argument int16_t (some where invalidly set to uint16_t).
This prevents stack pollution and is part of the Great Evil Plan
to simplify swscale.
 2011-06-27 21:24:44 -07:00
Ronald S. Bultje
dff5a83532 swscale: re-add support for non-native endianness. 
This works through some non-obvious hacks in utils.c.
 2011-06-27 18:10:41 -07:00
Ronald S. Bultje
3d3c814937 swscale: disentangle yuv2rgbX_c_full() into small functions. 
This is part of the Great Evil Plan to simplify swscale.
 2011-06-27 18:10:24 -07:00
Ronald Bultje
6fba14eecb swscale: split yuv2packed[12X]_c() remainders into small functions. 
This is part of the Great Evil Plan to simplify swscale.
 2011-06-27 18:10:03 -07:00
Ronald S. Bultje
dc179ec819 swscale: split yuv2packedX_altivec in smaller functions. 
This will likely lead to a considerable performance boost,
since it removes a branch from the inner loop. Part of the
Great Evil Plan to simplify swscale.
 2011-06-27 18:05:16 -07:00
Ronald S. Bultje
0d994b2f45 swscale: don't use planar output functions to write to NV12/21. 
This prevents a crash when converting to NV12/21 without the bitexact
flags enabled.
 2011-06-27 17:15:41 -07:00
Ronald S. Bultje
97535ffb97 swscale: remove unused xInc/srcW arguments from hScale(). 2011-06-26 14:41:44 -07:00
Diego Biurrun
a6213f3dce build: Remove redundant config.mak includes from subdirectory Makefiles. 
Calling Make from subdirectories is not supported and config.mak has
multiple inclusion guards anyway, so the top-level include is enough.
 2011-06-25 13:02:51 +02:00
Diego Biurrun
087d93f568 swscale: Remove unused variable from ff_bfin_get_unscaled_swscale(). 2011-06-21 20:53:52 +02:00
Reinhard Tartler
0793531859 Bump major version for b8e893399f 
On architectures such as x86 (both 32 bit and 64bit), the stack element
size is fixed, which maintains alignment.  Here, this change does not
break anything. However, we also support also other architectures where
this property is not maintained and therefore, applications will crash
horribly.

This change effectively forces all applications to be recompiled against
libswscale.
 2011-06-20 18:01:39 +02:00
Janne Grunau
3636e791ec swscale: use SwsContext for av_log when available 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-06-15 13:20:20 +02:00
Diego Biurrun
a60466dbc3 swscale: Remove HAVE_MMX from files that are only compiled with MMX enabled. 2011-06-15 01:18:10 +02:00
Diego Biurrun
97e057ff81 swscale: Fix compilation with --disable-mmx2. 
Some MMX2 functions were being referenced without proper #ifdefs.
 2011-06-15 01:17:59 +02:00
Ronald S. Bultje
4e05830205 swscale: remove misplaced comment. 
The comment should have been placed only in
yuv2rgb48_X_c_template, not yuv2rgb48_1_c_template.
 2011-06-14 16:55:24 -04:00
Ronald S. Bultje
9f63211175 swscale: split out RGB48 output functions from yuv2packed[12X]_c(). 
This is part of the Great Evil Plan to simplify swscale. Note that
you'll see some code duplication between the output functions for
different RGB variants, and even between packed-YUV and RGB
variants. This is intentional because it improves readability.
 2011-06-14 15:59:14 -04:00
Michael Niedermayer
0af8a71d66 swscale: fix JPEG-range YUV scaling artifacts. 
YUV planes were marked as uint16_t, but they contained signed data.
Fixes issue 1108 and 675.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-06-14 09:46:49 -04:00
Ronald S. Bultje
103278f7b0 libavutil/swscale: YUV444P10/YUV444P9 support. 
Also add missing glue code for recently added YUV422P10 formats
to swscale.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-06-10 15:12:24 -04:00
Ronald S. Bultje
af2faf2076 swscale: split YUYV output out of yuv2packed[12X]_c(). 
This is part of the Great Evil Plan to simplify swscale.
 2011-06-09 20:52:38 -04:00
Ronald S. Bultje
6b105e3ee6 swscale: extract monowhite/black output from yuv2packed[12X]_c(). 
This is part of the Great Evil Plan to simplify swscale.
 2011-06-09 16:47:45 -04:00
Ronald S. Bultje
6d4d483eee swscale: de-macro'ify RGB15/16/32 input functions. 
Inline functions are easier to read, maintain, modify and test,
which justifies the slightly increased source size. This patch
also adds support for non-native endianness RGB15/16 and fixes
isSupportedOutput() to no longer claim that we support writing
non-native RGB565/555/444.
 2011-06-09 16:47:45 -04:00
Ronald S. Bultje
e2babb9b47 swscale: rearrange code. 
This way the code in the file is less cluttered all-over-the-
place.
 2011-06-09 16:47:45 -04:00
Ronald S. Bultje
dbd3183935 swscale: change 48bit RGB input macros to inline functions. 
Inline functions are slightly larger in source code, but
are easier to handle in source code editors. The binary code
generated is the same.
 2011-06-09 09:29:20 -04:00
Ronald S. Bultje
f30ee65700 swscale: change 9/10bit YUV input macros to inline functions. 
Inline functions are slightly larger in source code, but
are easier to handle in source code editors. The binary code
generated is the same.
 2011-06-09 09:29:03 -04:00
Ronald S. Bultje
aa39f5f6d6 swscale: extract gray16 output functions from yuv2packed[12X](). 
This is part of the Great Evil Plan to simplify swscale.
 2011-06-09 09:29:02 -04:00
Ronald S. Bultje
f1e0b90c64 swscale: use standard clipping functions. 
This generates better code on some non-x86 architectures.
 2011-06-09 09:27:51 -04:00
Ronald S. Bultje
e458b53605 swscale: merge macros that are used only once. 
This reduces source code size without affecting the binary.
 2011-06-09 09:26:00 -04:00
Ronald S. Bultje
6e5a8d3c9a swscale: fix function declarations in swscale.c. 
Remove inline keyword from functions that are never inlined.
Use av_always_inline for functions that should be force-inlined
for performance reasons. Use av_cold for init functions.
 2011-06-09 09:25:59 -04:00
Ronald S. Bultje
a27db4c349 swscale: fix function declaration keywords in x86/swscale_template.c. 
Remove inline keyword for functions that are only called through
their function pointers (and thus cannot be inlined); add av_cold
keyword to init function, and use av_always_inline instead of
inline for functions that must be inlined for performance reasons.
 2011-06-09 09:25:59 -04:00
Ronald S. Bultje
9bcbb250e2 swscale: fix types of assembly arguments. 
This prevents the following compiler warnings: "warning:
initialization from incompatible pointer type". Since the
variables are only ever used in inline assembly, their type
is actually irrelevant (so the part where it was wrong did
not invoke any buggy behaviour).
 2011-06-08 11:39:26 -04:00
Ronald S. Bultje
496d95c34c swscale: move two macros that are only used once into caller. 
This way, they look like regular code, which is easier to
understand.
 2011-06-08 11:33:46 -04:00
Ronald S. Bultje
9d84dfce93 swscale: remove unused function. 
Use of this wrapper was removed in a previous patch, but I
forgot to actually remove the function itself.
 2011-06-08 11:08:20 -04:00
Ronald S. Bultje
edeb56fa31 swscale: remove duplicate conversion routine in swScale(). 2011-06-07 10:05:55 -04:00
Ronald S. Bultje
b73fe70025 swscale: add yuv2planar/packed function typedefs. 2011-06-07 10:05:55 -04:00
Ronald S. Bultje
df91d09174 swscale: integrate yuv2nv12X_C into yuv2yuvX() function pointers. 2011-06-07 10:05:54 -04:00
Ronald S. Bultje
0fb5193156 swscale: reindent x86 init code. 2011-06-07 10:05:50 -04:00
Ronald S. Bultje
ca364a5b43 swscale: extract SWS_FULL_CHR_H_INT conditional into init code. 2011-06-07 10:03:47 -04:00
Ronald S. Bultje
b3b28b080f swscale: cosmetics. 2011-06-07 10:03:46 -04:00
Ronald S. Bultje
ea28175312 swscale: remove alp/chr/lumSrcOffset. 
They are hacks added to reuse the same scaling function for
different formats and they may cause problems when SIMD
implementation of the same functions are used along with pure
C functions.
 2011-06-07 10:03:18 -04:00
Ronald S. Bultje
bda9b20fa4 swscale: un-special-case yuv2yuvX16_c(). 
Make yuv2yuvX16_c a function pointer for yuv2yuvX(), so that the
function pointer becomes bitdepth-independent.
 2011-06-07 10:03:12 -04:00
Ronald S. Bultje
6af2801088 swscale: split swscale.c in unscaled and generic conversion routines. 
This duplicates the function fillPlane().
 2011-06-03 09:52:09 -07:00
Ronald S. Bultje
2762ee3034 swscale: cosmetics. 
Remove duplicate "inC" and "_c" functions that do the same thing;
give each function that handles data and acts as a function pointer
a "_c" suffix; remove "_c" suffix from functions that are inherently
not optimizable. Remove inline keyword from functions that are only
used through function pointers.
 2011-06-03 09:52:09 -07:00
Ronald S. Bultje
1674bd2abe swscale: integrate (literally) swscale_template.c in swscale.c. 2011-06-03 09:52:09 -07:00
Ronald S. Bultje
983260b0a4 swscale: split out x86/swscale_template.c from swscale.c. 2011-06-03 09:52:09 -07:00
Ronald S. Bultje
075d0ae72c swscale: enable hScale_altivec_real. 2011-06-03 09:52:09 -07:00
Ronald S. Bultje
67d80a5421 swscale: split out ppc _template.c files from main swscale.c. 2011-06-03 09:52:09 -07:00
Ronald S. Bultje
a3e9bb5dee swscale: remove indirections in ppc/swscale_template.c. 2011-06-03 09:52:09 -07:00
Ronald S. Bultje
0e5d31b16b swscale: split out unscaled altivec YUV converters in their own file. 2011-06-03 09:52:09 -07:00
Ronald S. Bultje
0d793db1b0 swscale: remove unused COMPILE_TEMPLATE_ALTIVEC. 2011-06-02 21:29:59 -07:00
Ronald S. Bultje
808d8ff6bb swscale: allocate larger buffer to handle altivec overreads. 
Altivec sws code intentionally overreads buffers for better performance,
so we need to allocate larger buffers to handle that.
 2011-06-02 11:25:56 -07:00
Diego Biurrun
f635a233e3 swscale: Remove unused variable. 2011-05-30 23:19:06 +02:00
Diego Biurrun
06b5facd4b swscale: Remove disabled code. 2011-05-29 14:32:08 +02:00
Anton Khirnov
b8e893399f sws: replace all long with int. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-05-28 10:03:37 -04:00
Ronald S. Bultje
009f829dde swscale: fix crash in bilinear scaling. 2011-05-28 08:59:56 -04:00
Diego Biurrun
5a5a0f1613 swscale: Remove unused variables in x86 code. 
libswscale/x86/swscale_template.c:2072: warning: unused variable ‘canMMX2BeUsed’
libswscale/x86/swscale_template.c:2145: warning: unused variable ‘canMMX2BeUsed’
libswscale/x86/swscale_template.c:2209: warning: unused variable ‘chrVPixBuf’
libswscale/x86/swscale_template.c:2237: warning: unused variable ‘chrVSrcPtr’
 2011-05-27 21:25:57 +02:00
Ronald S. Bultje
389e2000eb swscale: delay allocation of formatConvBuffer(). 
That means it won't be allocated when not needed. Alongside
this, it fixes valgrind/fate-detected memory leaks.
 2011-05-27 13:22:27 -04:00
Ronald S. Bultje
f327bfa6dc swscale: fix build with --disable-swscale-alpha. 2011-05-27 13:22:27 -04:00
Ronald S. Bultje
9f5d45025e swscale: fix non-bitexact yuv2yuv[X2]() MMX/MMX2 functions. 2011-05-27 09:41:48 -04:00
Ronald S. Bultje
93681fbd50 swscale: fix compile on ppc. 2011-05-26 11:32:32 -04:00
Ronald S. Bultje
e758573a88 swscale: fix compile on x86-32. 2011-05-26 10:41:27 -04:00
Ronald S. Bultje
48520772d9 swscale: use av_clip_uint8() in yuv2yuv1_c(). 2011-05-26 09:31:27 -04:00
Ronald S. Bultje
0f4eb8b043 swscale: remove VOF/VOFW. 2011-05-26 09:31:27 -04:00
Ronald S. Bultje
b4a224c5e4 swscale: split chroma buffers into separate U/V planes. 
Preparatory step to implement support for sizes > VOFW.
 2011-05-26 09:31:27 -04:00
Ronald S. Bultje
69645c021a swscale: replace formatConvBuffer[VOF] by allocated array. 
This allows to convert between formats of arbitrary width,
regardless of the value of VOF/VOFW.
 2011-05-26 09:31:02 -04:00
Ronald S. Bultje
522d65ba25 rgb2rgb: remove duplicate mmx/mmx2/3dnow/sse2 functions. 
Many functions have such a prefix, but do not actually use any
instructions or features from that set, thus giving the false
impression that swscale is highly optimized for a particular
system, whereas in reality it is not.
 2011-05-26 09:31:02 -04:00
Ronald S. Bultje
836b82e3c9 swscale: reindent h[cy]scale_fast() and updateDitherTables(). 2011-05-26 09:31:02 -04:00
Ronald S. Bultje
e2bad983b5 swscale: reformat x86/swscale_template.c. 
Interleave macros and code so that it's easier to find the
actual code that belongs to a function. Also reindent where
appropriate and remove dead code.
 2011-05-26 09:30:15 -04:00
Ronald S. Bultje
71d9c33c86 swscale: remove duplicate mmx/mmx2 functions if they are identical. 2011-05-26 09:30:15 -04:00
Ronald S. Bultje
acb96bc268 swscale: remove if (c->dstFormat) branch from yuv2packed[12X](). 
This allows cutting up the function in much smaller and easier-
to-maintain chunks.
 2011-05-26 09:30:14 -04:00
Ronald S. Bultje
b6cac9b3bf swscale: remove if(full_chr_int) from yuv2packed1(). 
If that flag is set, swScale() already proxies the call to
yuv2rgbXinC_full(). Therefore, this flag is never set when
yuv2packed1() is called.
 2011-05-26 09:30:14 -04:00
Ronald S. Bultje
2159a24573 swscale: remove if(accurate_rnd) branch from functions. 2011-05-26 09:30:14 -04:00
Anton Khirnov
c7a973e44a swscale: revive SWS_CPU_CAPS until next major bump. 2011-05-26 06:50:12 +02:00
Diego Biurrun
0093199184 swscale: Remove commented-out printf cruft. 2011-05-26 03:45:58 +02:00
Diego Biurrun
6f7a280ead swscale: Remove orphaned, commented-out function declaration. 2011-05-26 00:56:07 +02:00
Michael Niedermayer
7dc303a60e swscale: Eliminate rgb24toyv12_c() duplication. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-05-26 00:56:06 +02:00
Ronald S. Bultje
a724ee6265 swscale: unbreak the build on non-x86 systems. 2011-05-24 15:32:03 -04:00
Ronald S. Bultje
1bb0f0c925 swscale: remove if(bitexact) branch from functions. 
Instead, only set the function pointers if bitexact flag is
not set during initialization. Since a change in flags triggers
a re-init anyway, this doesn't situations where flag values
change during runtime.
 2011-05-24 14:50:20 -04:00
Ronald S. Bultje
566b5fbbb3 swscale: remove if(canMMX2BeUsed) conditional. 
Instead, set function pointers conditionally during init. This
patch also reveals a whole branch of dead assembly code that is
therefore also removed.
 2011-05-24 14:50:19 -04:00
Ronald S. Bultje
aaca69c130 swscale: remove swScale_{c,MMX,MMX2} duplication. 2011-05-24 14:50:15 -04:00
Ronald S. Bultje
c4fd283a46 swscale: use emms_c(). 2011-05-24 14:48:49 -04:00
Ronald S. Bultje
b9eb2136af swscale: remove dead macro WRITEBGR24OLD. 2011-05-24 10:46:40 -04:00
Ronald S. Bultje
1dd4f4be5a swscale: remove AMD3DNOW "optimizations". 
The functions are identical to their MMX counterparts. Thus,
pretending that swscale is highly optimized for AMD3DNOW
extensions is a poorly executed practical joke at best.
 2011-05-24 10:19:41 -04:00
Ronald S. Bultje
fe43d5d71e swscale: remove duplicate code in ppc/ subdirectory. 2011-05-24 10:16:32 -04:00
Ronald S. Bultje
11ffefefdb swscale: remove duplicated x86/ functions. 2011-05-24 10:11:26 -04:00
Ronald S. Bultje
e66149e714 swscale: force --enable-runtime-cpudetect and remove SWS_CPU_CAPS_*. 2011-05-24 10:03:26 -04:00
Kieran Kunhya
6465c820da Fix 9/10 bit in swscale. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-05-23 06:46:14 -04:00
Clément Bœsch
7d4c4394b5 swscale: point out an alternative to sws_getContext 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-05-21 13:42:50 +02:00
Ronald S. Bultje
76f8a96e00 [PATCH] Update pixdesc_be fate refs after adding 9/10bit YUV420P formats. 
Also remove code that overwrites the C versions of functions in
sws_init_swScale_altivec(), so that it uses the C functions of files
if no altivec-optimized version exists.
 2011-05-14 06:37:39 -04:00
Ronald S. Bultje
9f54e461fe swscale: properly inline bits/endianness in yuv2yuvX16inC(). 2011-05-13 16:46:24 -04:00
Ronald S. Bultje
c3d68ec9c5 swscale: fix clipping of 9/10bit YUV420P. 2011-05-13 16:45:28 -04:00
Diego Biurrun
046f081b46 configure: Do not unconditionally add -D_POSIX_C_SOURCE to CPPFLAGS. 
Adding _POSIX_C_SOURCE to CPPFLAGS globally produces all sorts of problems
since it causes certain system functions to be hidden on some (BSD) systems.
The solution is to only add the flag on systems that really require it, i.e.
glibc-based ones.

This change makes BSD systems compile out-of-the-box without the need for
adding specific flags manually.  It also allows dropping a number of flags
set manually on a file-per-file basis, but were only present to work around
breakage introduced by the presence of _POSIX_C_SOURCE.

Also add _XOPEN_SOURCE to CPPFLAGS for glibc systems.  We use XSI extensions
in several places already, so it is preferable to define it globally instead
of littering source files with individual #defines only needed for glibc.
 2011-05-12 11:41:59 +02:00
Ronald S. Bultje
c8f487deae swscale: fix YUV420P 9/10bit support. 
Fix handling of input if not in native endianness, and add support for
9/10-bit output. This allows us to force endianness of YUV420P 9/10bit
in the H264/10bit fate tests, which should fix them on big-endian
systems.
 2011-05-11 19:15:14 -04:00
Anton Khirnov
b66752790a AVOptions: make default_val a union, as proposed in AVOption2. 
This breaks API and ABI.
 2011-05-10 20:22:06 +02:00
Oskar Arvidsson
42239ced65 Add pixel formats for 9- and 10-bit yuv420p. 
Also add support for these formats in libswscale.

Needed for high bit depth h264 decoding.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-05-10 07:24:19 -04:00
Peter Ross
1afbae100b libswcale: PIX_FMT_BGR48LE and PIX_FMT_BGR48BE scaler implementation 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-04-28 07:25:27 +02:00
Anton Khirnov
7dfe244fbd sws: remove disabled cruft. 2011-04-19 21:50:12 +02:00
Anton Khirnov
41d0eb1c81 lavc: remove the FF_API_SET_STRING_OLD cruft. 2011-04-19 18:41:00 +02:00
Anton Khirnov
139f3ac42d Bump major versions of all libraries. 
They've accumulated enough new APIs and corresponding deprecated cruft.

This breaks API and ABI.
 2011-04-18 20:19:47 +02:00
Janne Grunau
f668afd489 swscale: fix "ISO C90 forbids mixed declarations and code" warning 
only hit with --enable-runtime-cpudetect
 2011-04-15 10:06:53 +02:00
Janne Grunau
7f2ae5c7af swscale: fix compilation with --enable-runtime-cpudetect 2011-04-15 09:07:37 +02:00
Janne Grunau
b6cad3df82 swscale: correct include path to fix ppc altivec build 2011-04-15 00:41:10 +02:00
Luca Barbato
6216fc70b7 swscale: simplify rgb2rgb templating 
MMX is always built. Drop the ifdefs
 2011-04-14 22:16:47 +02:00
Josh Allmann
33a0421bba swscale: simplify initialization code 
Simplify the fallthrough case when no accelerated functions
can be initialized.
 2011-04-14 22:16:47 +02:00
Josh Allmann
735bf19511 swscale: further cleanup swscale.c 
Move x86-specific constants out of swscale.c
 2011-04-14 22:16:47 +02:00
Luca Barbato
86330b4c92 swscale: partially move the arch specific code left 
PPC and x86 code is split off from swscale_template.c. Lots of code is
still duplicated and should be removed later.

Again uniformize the init system to be more similar to the dsputil one.

Unset h*scale_fast in the x86 init in order to make the output
consistent with the previous status. Thanks to Josh for spotting it.
 2011-04-14 22:16:47 +02:00
Luca Barbato
c003832883 swscale: move away x86 specific code from rgb2rgb 
Keep only the plain C code in the main rgb2rgb.c and move the x86
specific optimizations to x86/rgb2rgb.c
Change the initialization pattern a little so some of it can be
factorized to behave more like dsputils.
 2011-04-14 22:16:47 +02:00
Luca Barbato
0e1a5434e2 swscale: Factorize FAST_BGR2YV12 definition. 
It is used only for x86 so it will eventually be moved with that code
into the x86 arch subdirectory.
 2011-04-13 17:24:53 +02:00
Diego Biurrun
db46be01ec Add unconditional return statement to yuva420_rgb32_MMX() / yuva420_bgr32_MMX(). 
When HAVE_7REGS was not defined these functions had an empty body
causing the following warnings during compilation.
In file included from libswscale/x86/yuv2rgb_mmx.c:58:
libswscale/x86/yuv2rgb_template.c: In function ‘yuva420_rgb32_MMX’:
libswscale/x86/yuv2rgb_template.c:412: warning: no return statement in function returning non-void
libswscale/x86/yuv2rgb_template.c: In function ‘yuva420_bgr32_MMX’:
libswscale/x86/yuv2rgb_template.c:457: warning: no return statement in function returning non-void

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-04-11 14:18:48 +02:00
Anton Khirnov
0464ee9af2 swscale: postpone sws_getContext removal until next major bump. 
The replacement isn't ready yet.
 2011-04-06 22:55:28 +02:00
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
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