summaryrefslogtreecommitdiff
path: root/libswscale
Commit message (Collapse)AuthorAge
* swscale: remove fork bug that i missed in the merge.Michael Niedermayer2011-05-11
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote branch 'qatar/master'Michael Niedermayer2011-05-11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (30 commits) AVOptions: make default_val a union, as proposed in AVOption2. arm/h264pred: add missing argument type. h264dsp_mmx: place bracket outside #if/#endif block. lavf/utils: fix ff_interleave_compare_dts corner case. fate: add 10-bit H264 tests. h264: do not print "too many references" warning for intra-only. Enable decoding of high bit depth h264. Adds 8-, 9- and 10-bit versions of some of the functions used by the h264 decoder. Add support for higher QP values in h264. Add the notion of pixel size in h264 related functions. Make the h264 loop filter bit depth aware. Template dsputil_template.c with respect to pixel size, etc. Template h264idct_template.c with respect to pixel size, etc. Preparatory patch for high bit depth h264 decoding support. Move some functions in dsputil.c into a new file dsputil_template.c. Move the functions in h264idct into a new file h264idct_template.c. Move the functions in h264pred.c into a new file h264pred_template.c. Preparatory patch for high bit depth h264 decoding support. Add pixel formats for 9- and 10-bit yuv420p. Choose h264 chroma dc dequant function dynamically. ... Conflicts: doc/APIchanges ffmpeg.c ffplay.c libavcodec/alpha/dsputil_alpha.c libavcodec/arm/dsputil_init_arm.c libavcodec/arm/dsputil_init_armv6.c libavcodec/arm/dsputil_init_neon.c libavcodec/arm/dsputil_iwmmxt.c libavcodec/arm/h264pred_init_arm.c libavcodec/bfin/dsputil_bfin.c libavcodec/dsputil.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_loopfilter.c libavcodec/h264_ps.c libavcodec/h264_refs.c libavcodec/h264dsp.c libavcodec/h264idct.c libavcodec/h264pred.c libavcodec/mlib/dsputil_mlib.c libavcodec/options.c libavcodec/ppc/dsputil_altivec.c libavcodec/ppc/dsputil_ppc.c libavcodec/ppc/h264_altivec.c libavcodec/ps2/dsputil_mmi.c libavcodec/sh4/dsputil_align.c libavcodec/sh4/dsputil_sh4.c libavcodec/sparc/dsputil_vis.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/dsputil_mmx.c libavformat/options.c libavformat/utils.c libavutil/pixfmt.h libswscale/swscale.c libswscale/swscale_internal.h libswscale/swscale_template.c tests/ref/seek/lavf_avi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * AVOptions: make default_val a union, as proposed in AVOption2.Anton Khirnov2011-05-10
| | | | | | | | This breaks API and ABI.
| * Add pixel formats for 9- and 10-bit yuv420p.Oskar Arvidsson2011-05-10
| | | | | | | | | | | | | | | | Also add support for these formats in libswscale. Needed for high bit depth h264 decoding. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | swscale: Fix scaling for unscaled dithered planar convertions.Michael Niedermayer2011-05-10
| | | | | | | | | | | | | | This fixes some overflow in bright areas and ensures that the maximum brightness level is mapped to the maximum without cliping and without showing dither patterens in flat max brightness areas. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale: use Nbit code to handle !is16BPS(c->srcFormat) && is16BPS(c->dstFormat)Michael Niedermayer2011-05-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale: Support dither in is16BPS(c->srcFormat) && !is16BPS(c->dstFormat)Michael Niedermayer2011-05-10
| | | | | | | | | | This is done by just letting the Nbit code handle it, which now can do it. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale: support unscaled planar Nbit->8bit with non native endian source.Michael Niedermayer2011-05-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale: fix unscaled yuv422p16be -> yuv422p10leMichael Niedermayer2011-05-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale: make DITHER_COPY() support non native endian sourceMichael Niedermayer2011-05-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale: factor shift out of DITHER_COPY().Michael Niedermayer2011-05-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale: factorize DITHER_COPY()Michael Niedermayer2011-05-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale: implement Nbit->non native endian 16bit. Fixes v210.Michael Niedermayer2011-05-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale: 9,10 bits pixel format output supportBaptiste Coudurier2011-05-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix function pointer type to match function it is assigned.Reimar Döffinger2011-05-07
| |
* | Store pointers in a less messy way in SWSContext.Reimar Döffinger2011-05-07
| |
* | swscale: Dither for unscaled 10->8bit per channelMichael Niedermayer2011-05-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale: dont reshuffle bytesMichael Niedermayer2011-05-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | rgb24toyv12: break out in the middle before out of array reads.Michael Niedermayer2011-05-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale: fix src typeMichael Niedermayer2011-05-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '85770f2a2651497861ed938efcd0df3696ff5e45'Michael Niedermayer2011-05-01
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '85770f2a2651497861ed938efcd0df3696ff5e45': AVOptions: make default_val a union, as proposed in AVOption2. Move ff_dynarray_add to lavu and make it public. lavf: remove duplicate assignment in avformat_alloc_context. lavf: use designated initializers for AVClasses. options: simplify av_find_opt by using av_next_option. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | AVOptions: make default_val a union, as proposed in AVOption2.Anton Khirnov2011-04-30
| |/ | | | | | | This breaks API and ABI.
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: LOTS of duplicates ... avio: Fix the deprecated fallback URL-prefixed open flags avoid duplicate -lm in .pc files mpeg12: terminate mpeg2_video_profiles arrays network: Check POLLERR and POLLHUP in ff_network_wait_fd mpegtsenc: make PMT PID really start on pmt_start_pid nut format: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE rawvideo codec: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE hflip: make the filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats crop: make the filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats libswcale: PIX_FMT_BGR48LE and PIX_FMT_BGR48BE scaler implementation Conflicts: configure libswscale/swscale.h tests/ref/lavf/ts Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libswcale: PIX_FMT_BGR48LE and PIX_FMT_BGR48BE scaler implementationPeter Ross2011-04-28
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * sws: remove disabled cruft.Anton Khirnov2011-04-19
| |
* | Correctly support pal8 with alpha in libswscale, fix png pal8 with alpha.Baptiste Coudurier2011-04-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Set alpha of palettes to 0xff.Baptiste Coudurier2011-04-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Rename y400a to gray8a.Baptiste Coudurier2011-04-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix runtime CPU detection in libswscale.tateu2011-04-27
| |
* | lsws: prevent overflow in sws_init_context()Stefano Sabatini2011-04-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the loop: for (i=0; i<dstH; i++) { int chrI= i*c->chrDstH / dstH; when i*c->chrDstH > INT_MAX this leads to an integer overflow, which results in a negative value for chrI and in out-of-buffer reads. The overflow is avoided by forcing int64_t arithmetic by casting i to int64_t. Fix crash, and trac issue #72. Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
* | Patch from Packman (OpenSuse - packages) to silence rpmlint.Manfred Tremmel2011-04-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Check mmap() return against correct valueunknown author2011-04-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (37 commits) In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function. lavc: remove reference to opt.h from Makefile. prefer avio_check() over url_exist() avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols lavu: remove misc disabled cruft lavu: remove FF_API_OLD_IMAGE_NAMES cruft NOT PULLED lavu: remove FF_API_OLD_EVAL_NAMES cruft lavc: remove misc disabled cruft. lavc: remove the FF_API_INOFFICIAL cruft. lavc: remove the FF_API_SET_STRING_OLD cruft. lavc: remove the FF_API_USE_LPC cruft. lavc: remove the FF_API_SUBTITLE_OLD cruft. lavc: remove the FF_API_VIDEO_OLD cruft. lavc: remove the FF_API_AUDIO_OLD cruft. lavc: remove the FF_API_OPT_SHOW cruft. lavc: remove the FF_API_MM_FLAGS cruft. lavf: remove misc disabled cruft. lavf: remove FF_API_INDEX_BUILT cruft lavf: remove FF_API_URL_CLASS cruft. lavf: remove FF_API_SYMVER cruft ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: remove the FF_API_SET_STRING_OLD cruft.Anton Khirnov2011-04-19
| |
| * Bump major versions of all libraries.Anton Khirnov2011-04-18
| | | | | | | | | | | | They've accumulated enough new APIs and corresponding deprecated cruft. This breaks API and ABI.
| * swscale: fix "ISO C90 forbids mixed declarations and code" warningJanne Grunau2011-04-15
| | | | | | | | only hit with --enable-runtime-cpudetect
| * swscale: fix compilation with --enable-runtime-cpudetectJanne Grunau2011-04-15
| |
| * swscale: correct include path to fix ppc altivec buildJanne Grunau2011-04-15
| |
| * swscale: simplify rgb2rgb templatingLuca Barbato2011-04-14
| | | | | | | | MMX is always built. Drop the ifdefs
| * swscale: simplify initialization codeJosh Allmann2011-04-14
| | | | | | | | | | Simplify the fallthrough case when no accelerated functions can be initialized.
| * swscale: further cleanup swscale.cJosh Allmann2011-04-14
| | | | | | | | Move x86-specific constants out of swscale.c
| * swscale: partially move the arch specific code leftLuca Barbato2011-04-14
| | | | | | | | | | | | | | | | | | | | 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.
| * swscale: move away x86 specific code from rgb2rgbLuca Barbato2011-04-14
| | | | | | | | | | | | | | 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.
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (32 commits) libopencore-amr, libvo-amrwbenc: Allow enabling DTX via private AVOptions libopencore-amr, libvo-amrwbenc: Only check the bitrate when changed libopencore-amr, libvo-amrwbenc: Find the closest matching bitrate libvo-*: Fix up the long codec names libavcodec: Mark AVCodec->priv_class const swscale: Factorize FAST_BGR2YV12 definition. libvo-aacenc: Only produce extradata if the global header flag is set lavf: postpone removal of public metadata conversion API lavc: postpone removal of request_channels lavc: postpone removal of audioconvert and sample_fmt wrappers lavf: postpone removal of deprecated avio functions libopencore-amr: Cosmetics: Rewrap and align libopencore-amr, libvo-amrbwenc: Rename variables and functions libopencore-amr: Convert commented out debug logging into av_dlog libopencore-amr: Remove an unused state variable libvo-amrwbenc: Don't explicitly store bitrate modes in the bitrate table libopencore-amr: Remove a useless local variable libopencore-amr, libvo-amrwbenc: Make the bitrate/mode mapping array static const libopencore-amr, libvo-amrwbenc: Return proper error codes in most places libopencore-amr: Don't print carriage returns in log messages ... Conflicts: doc/developer.texi libavcodec/avcodec.h libavcodec/libvo-aacenc.c libavcodec/libvo-amrwbenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: Factorize FAST_BGR2YV12 definition.Luca Barbato2011-04-13
| | | | | | | | | | It is used only for x86 so it will eventually be moved with that code into the x86 arch subdirectory.
| * Add unconditional return statement to yuva420_rgb32_MMX() / yuva420_bgr32_MMX().Diego Biurrun2011-04-11
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Add pixel formats for 9- and 10-bit yuv420p.Oskar Arvidsson2011-04-10
| | | | | | | | | | | | | | | | Also add support for these formats in libswscale. Needed for high bit depth h264 decoding. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Fix parser: mark av_parser_parse() for removal on next major bump swscale: postpone sws_getContext removal until next major bump. fate: add AAC LATM test mmst: get rid of deprecated AVERRORs lxfdec: use AVERROR(ENOMEM) instead of deprecated AVERROR_NOMEM. Reemove remaining uses of deprecated AVERROR_NOTSUPP. REIMPLEMENTED in 2 lines of code: lavf: if id3v2 tag is present and all else fails, guess by file extension Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: postpone sws_getContext removal until next major bump.Anton Khirnov2011-04-06
| | | | | | | | The replacement isn't ready yet.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-30 14:36:10 +0000