generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

swscale/swscale_unscaled: fix right column handling in planarCopyWrapper

Browse Source 
Found-by: Михаил <Micky53@mail.ru>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-16 20:34:05 +01:00
parent ab80d7e8c5
commit 6909a611d2
1 changed files with 7 additions and 10 deletions

17
libswscale/swscale_unscaled.c

@ -1091,27 +1091,24 @@ static int planarCopyWrapper(SwsContext *c, const uint8_t *src[],
srcPtr += srcStride[plane]; srcPtr += srcStride[plane];
} }
} else if (src_depth <= dst_depth) { } else if (src_depth <= dst_depth) {
int orig_length = length;
for (i = 0; i < height; i++) { for (i = 0; i < height; i++) {
j = 0;
if(isBE(c->srcFormat) == HAVE_BIGENDIAN && if(isBE(c->srcFormat) == HAVE_BIGENDIAN &&
isBE(c->dstFormat) == HAVE_BIGENDIAN && isBE(c->dstFormat) == HAVE_BIGENDIAN &&
shiftonly) { shiftonly) {
unsigned shift = dst_depth - src_depth; unsigned shift = dst_depth - src_depth;
length = orig_length;
#if HAVE_FAST_64BIT #if HAVE_FAST_64BIT
#define FAST_COPY_UP(shift) \ #define FAST_COPY_UP(shift) \
for (j = 0; j < length - 3; j += 4) { \ for (; j < length - 3; j += 4) { \
uint64_t v = AV_RN64A(srcPtr2 + j); \ uint64_t v = AV_RN64A(srcPtr2 + j); \
AV_WN64A(dstPtr2 + j, v << shift); \ AV_WN64A(dstPtr2 + j, v << shift); \
} \ }
length &= 3;
#else #else
#define FAST_COPY_UP(shift) \ #define FAST_COPY_UP(shift) \
for (j = 0; j < length - 1; j += 2) { \ for (; j < length - 1; j += 2) { \
uint32_t v = AV_RN32A(srcPtr2 + j); \ uint32_t v = AV_RN32A(srcPtr2 + j); \
AV_WN32A(dstPtr2 + j, v << shift); \ AV_WN32A(dstPtr2 + j, v << shift); \
} \ }
length &= 1;
#endif #endif
switch (shift) switch (shift)
{ {
@ -1121,12 +1118,12 @@ static int planarCopyWrapper(SwsContext *c, const uint8_t *src[],
} }
#define COPY_UP(r,w) \ #define COPY_UP(r,w) \
if(shiftonly){\ if(shiftonly){\
for (j = 0; j < length; j++){ \ for (; j < length; j++){ \
unsigned int v= r(&srcPtr2[j]);\ unsigned int v= r(&srcPtr2[j]);\
w(&dstPtr2[j], v<<(dst_depth-src_depth));\ w(&dstPtr2[j], v<<(dst_depth-src_depth));\
}\ }\
}else{\ }else{\
for (j = 0; j < length; j++){ \ for (; j < length; j++){ \
unsigned int v= r(&srcPtr2[j]);\ unsigned int v= r(&srcPtr2[j]);\
w(&dstPtr2[j], (v<<(dst_depth-src_depth)) | \ w(&dstPtr2[j], (v<<(dst_depth-src_depth)) | \
(v>>(2*src_depth-dst_depth)));\ (v>>(2*src_depth-dst_depth)));\