diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-05 22:26:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-05 22:26:50 +0200 |
| commit | 2c5a2958e961c25434a54c832a04139525f661da (patch) | |
| tree | 7fba548115bae83f10089b8c9b5ff77ee9f14224 /libswscale | |
| parent | 3e4b5e68c1589590736fce62c0e677c4632f965b (diff) | |
| parent | 0becb07842b57ea225ddf0726de33b5f8e669297 (diff) | |
| download | ffmpeg-2c5a2958e961c25434a54c832a04139525f661da.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: Factorize declaration of mb_sizes array.
vsrc_buffer: when no frame is available, return an error instead of segfaulting.
configure: add dl to frei0r extralibs.
dsputil x86: use SSE float instruction instead of SSE2 integer equivalent
dsputil x86: remove deprecated parameter from scalarproduct_int16 prototype
vp8dsp x86: perform rounding shift with a single instruction
fate: add BMP tests.
swscale: handle complete dimensions for monoblack/white.
aacenc: Mark deinterleave_input_samples argument as const.
vf_unsharp: Mark readonly variable as const.
h264: fix 4:2:2 PCM-macroblocks decoding
Conflicts:
configure
libavcodec/h264.h
libavcodec/x86/dsputil_mmx.c
libavfilter/vf_unsharp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/input.c | 6 | ||||
| -rw-r--r-- | libswscale/output.c | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/libswscale/input.c b/libswscale/input.c index 1d139a67ee..a3c00ced61 100644 --- a/libswscale/input.c +++ b/libswscale/input.c @@ -425,7 +425,8 @@ static void palToUV_c(uint16_t *dstU, int16_t *dstV, static void monowhite2Y_c(int16_t *dst, const uint8_t *src, const uint8_t *unused1, const uint8_t *unused2, int width, uint32_t *unused) { int i, j; - for (i=0; i<width/8; i++) { + width = (width + 7) >> 3; + for (i = 0; i < width; i++) { int d= ~src[i]; for(j=0; j<8; j++) dst[8*i+j]= ((d>>(7-j))&1)*16383; @@ -440,7 +441,8 @@ static void monowhite2Y_c(int16_t *dst, const uint8_t *src, const uint8_t *unuse static void monoblack2Y_c(int16_t *dst, const uint8_t *src, const uint8_t *unused1, const uint8_t *unused2, int width, uint32_t *unused) { int i, j; - for (i=0; i<width/8; i++) { + width = (width + 7) >> 3; + for (i = 0; i < width; i++) { int d= src[i]; for(j=0; j<8; j++) dst[8*i+j]= ((d>>(7-j))&1)*16383; diff --git a/libswscale/output.c b/libswscale/output.c index 34ed114207..6b17c922ba 100644 --- a/libswscale/output.c +++ b/libswscale/output.c @@ -320,7 +320,7 @@ yuv2mono_X_c_template(SwsContext *c, const int16_t *lumFilter, int i; unsigned acc = 0; - for (i = 0; i < dstW - 1; i += 2) { + for (i = 0; i < dstW; i += 2) { int j; int Y1 = 1 << 18; int Y2 = 1 << 18; @@ -341,6 +341,10 @@ yuv2mono_X_c_template(SwsContext *c, const int16_t *lumFilter, output_pixel(*dest++, acc); } } + + if (i & 6) { + output_pixel(*dest, acc); + } } static av_always_inline void @@ -355,7 +359,7 @@ yuv2mono_2_c_template(SwsContext *c, const int16_t *buf[2], int yalpha1 = 4095 - yalpha; int i; - for (i = 0; i < dstW - 7; i += 8) { + for (i = 0; i < dstW; i += 8) { int Y, acc = 0; Y = (buf0[i + 0] * yalpha1 + buf1[i + 0] * yalpha) >> 19; @@ -388,7 +392,7 @@ yuv2mono_1_c_template(SwsContext *c, const int16_t *buf0, const uint8_t * const d128 = dither_8x8_220[y & 7]; int i; - for (i = 0; i < dstW - 7; i += 8) { + for (i = 0; i < dstW; i += 8) { int acc = 0; accumulate_bit(acc, ((buf0[i + 0] + 64) >> 7) + d128[0]); |