commit 6a287c7c18711529b40637927e32c5c865113154
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 05 23:37:54 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 05 23:37:54 2018 +0000
tree 57b677f4d465649e7e9ce964d7f49041f6e3fd93
parent 0967c6c06d030636e2c584ce3e24924357a3a854
parent e14a36f37035c2655df13838c15fdb61e76c3e65

Merge "Fix TIYUV420PackSemiPlanor color converter to use src crop -- DO NOT MERGE" into pi-dev

media/libstagefright/colorconversion/ColorConverter.cpp

diff --git a/media/libstagefright/colorconversion/ColorConverter.cpp b/media/libstagefright/colorconversion/ColorConverter.cpp
index eae73fc..1b38852 100644
--- a/media/libstagefright/colorconversion/ColorConverter.cpp
+++ b/media/libstagefright/colorconversion/ColorConverter.cpp
@@ -818,7 +818,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);