diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-02 03:07:06 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-02 03:24:32 +0200 |
commit | 3074f03a074de3aab79639d261cbd0ccc265b5b4 (patch) | |
tree | 9710041e852ee69f6de6ef6e6333af82f6ca5931 /libswscale | |
parent | 392acaedcb052fa64386d5d0aea4931386f72d64 (diff) | |
parent | 23ce6e72123a40895baaeefeb27c7c18748bd67e (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
get_bits: remove x86 inline asm in A32 bitstream reader
doc: Remove outdated information about our issue tracker
avidec: Factor out the sync fucntionality.
fate-aac: Expand coverage.
ac3dsp: add x86-optimized versions of ac3dsp.extract_exponents().
ac3dsp: simplify extract_exponents() now that it does not need to do clipping.
ac3enc: clip coefficients after MDCT.
ac3enc: add int32_t array clipping function to DSPUtil, including x86 versions.
swscale: for >8bit scaling, read in native bit-depth.
matroskadec: matroska_read_seek after after EBML_STOP leads to failure.
doxygen: fix usage of @file directive in libavutil/{dict,file}.h
doxygen: Help doxygen parser to understand the DECLARE_ALIGNED and offsetof macros
Conflicts:
doc/issue_tracker.txt
libavformat/avidec.c
libavutil/dict.h
libswscale/swscale.c
libswscale/utils.c
tests/ref/lavfi/pixfmts_scale
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
-rw-r--r-- | libswscale/swscale.c | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 3e2d2a424d..3a92db5c16 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -1783,53 +1783,6 @@ static void nv21ToUV_c(uint8_t *dstU, uint8_t *dstV, #define input_pixel(pos) (isBE(origin) ? AV_RB16(pos) : AV_RL16(pos)) -// FIXME Maybe dither instead. -static av_always_inline void -yuv9_OR_10ToUV_c_template(uint8_t *dstU, uint8_t *dstV, - const uint8_t *_srcU, const uint8_t *_srcV, - int width, enum PixelFormat origin, int depth) -{ - int i; - const uint16_t *srcU = (const uint16_t *) _srcU; - const uint16_t *srcV = (const uint16_t *) _srcV; - - for (i = 0; i < width; i++) { - dstU[i] = input_pixel(&srcU[i]) >> (depth - 8); - dstV[i] = input_pixel(&srcV[i]) >> (depth - 8); - } -} - -static av_always_inline void -yuv9_or_10ToY_c_template(uint8_t *dstY, const uint8_t *_srcY, - int width, enum PixelFormat origin, int depth) -{ - int i; - const uint16_t *srcY = (const uint16_t*)_srcY; - - for (i = 0; i < width; i++) - dstY[i] = input_pixel(&srcY[i]) >> (depth - 8); -} - -#undef input_pixel - -#define YUV_NBPS(depth, BE_LE, origin) \ -static void BE_LE ## depth ## ToUV_c(uint8_t *dstU, uint8_t *dstV, \ - const uint8_t *srcU, const uint8_t *srcV, \ - int width, uint32_t *unused) \ -{ \ - yuv9_OR_10ToUV_c_template(dstU, dstV, srcU, srcV, width, origin, depth); \ -} \ -static void BE_LE ## depth ## ToY_c(uint8_t *dstY, const uint8_t *srcY, \ - int width, uint32_t *unused) \ -{ \ - yuv9_or_10ToY_c_template(dstY, srcY, width, origin, depth); \ -} - -YUV_NBPS( 9, LE, PIX_FMT_YUV420P9LE); -YUV_NBPS( 9, BE, PIX_FMT_YUV420P9BE); -YUV_NBPS(10, LE, PIX_FMT_YUV420P10LE); -YUV_NBPS(10, BE, PIX_FMT_YUV420P10BE); - static void bgr24ToY_c(int16_t *dst, const uint8_t *src, int width, uint32_t *unused) { |