commit 40ca727062bbe76658675f30e2d37316fa1dfaaf
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Sun Nov 17 04:42:42 2019 -0800
committer android-build-merger <android-build-merger@google.com> Sun Nov 17 04:42:42 2019 -0800
tree 3dd1e1ab980b0ac9df5d8845c131a69b811a6bca
parent 1a9295136143b3f15779b9797225e7992ec586fa
parent 03dad63123ccd1ac6aa65d657d85fff9527b66eb

Merge "C2SoftMpeg4Enc: Handle yStride not equal to aligned width" into qt-qpr1-dev
am: 03dad63123

Change-Id: I1c8b3e7d60b782095171132abb07ebf206e10ed7

media/codec2/components/mpeg4_h263/C2SoftMpeg4Enc.cpp

diff --git a/media/codec2/components/mpeg4_h263/C2SoftMpeg4Enc.cpp b/media/codec2/components/mpeg4_h263/C2SoftMpeg4Enc.cpp
index 36053f6..54c8c47 100644
--- a/media/codec2/components/mpeg4_h263/C2SoftMpeg4Enc.cpp
+++ b/media/codec2/components/mpeg4_h263/C2SoftMpeg4Enc.cpp
@@ -517,9 +517,11 @@
             if (layout.planes[layout.PLANE_Y].colInc == 1
                     && layout.planes[layout.PLANE_U].colInc == 1
                     && layout.planes[layout.PLANE_V].colInc == 1
+                    && yStride == align(width, 16)
                     && uStride == vStride
                     && yStride == 2 * vStride) {
-                // I420 compatible - planes are already set up above
+                // I420 compatible with yStride being equal to aligned width
+                // planes are already set up above
                 break;
             }