summaryrefslogtreecommitdiff
path: root/libswscale
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-16
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ac3enc: use correct alignment and length in channel coupling dsp functions. ffmpeg: don't abuse a global for passing framerate from input to output ffmpeg: don't abuse a global for passing channels from input to output ffmpeg: don't abuse a global for passing samplerate from input to output ARM: update ff_h264_idct8_add4_neon for 4:4:4 changes swscale: use SwsContext for av_log when available swscale: Remove HAVE_MMX from files that are only compiled with MMX enabled. swscale: Fix compilation with --disable-mmx2. Conflicts: ffmpeg.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: use SwsContext for av_log when availableJanne Grunau2011-06-15
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * swscale: Remove HAVE_MMX from files that are only compiled with MMX enabled.Diego Biurrun2011-06-15
| |
| * swscale: Fix compilation with --disable-mmx2.Diego Biurrun2011-06-15
| | | | | | | | Some MMX2 functions were being referenced without proper #ifdefs.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: swscale: remove misplaced comment. ffmpeg: fix streaming to ffserver. swscale: split out RGB48 output functions from yuv2packed[12X]_c(). build: move vpath directives to main Makefile swscale: fix JPEG-range YUV scaling artifacts. build: move ALLFFLIBS to a more logical place ARM: factor some repetitive code into macros Fix SVQ3 after adding 4:4:4 H.264 support H.264: fix CODEC_FLAG_GRAY 4:4:4 H.264 decoding support ac3enc: fix allocation of floating point samples. Conflicts: ffmpeg.c libavcodec/dsputil_template.c libavcodec/h264.c libavcodec/mpegvideo.c libavcodec/snow.c libswscale/swscale.c libswscale/swscale_internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: remove misplaced comment.Ronald S. Bultje2011-06-14
| | | | | | | | | | The comment should have been placed only in yuv2rgb48_X_c_template, not yuv2rgb48_1_c_template.
| * swscale: split out RGB48 output functions from yuv2packed[12X]_c().Ronald S. Bultje2011-06-14
| | | | | | | | | | | | | | 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.
| * swscale: fix JPEG-range YUV scaling artifacts.Michael Niedermayer2011-06-14
| | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: bitstream: Properly promote av_reverse values before shifting. libavutil/swscale: YUV444P10/YUV444P9 support. H.264: Fix high bit depth explicit biweight h264: Fix 10-bit H.264 x86 chroma v loopfilter asm. Replace DEBUG_SEEK/DEBUG_SI + av_log combinations by av_dlog. Update copyright year for ac3enc_opts_template.c. adts: Adjust frame size mask to follow the specification. movenc: Add RTP muxer/hinter options movenc: Pass the RTP AVFormatContext to the SDP generation rtspenc: Add RTP muxer options rtspenc: Add an AVClass for setting muxer specific options rtpenc_chain: Pass the rtpflags options through to the chained muxer rtpenc: Declare the rtp flags private AVOptions in rtpenc.h sdp: Reindent after the previous commit rtpenc: MP4A-LATM payload support avoptions: Add an av_opt_flag_is_set function for inspecting flag fields sdp: Allow passing an AVFormatContext to the SDP generation mov: Fix wrong timestamp generation for fragmented movies that have time offset caused by the first edit list entry. mpeg12: more advanced ffmpeg mpeg2 aspect guessing code. swscale: split YUYV output out of yuv2packed[12X]_c(). Conflicts: doc/APIchanges libavcodec/Makefile libavcodec/h264dsp_template.c libavcodec/mpeg12.c libavformat/aacdec.c libavformat/avidec.c libavformat/internal.h libavformat/movenc.c libavformat/rtpenc.c libavformat/rtpenc_latm.c libavformat/sdp.c libavformat/version.h libavutil/avutil.h libavutil/pixfmt.h libswscale/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavutil/swscale: YUV444P10/YUV444P9 support.Ronald S. Bultje2011-06-10
| | | | | | | | | | | | | | Also add missing glue code for recently added YUV422P10 formats to swscale. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * swscale: split YUYV output out of yuv2packed[12X]_c().Ronald S. Bultje2011-06-09
| | | | | | | | This is part of the Great Evil Plan to simplify swscale.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavf: make compute_pkt_fields2() return meaningful error values matroskadec: set timestamps for RealAudio packets. intelh263dec: aspect ratio processing fix. intelh263dec: fix "Strict H.263 compliance" file playback oss,sndio: simplify by using FFMIN. swscale: extract monowhite/black output from yuv2packed[12X]_c(). swscale: de-macro'ify RGB15/16/32 input functions. swscale: rearrange code. movdec: Add support for the 'wfex' atom. ffmpeg.c: Add a necessary const qualifier riff: Fix potential memleak. swscale: change 48bit RGB input macros to inline functions. swscale: change 9/10bit YUV input macros to inline functions. swscale: extract gray16 output functions from yuv2packed[12X](). swscale: use standard clipping functions. swscale: merge macros that are used only once. swscale: fix function declarations in swscale.c. swscale: fix function declaration keywords in x86/swscale_template.c. Conflicts: ffmpeg.c libavcodec/intelh263dec.c libswscale/swscale.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: extract monowhite/black output from yuv2packed[12X]_c().Ronald S. Bultje2011-06-09
| | | | | | | | This is part of the Great Evil Plan to simplify swscale.
| * swscale: de-macro'ify RGB15/16/32 input functions.Ronald S. Bultje2011-06-09
| | | | | | | | | | | | | | | | 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.
| * swscale: rearrange code.Ronald S. Bultje2011-06-09
| | | | | | | | | | This way the code in the file is less cluttered all-over-the- place.
| * swscale: change 48bit RGB input macros to inline functions.Ronald S. Bultje2011-06-09
| | | | | | | | | | | | Inline functions are slightly larger in source code, but are easier to handle in source code editors. The binary code generated is the same.
| * swscale: change 9/10bit YUV input macros to inline functions.Ronald S. Bultje2011-06-09
| | | | | | | | | | | | Inline functions are slightly larger in source code, but are easier to handle in source code editors. The binary code generated is the same.
| * swscale: extract gray16 output functions from yuv2packed[12X]().Ronald S. Bultje2011-06-09
| | | | | | | | This is part of the Great Evil Plan to simplify swscale.
| * swscale: use standard clipping functions.Ronald S. Bultje2011-06-09
| | | | | | | | This generates better code on some non-x86 architectures.
| * swscale: merge macros that are used only once.Ronald S. Bultje2011-06-09
| | | | | | | | This reduces source code size without affecting the binary.
| * swscale: fix function declarations in swscale.c.Ronald S. Bultje2011-06-09
| | | | | | | | | | | | 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.
| * swscale: fix function declaration keywords in x86/swscale_template.c.Ronald S. Bultje2011-06-09
| | | | | | | | | | | | | | 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.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: crypto: Use av_freep instead of av_free lavf: don't try to free private options if priv_data is NULL. swscale: fix types of assembly arguments. swscale: move two macros that are only used once into caller. swscale: remove unused function. options: Add missing braces around struct initializer. mov: Remove leftover crufty debug statement with references to a local file. dvbsubdec: Fix compilation of debug code. Remove all uses of now deprecated metadata functions. Move metadata API from lavf to lavu. Conflicts: doc/APIchanges libavformat/aiffdec.c libavformat/asfdec.c libavformat/avformat.h libavformat/avidec.c libavformat/cafdec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/mp3enc.c libavformat/wtv.c libavutil/avutil.h libavutil/internal.h libswscale/swscale.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: fix types of assembly arguments.Ronald S. Bultje2011-06-08
| | | | | | | | | | | | | | | | 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).
| * swscale: move two macros that are only used once into caller.Ronald S. Bultje2011-06-08
| | | | | | | | | | This way, they look like regular code, which is easier to understand.
| * swscale: remove unused function.Ronald S. Bultje2011-06-08
| | | | | | | | | | Use of this wrapper was removed in a previous patch, but I forgot to actually remove the function itself.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (28 commits) Remove some non-compiling debug messages. ffplay: Fix non-compiling debug printf and replace it by av_dlog. H264: x86 predict init cosmetics. ac3enc: Fix linking of AC-3 encoder without the E-AC-3 encoder. Move E-AC-3 encoder functions to a separate eac3enc.c file. ac3enc: remove convenience macro, #define DEBUG ac3enc: remove unused #define vc1: re-initialize tables after width/height change. APIchanges: fill-in git commit hash for av_get_bytes_per_sample() addition samplefmt: add av_get_bytes_per_sample() iirfilter: fix biquad filter coefficients. swscale: remove duplicate conversion routine in swScale(). swscale: add yuv2planar/packed function typedefs. swscale: integrate yuv2nv12X_C into yuv2yuvX() function pointers. swscale: reindent x86 init code. swscale: extract SWS_FULL_CHR_H_INT conditional into init code. swscale: cosmetics. swscale: remove alp/chr/lumSrcOffset. swscale: un-special-case yuv2yuvX16_c(). shorten: Remove stray DEBUG #define and corresponding av_dlog statement. ... Conflicts: doc/APIchanges libavcodec/ac3enc.c libavutil/avutil.h libavutil/samplefmt.c libswscale/swscale.c libswscale/swscale_internal.h libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: remove duplicate conversion routine in swScale().Ronald S. Bultje2011-06-07
| |
| * swscale: add yuv2planar/packed function typedefs.Ronald S. Bultje2011-06-07
| |
| * swscale: integrate yuv2nv12X_C into yuv2yuvX() function pointers.Ronald S. Bultje2011-06-07
| |
| * swscale: reindent x86 init code.Ronald S. Bultje2011-06-07
| |
| * swscale: extract SWS_FULL_CHR_H_INT conditional into init code.Ronald S. Bultje2011-06-07
| |
| * swscale: cosmetics.Ronald S. Bultje2011-06-07
| |
| * swscale: remove alp/chr/lumSrcOffset.Ronald S. Bultje2011-06-07
| | | | | | | | | | | | | | 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.
| * swscale: un-special-case yuv2yuvX16_c().Ronald S. Bultje2011-06-07
| | | | | | | | | | Make yuv2yuvX16_c a function pointer for yuv2yuvX(), so that the function pointer becomes bitdepth-independent.
* | sws: make dither_scale constMichael Niedermayer2011-06-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale: override the lack of the accurate rounding flag when needed for dither.Michael Niedermayer2011-06-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale: factor should_dither outMichael Niedermayer2011-06-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) build: simplify commands for clean target swscale: split swscale.c in unscaled and generic conversion routines. swscale: cosmetics. swscale: integrate (literally) swscale_template.c in swscale.c. swscale: split out x86/swscale_template.c from swscale.c. swscale: enable hScale_altivec_real. swscale: split out ppc _template.c files from main swscale.c. swscale: remove indirections in ppc/swscale_template.c. swscale: split out unscaled altivec YUV converters in their own file. mpegvideoenc: fix multislice fate tests with threading disabled. mpegts: Wrap #ifdef DEBUG and av_hex_dump_log() combination in a macro. build: Simplify texi2html invocation through the --output option. Mark some variables with av_unused Replace avcodec_get_pix_fmt_name() by av_get_pix_fmt_name(). svq3: Check negative mb_type to fix potential crash. svq3: Move svq3-specific fields to their own context. rawdec: initialize return value to 0. Remove unused get_psnr() prototype rawdec: don't leak option strings. bktr: get default framerate from video standard. ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: split swscale.c in unscaled and generic conversion routines.Ronald S. Bultje2011-06-03
| | | | | | | | This duplicates the function fillPlane().
| * swscale: cosmetics.Ronald S. Bultje2011-06-03
| | | | | | | | | | | | | | | | 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.
| * swscale: integrate (literally) swscale_template.c in swscale.c.Ronald S. Bultje2011-06-03
| |
| * swscale: split out x86/swscale_template.c from swscale.c.Ronald S. Bultje2011-06-03
| |
| * swscale: enable hScale_altivec_real.Ronald S. Bultje2011-06-03
| |
| * swscale: split out ppc _template.c files from main swscale.c.Ronald S. Bultje2011-06-03
| |
| * swscale: remove indirections in ppc/swscale_template.c.Ronald S. Bultje2011-06-03
| |
| * swscale: split out unscaled altivec YUV converters in their own file.Ronald S. Bultje2011-06-03
| |
| * swscale: remove unused COMPILE_TEMPLATE_ALTIVEC.Ronald S. Bultje2011-06-02
| |
| * swscale: allocate larger buffer to handle altivec overreads.Ronald S. Bultje2011-06-02
| | | | | | | | | | Altivec sws code intentionally overreads buffers for better performance, so we need to allocate larger buffers to handle that.
| * swscale: Remove unused variable.Diego Biurrun2011-05-30
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-28 23:53:58 +0000