Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

swscale/swscale_unscaled: fixed the issue that when width/height is not 2-multiple, transition of nv12 to u/v planes is not completed.

Browse source 
Signed-off-by: Dong, Jerry <jerry.dong@intel.com>
Signed-off-by: Decai Lin <decai.lin@intel.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Dong, Jerry 2019-03-28 19:40:53 +08:00 • committed by Michael Niedermayer
parent 391f884675
commit c47fada298
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libswscale/swscale_unscaled.c
View file

@ -150,10 +150,10 @@ static int planarToNv12Wrapper(SwsContext *c, const uint8_t *src[],
dstParam[0], dstStride[0]);
if (c->dstFormat == AV_PIX_FMT_NV12)
interleaveBytes(src[1], src[2], dst, c->srcW / 2, srcSliceH / 2,
interleaveBytes(src[1], src[2], dst, c->chrSrcW, c->chrSrcH,
srcStride[1], srcStride[2], dstStride[1]);
else
interleaveBytes(src[2], src[1], dst, c->srcW / 2, srcSliceH / 2,
interleaveBytes(src[2], src[1], dst, c->chrSrcW, c->chrSrcH,
srcStride[2], srcStride[1], dstStride[1]);
return srcSliceH;
@ -171,10 +171,10 @@ static int nv12ToPlanarWrapper(SwsContext *c, const uint8_t *src[],
dstParam[0], dstStride[0]);
if (c->srcFormat == AV_PIX_FMT_NV12)
deinterleaveBytes(src[1], dst1, dst2,c->srcW / 2, srcSliceH / 2,
deinterleaveBytes(src[1], dst1, dst2, c->chrSrcW, c->chrSrcH,
srcStride[1], dstStride[1], dstStride[2]);
else
deinterleaveBytes(src[1], dst2, dst1, c->srcW / 2, srcSliceH / 2,
deinterleaveBytes(src[1], dst2, dst1, c->chrSrcW, c->chrSrcH,
srcStride[1], dstStride[2], dstStride[1]);
return srcSliceH;