commit cb3046d011f9211b35412a876361576282408242
author Treehugger Robot <treehugger-gerrit@google.com> Thu Apr 05 01:42:00 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 05 01:42:00 2018 +0000
tree eb4d691dba47f088ba7759d727d2322f35a15432
parent a4c38d6eb431ec2de5f8c918cb951523d22a453c
parent 7576c34313b9b9a47d64527e346c0a2c4c86904f

Merge "Fix TIYUV420PackSemiPlanor color converter to use src crop"

media/libstagefright/colorconversion/ColorConverter.cpp

diff --git a/media/libstagefright/colorconversion/ColorConverter.cpp b/media/libstagefright/colorconversion/ColorConverter.cpp
index 0982006..a0654c7 100644
--- a/media/libstagefright/colorconversion/ColorConverter.cpp
+++ b/media/libstagefright/colorconversion/ColorConverter.cpp
@@ -577,7 +577,8 @@
     uint16_t *dst_ptr = (uint16_t *)dst.mBits
         + dst.mCropTop * dst.mWidth + dst.mCropLeft;
 
-    const uint8_t *src_y = (const uint8_t *)src.mBits;
+    const uint8_t *src_y =
+        (const uint8_t *)src.mBits + src.mCropTop * src.mWidth + src.mCropLeft;
 
     const uint8_t *src_u =
         (const uint8_t *)src_y + src.mWidth * (src.mHeight - src.mCropTop / 2);