commit 4900ae28b35d301a2baab23d537a4b9344ce0ee6
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Mon Aug 26 16:22:41 2019 -0700
committer Jose Cubero <josecubero@google.com> Sat Nov 16 01:35:27 2019 +0000
tree 9037ce4836e6a916dd8c2b21f979d6fe61d00ce5
parent 4333c308afa4a695fd8f444d308b794cad656a6e

C2SoftMpeg4Enc: Handle yStride not equal to aligned width

mpeg4 encoder doesn't support a stride that is not equal to align(width, 16)
In such cases copy the input to an intermediate buffer and use that for
encoding

Bug: 143506888
Bug: 136962421
Bug: 139921039
Test: tested few nv12 and i420 encoding

Change-Id: I5a8adfc48aff79f52852be94bb46c10e7f9a0469
(cherry picked from commit a6dfef8a44d95f2cc049ee0cb83501605c38ac64)

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