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

5 years ago · 03dad63123
parent d19313d815 4900ae28b3
commit 03dad63123
1 changed files with 3 additions and 1 deletions
--- a/media/codec2/components/mpeg4_h263/C2SoftMpeg4Enc.cpp
+++ b/media/codec2/components/mpeg4_h263/C2SoftMpeg4Enc.cpp
@ -517,9 +517,11 @@ void C2SoftMpeg4Enc::process(
            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;
            }