summaryrefslogtreecommitdiff
path: root/libswscale/swscale_unscaled.c
Commit message (Collapse)AuthorAge
* Merge commit '928061670e873e816daa14827853b7e11221ff5f'Michael Niedermayer2015-01-15
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '928061670e873e816daa14827853b7e11221ff5f': libswscale: GBRAP input & output and GBRAP16 input support Conflicts: libswscale/input.c libswscale/swscale_internal.h libswscale/swscale_unscaled.c libswscale/utils.c tests/ref/fate/filter-pixdesc-gbrap tests/ref/fate/filter-pixfmts-copy tests/ref/fate/filter-pixfmts-null tests/ref/fate/filter-pixfmts-scale tests/ref/fate/filter-pixfmts-vflip See: 5c057433ccd32f37ddc828d3f82c5b1ad7d3e3db Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libswscale: GBRAP input & output and GBRAP16 input supportPaul B Mahol2015-01-14
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '33c827f632f95ffe3399b695a5a0d47b366b6e20'Michael Niedermayer2014-12-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '33c827f632f95ffe3399b695a5a0d47b366b6e20': swscale: Properly scale YUV Conflicts: libswscale/swscale_unscaled.c tests/ref/fate/filter-pixdesc-yuv420p10be tests/ref/fate/filter-pixdesc-yuv420p10le tests/ref/fate/filter-pixdesc-yuv420p9be tests/ref/fate/filter-pixdesc-yuv420p9le tests/ref/fate/filter-pixdesc-yuva420p10be tests/ref/fate/filter-pixdesc-yuva420p10le tests/ref/fate/filter-pixdesc-yuva420p9be tests/ref/fate/filter-pixdesc-yuva420p9le tests/ref/fate/filter-pixfmts-copy tests/ref/fate/filter-pixfmts-null tests/ref/fate/filter-pixfmts-scale tests/ref/fate/filter-pixfmts-vflip See: abe0b8e9f378a0f8781c1a3da6714d20cfd19594 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: Properly scale YUVDerek Buitenhuis2014-12-05
| | | | | | | | | | | | | | | | | | | | Only shift limited range luma, and always only shift chroma for upconversion. Based off a patch by Michael Niedermayer. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | swscale/swscale_unscaled: fix ya16 inputMichael Niedermayer2014-08-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f84a1b597c29dc035b8d5529ef88c2d7ff057820'Michael Niedermayer2014-08-04
|\| | | | | | | | | | | | | | | | | | | * commit 'f84a1b597c29dc035b8d5529ef88c2d7ff057820': swscale: support AV_PIX_FMT_YA16 as input Conflicts: libswscale/swscale_unscaled.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: support AV_PIX_FMT_YA16 as inputVittorio Giovara2014-08-04
| | | | | | | | Based on a long debug session with Kostya.
* | Merge commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5'Michael Niedermayer2014-08-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5': avutil: rename AV_PIX_FMT_Y400A to AV_PIX_FMT_YA8 Conflicts: libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/raw.c libavutil/pixdesc.c libavutil/pixfmt.h libavutil/version.h libswscale/swscale_internal.h libswscale/swscale_unscaled.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avutil: rename AV_PIX_FMT_Y400A to AV_PIX_FMT_YA8Vittorio Giovara2014-08-04
| | | | | | | | | | | | | | The rationale is that you have a packed format in form <greyscale sample> <alpha sample> <greyscale sample> <alpha sample> and shortening greyscale to 'G' might make one thing about Greenscale instead. An alias pixel format and color space name are provided for compatibility.
* | Merge commit '5420099cab1e915b191cceccec4364f54cec6e52'Michael Niedermayer2014-08-04
|\| | | | | | | | | | | | | * commit '5420099cab1e915b191cceccec4364f54cec6e52': swscale: correctly pad destination buffer in rgb conversion Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: correctly pad destination buffer in rgb conversionKostya Shishkov2014-08-04
| | | | | | | | | | | | | | Bug-Id: 772 CC: libav-stable@libav.org Found-By: Justin Ruggles <justin.ruggles@gmail.com> Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '880e2aa23645ed9871c66ee1cbd00f93c72d2d73'Michael Niedermayer2014-06-02
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '880e2aa23645ed9871c66ee1cbd00f93c72d2d73': Remove all Blackfin architecture optimizations Conflicts: libavcodec/bfin/dsputil.S libavcodec/bfin/dsputil_init.c libavcodec/bfin/fdct_bfin.S libavcodec/bfin/hpel_pixels_no_rnd.S libavcodec/bfin/hpeldsp_init.c libavcodec/bfin/idct_bfin.S libavcodec/bfin/mathops.h libavcodec/bfin/pixels.S libavcodec/bfin/pixels.h libavcodec/bfin/vp3dsp.S libavcodec/bfin/vp3dsp_init.c libavutil/bfin/asm.h libavutil/bfin/attributes.h libswscale/bfin/internal_bfin.S libswscale/bfin/swscale_bfin.c libswscale/bfin/yuv2rgb_bfin.c libswscale/swscale_internal.h libswscale/version.h If someone wants to maintain blackfin support in FFmpeg, please contact ffmpeg-devel@ffmpeg.org Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove all Blackfin architecture optimizationsDiego Biurrun2014-06-02
| | | | | | | | | | | | Blackfin is a painful platform to work with, no test machines are available and the range of multimedia applications is dubious. Thus it only represents a maintenance burden.
| * swscale: Set alpha to opaque for internal palettes.Justin Ruggles2014-04-12
| | | | | | | | | | | | | | | | | | Fixes conversion of pal8 to rgb formats with alpha. Updated references for 2 FATE tests which previously encoded fully transparent images. Based on a patch by Baptiste Coudurier <baptiste.coudurier@gmail.com>
| * swscale: fix some undefined signed left shiftsJustin Ruggles2014-04-12
| | | | | | | | Based on a patch by Michael Niedermayer <michaelni@gmx.at>
* | sws: dont use the optimized 410->420 unscaled conversion when height%4Michael Niedermayer2014-04-30
| | | | | | | | | | Fixes Ticket3594 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '60c4660ba035bbfbcc84ac34129ce40e037c70ad'Michael Niedermayer2014-04-13
|\| | | | | | | | | | | | | | | | | | | * commit '60c4660ba035bbfbcc84ac34129ce40e037c70ad': swscale: fix an implementation-defined unsigned-to-signed conversion Conflicts: libswscale/swscale_unscaled.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: fix an implementation-defined unsigned-to-signed conversionJustin Ruggles2014-04-12
| |
* | Merge commit '0ca0924c10d9617a5793964bf79655424ef32b68'Michael Niedermayer2014-04-02
|\| | | | | | | | | | | | | | | | | | | | | * commit '0ca0924c10d9617a5793964bf79655424ef32b68': swscale: add endianness conversion for AV_PIX_FMT_BGRA64|RGBA64 Conflicts: libswscale/swscale_unscaled.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: add endianness conversion for AV_PIX_FMT_BGRA64|RGBA64Janne Grunau2014-04-02
| |
| * swscale: add nv12/nv21->yuv420 converterMichael Niedermayer2014-01-21
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * swscale: fix stride used in planarToNv12Wrapper()Michael Niedermayer2014-01-21
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | libswscale: bayer to rgb24 & yv12 colorspace convertersPeter Ross2014-02-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale: disable ARM code until its build failure with clang/iphone is fixedMichael Niedermayer2014-01-12
| | | | | | | | | | | | See: "19:40 Yu Xiaolei Re: [FFmpeg-devel] [PATCH] fix build with gas-preprocessor.pl" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "swscale: disable ARM code until its build failure with clang/iphone ↵Michael Niedermayer2014-01-12
| | | | | | | | | | | | is fixed" This reverts commit c8c7736c1025bcf5bb27e104a0d0eae749408739.
* | Unscaled 16bit packed RGB to planar GBR converter.Carl Eugen Hoyos2014-01-10
| | | | | | | | | | Fixes r210(rgb48) -> ffv1 (gbrp10) -> r210 roundtrip as reported by forum user JasonCA.
* | swscale: disable ARM code until its build failure with clang/iphone is fixedMichael Niedermayer2014-01-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale: NEON optimized unscaled rgba to nv12 conversionYu Xiaolei2013-12-16
| | | | | | | | | | Signed-off-by: Yu Xiaolei <dreifachstein@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale: fix used stride in planarToNv12Wrapper()Michael Niedermayer2013-11-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale: add nv12/nv21->yuv420 converterMichael Niedermayer2013-11-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale/swscale_unscaled: fix right column handling in planarCopyWrapperMichael Niedermayer2013-11-16
| | | | | | | | | | Found-by: Михаил <Micky53@mail.ru> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swsscale/swscale_unscaled: add GBRAP16Paul B Mahol2013-10-16
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale/swscale_unscaled: fix alpha pointer & stride for ↵Michael Niedermayer2013-10-16
| | | | | | | | | | | | planarRgb16ToRgb16Wrapper() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale/swscale_unscaled: fix alpha values for rgb/bgr -> RGB32_1 / BGR32_1Michael Niedermayer2013-09-19
| | | | | | | | | | Found-by: Justin Ruggles Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1909f6b1b6da2db371c179bed5a19aaf979b7557'Michael Niedermayer2013-08-29
|\| | | | | | | | | | | | | | | | | | | * commit '1909f6b1b6da2db371c179bed5a19aaf979b7557': swscale: cosmetics: Drop silly camelCase from swScale function pointer name Conflicts: libswscale/swscale_unscaled.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: cosmetics: Drop silly camelCase from swScale function pointer nameDiego Biurrun2013-08-29
| |
* | Merge commit '3aa682f25324d811ec284edc808eb71a46eae950'Michael Niedermayer2013-08-29
|\| | | | | | | | | | | | | * commit '3aa682f25324d811ec284edc808eb71a46eae950': swscale: consistent names for arch-specific acceleration functions Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: consistent names for arch-specific acceleration functionsDiego Biurrun2013-08-29
| |
* | Merge commit 'c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19'Michael Niedermayer2013-08-29
|\| | | | | | | | | | | | | | | | | | | * commit 'c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19': swscale: ppc: Hide arch-specific initialization details Conflicts: libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: ppc: Hide arch-specific initialization detailsDiego Biurrun2013-08-29
| | | | | | | | Also give consistent names to init functions.
| * swscale: Move extern declarations for tables to swscale_internal.hDiego Biurrun2013-08-15
| | | | | | | | Also add missing ff_ prefixes where necessary.
* | swscale: improve dither checksMichael Niedermayer2013-08-19
| | | | | | | | | | | | Bssed on patch by Øyvind Kolås <pippin@gimp.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd258531502b24cb653204fe4f003c8815755bdc4'Michael Niedermayer2013-08-16
|\| | | | | | | | | | | | | | | | | | | * commit 'd258531502b24cb653204fe4f003c8815755bdc4': swscale: Mark a bunch of tables only used within one file static Conflicts: libswscale/swscale_unscaled.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: Mark a bunch of tables only used within one file staticDiego Biurrun2013-08-15
| |
* | sws: add dither enumMichael Niedermayer2013-08-15
| | | | | | | | | | | | | | | | | | | | | | This allows specifying more dither algorithms without using up flags and without ambiguities. Also initialize the new field based on the flags and use it. Note, improving the logic of the checks is left to subsequent commits, this here only switches from flags to enum. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale_unscaled: make dither_scale static, its not used elsewhere and has ↵Michael Niedermayer2013-08-15
| | | | | | | | | | | | no prefix Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Check more completely for invalid pix_fmts in planarRgb16ToRgb16Wrapper()Carl Eugen Hoyos2013-06-11
| | | | | | | | This makes the conversion function more robust.
* | swscale/swscale_unscaled: add ()Michael Niedermayer2013-06-10
| | | | | | | | | | | | | | Fixes order of operations Fixes CID1030350 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add unscaled converter from GBRP > 8bit to RGBx48/64.Carl Eugen Hoyos2013-06-06
| | | | | | | | | | | | Fixes ticket #2633. Tested-by: Michael Cinquin
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>