Michael Niedermayer
c75dde6074
swscale: call handle_format() from the functions that need it
...
This should fix some hypothetical issues with alloc/init_context() usage
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14 03:36:19 +02:00
Michael Niedermayer
0fc11e7bad
swscale: make handle_formats() safe to be called multiple times
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14 03:36:19 +02:00
Michael Niedermayer
d5f5e51662
swscale: move format handling to its own function
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14 03:36:19 +02:00
Michael Niedermayer
1ba01d3d46
swscale: treat gray as a fullrage (0-255) format
...
Fixes Ticket2684
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-08 15:21:48 +02:00
Michael Niedermayer
034b31df2c
swscale: Fix PAL8 input with alpha
...
Fixes Ticket2158
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-26 15:14:00 +02:00
Hendrik Leppkes
7cdf574c22
swscale: fix filter alignment reduction without inline asm
...
Fixes scaling in MSVC/ICL, where inline asm is not present, but the
YASM scaling code is.
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-21 21:01:11 +02:00
Carl Eugen Hoyos
7800b09ece
Check more completely for invalid pix_fmts in planarRgb16ToRgb16Wrapper()
...
This makes the conversion function more robust.
2013-06-11 01:14:38 +02:00
Michael Niedermayer
0047da071e
swscale/swscale_unscaled: add ()
...
Fixes order of operations
Fixes CID1030350
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-10 03:34:33 +02:00
Carl Eugen Hoyos
d5978c8678
Add unscaled converter from GBRP > 8bit to RGBx48/64.
...
Fixes ticket #2633 .
Tested-by: Michael Cinquin
2013-06-06 23:57:50 +02:00
Michael Niedermayer
45a73d2b47
Merge commit 'c011ceef78eae66039efc66d9551a7146e08838a'
...
* commit 'c011ceef78eae66039efc66d9551a7146e08838a':
swscale: ppc: Remove commented-out define cruft
nsvdec: Remove commented-out debug cruft
cpu: Restructure code to avoid pointless ret variable indirection
Conflicts:
libavutil/cpu.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-03 11:53:05 +02:00
Diego Biurrun
c011ceef78
swscale: ppc: Remove commented-out define cruft
2013-06-02 18:11:59 +02:00
Michael Niedermayer
a90baa63c3
add YUVJ411P
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 12:56:11 +02:00
Paul B Mahol
b154d203b1
swscale/output: silence warning about undefined 'ASSERT_LEVEL'
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-19 14:06:16 +00:00
Paul B Mahol
f4b2d3598b
swscale/output: remove unused header
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-19 14:04:14 +00:00
Michael Niedermayer
e1efacf60b
sws/output: yuv2rgb_write() assert that alpha has the correct value in the tables
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 15:14:19 +02:00
Michael Niedermayer
5918b7ac41
sws/output: init A1/A2 so that rgba64 ends with 0xffff in the absence of alpha input
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 01:20:30 +02:00
Michael Niedermayer
c7c71f95f8
replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_*
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-15 11:23:14 +02:00
Michael Niedermayer
ff4680922f
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*
Conflicts:
doc/APIchanges
libavcodec/avpicture.c
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
libavcodec/imgconvert.c
libavcodec/tiffenc.c
libavfilter/vf_pixdesctest.c
libavfilter/vf_scale.c
libavutil/imgutils.c
libavutil/pixdesc.c
libavutil/version.h
libswscale/swscale_internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-15 11:10:09 +02:00
Anton Khirnov
e6c4ac7b5f
pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*
2013-05-15 07:46:51 +02:00
Michael Niedermayer
e751481cd8
swscale/output: silence compiler warnings about uninitialized variables
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-14 18:58:02 +02:00
Michael Niedermayer
145e644aee
sws/output: remove offset/coef for alpha in rgba64
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-12 22:01:18 +02:00
Paul B Mahol
e1746d057b
swscale: RGBA64 output
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-12 21:47:19 +02:00
Michael Niedermayer
91f4a44ff4
sws/packed_16bpc_bswap: fix handling of negative stride
2013-05-12 17:26:39 +02:00
Michael Niedermayer
63725d158d
Revert "sws: support endianness conversion for AV_PIX_FMT_RGBA64"
...
This reverts commit 23f7b14f28
.
This commit broke fate
2013-05-12 15:05:25 +02:00
Paul B Mahol
23f7b14f28
sws: support endianness conversion for AV_PIX_FMT_RGBA64
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-12 11:44:20 +00:00
Michael Niedermayer
b2cf655d6e
sws: add casts to silence pointer type mismatch warnings
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-10 20:36:12 +02:00
Michael Niedermayer
7ded017983
sws/output/yuv2gbrp_full_X_c(): silence warning about uninitialized variable
...
clang did not show this one, so i missed it in the last batch
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-10 20:36:12 +02:00
Michael Niedermayer
8ef453ff83
sws/output: silence warnings about uninitialized use of variables
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-10 01:33:57 +02:00
Clément Bœsch
570d63eef3
lavu: add FF_CEIL_RSHIFT and use it in various places.
2013-05-09 16:59:42 +02:00
Paul B Mahol
443181c0a9
libswscale: simplify isAnyRGB macro
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-08 12:48:05 +00:00
Paul B Mahol
5c057433cc
libswscale: GBRAP input & output and GBRAP16 input support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-08 12:48:05 +00:00
Clément Bœsch
c3dcd3a255
sws: factorize rgb 9+ planar funcs declarations.
2013-05-07 15:23:27 +02:00
Michael Niedermayer
dce12f6948
Merge commit '9cfa21c8c2b81146aab574f55c93f27e5c2d435c'
...
* commit '9cfa21c8c2b81146aab574f55c93f27e5c2d435c':
swscale: support endianness conversion for AV_PIX_FMT_XYZ12
Conflicts:
libswscale/swscale_unscaled.c
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-07 11:13:46 +02:00
Michael Niedermayer
2060d94409
Merge commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491'
...
* commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491':
swscale: add support for endianness only conversion
Conflicts:
libswscale/utils.c
libswscale/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-07 11:04:07 +02:00
Janne Grunau
9cfa21c8c2
swscale: support endianness conversion for AV_PIX_FMT_XYZ12
2013-05-06 21:48:14 +02:00
Michael Niedermayer
b3e9fd1fe5
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
swscale: Use alpha from the right row in yuva2rgba_c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 21:48:03 +02:00
Michael Niedermayer
050b48f397
Merge commit '6c5eac9a603a91a707d030d96ba97e2ef6b3ce50'
...
* commit '6c5eac9a603a91a707d030d96ba97e2ef6b3ce50':
swscale: Remove unnecessary backslashes
jpeg2000: Fix uninitialized data errors pointed out by valgrind/memcheck
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 21:23:29 +02:00
Janne Grunau
c1eb3e7fec
swscale: add support for endianness only conversion
...
Use bitfields in FormatEntry array to avoid wasting an int for each flag.
2013-05-06 18:55:58 +02:00
Martin Storsjö
6e293d111f
swscale: Use alpha from the right row in yuva2rgba_c
...
Every other pixel had the alpha channel taken from the wrong
row.
This fixes bug 504.
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-06 17:40:25 +03:00
Martin Storsjö
6c5eac9a60
swscale: Remove unnecessary backslashes
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-06 17:40:19 +03:00
Michael Niedermayer
d5dbd84c9a
Merge commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70'
...
* commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70':
swscale: Add av_cold attributes to init functions missing them
Conflicts:
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 13:00:21 +02:00
Reimar Döffinger
3bb1c58e95
Avoid incorrect deprecated pixel format warning.
...
Should only be printed if a "JPEG" format was used,
not for e.g. XYZ.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-05-05 10:01:22 +02:00
Diego Biurrun
2b677ffca5
swscale: Add av_cold attributes to init functions missing them
2013-05-04 22:48:05 +02:00
Paul B Mahol
e6d4e68755
lavu: add planar 16 bit and 8 bit rgb with alpha
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-03 16:58:22 +00:00
Michael Niedermayer
dbcf7e9ef7
Merge commit '7f75f2f2bd692857c1c1ca7f414eb30ece3de93d'
...
* commit '7f75f2f2bd692857c1c1ca7f414eb30ece3de93d':
ppc: Drop unnecessary ff_ name prefixes from static functions
x86: Drop unnecessary ff_ name prefixes from static functions
arm: Drop unnecessary ff_ name prefixes from static functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 18:21:35 +02:00
Michael Niedermayer
2514b80045
sws: share xyzgamma tables.
...
They are currently always constant and thus theres no point to
store them in the context.
This makes the context 16kb smaller
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 17:52:18 +02:00
Diego Biurrun
7f75f2f2bd
ppc: Drop unnecessary ff_ name prefixes from static functions
2013-04-30 16:10:06 +02:00
Michael Niedermayer
cb23b06e5e
sws: fix typo in xyz2rgb matrix use.
...
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28 19:57:45 +02:00
Michael Niedermayer
24ec7a5e04
sws: Check for malloc failure of rgb0_tmp
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28 19:31:16 +02:00
Michael Niedermayer
0c47c9028b
sws: support xyz input
...
The implementation is heavily based on Matthias Buerchers and Nicolas Bertrands vf_xyz2rgb.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28 19:30:01 +02:00