diff mbox

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

Message ID 1553773253-22892-1-git-send-email-decai.lin@intel.com
State Accepted
Commit c47fada298e684a07fb6ba047f6843f1cdd48aa8
Headers show

Commit Message

Decai Lin March 28, 2019, 11:40 a.m. UTC 
From: "Dong, Jerry" <jerry.dong@intel.com>

Signed-off-by: Dong, Jerry <jerry.dong@intel.com>
Signed-off-by: Decai Lin <decai.lin@intel.com>
---
 libswscale/swscale_unscaled.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Michael Niedermayer March 28, 2019, 8:32 p.m. UTC | #1 
On Thu, Mar 28, 2019 at 07:40:53PM +0800, Decai Lin wrote:
> From: "Dong, Jerry" <jerry.dong@intel.com>
> 
> Signed-off-by: Dong, Jerry <jerry.dong@intel.com>
> Signed-off-by: Decai Lin <decai.lin@intel.com>
> ---
>  libswscale/swscale_unscaled.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)

will apply

thanks

[...]
diff mbox

Patch

diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
index 058f2b9..d01e373 100644
--- a/libswscale/swscale_unscaled.c
+++ b/libswscale/swscale_unscaled.c
@@ -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;