commit d981accc2d6b8d7de8c3be79527d51bf91a6b039
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Mon Sep 09 19:03:14 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Sep 09 19:03:14 2019 -0700
tree 224d6a4dd36d00db6473f7886580656441354638
parent 8c7465931249ed0ffea7de99f2d736ce0bc607dc
parent a9f528b0f0c2bbc865b867de6d0b46d790da5c36

Merge "C2SoftMpeg4Enc: Handle yStride not equal to aligned width" am: 1b4180698c am: e349c1ee9e
am: a9f528b0f0

Change-Id: I12f4b84909027bf81c266ee5c37f9f1a661f5533

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;
             }