commit bdb1112d2c9a818d34094e58c74055131fc27f45
author Lajos Molnar <lajos@google.com> Fri Feb 06 20:14:27 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 06 20:14:27 2015 +0000
tree fb5f26a9ef1df22b0d2fb5dfa389353ba2ea928c
parent 29eb804501a993ecdd4d1073240f2998264508ff
parent 35395ea6ad11824a4a89cc1ab9ee84f936188296

am 35395ea6: DO NOT MERGE: stagefright: add support for Intel\'s YUV420SP format in SoftwareRenderer

* commit '35395ea6ad11824a4a89cc1ab9ee84f936188296':
  DO NOT MERGE: stagefright: add support for Intel's YUV420SP format in SoftwareRenderer

media/libstagefright/colorconversion/SoftwareRenderer.cpp

diff --git a/media/libstagefright/colorconversion/SoftwareRenderer.cpp b/media/libstagefright/colorconversion/SoftwareRenderer.cpp
index 4e75250..a78465e 100644
--- a/media/libstagefright/colorconversion/SoftwareRenderer.cpp
+++ b/media/libstagefright/colorconversion/SoftwareRenderer.cpp
@@ -101,9 +101,10 @@
     int halFormat;
     size_t bufWidth, bufHeight;
 
-    switch (mColorFormat) {
+    switch ((int)mColorFormat) {
         case OMX_COLOR_FormatYUV420Planar:
         case OMX_TI_COLOR_FormatYUV420PackedSemiPlanar:
+        case OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar:
         case OMX_COLOR_FormatYUV420SemiPlanar:
         {
             if (!runningInEmulator()) {
@@ -238,6 +239,7 @@
             dst_v += dst_c_stride;
         }
     } else if (mColorFormat == OMX_TI_COLOR_FormatYUV420PackedSemiPlanar
+            || mColorFormat == OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar
             || mColorFormat == OMX_COLOR_FormatYUV420SemiPlanar) {
         const uint8_t *src_y =
             (const uint8_t *)data;