commit e2c8023444bf96739ff0e4cbaebc086bb73d3bf0
author Lajos Molnar <lajos@google.com> Tue Feb 10 16:06:38 2015 -0800
committer The Android Automerger <android-build@google.com> Wed Feb 11 14:34:02 2015 -0800
tree d2f2b10f80b1ae99ca70ffc33d46e6f89f78c16e
parent f74acc7bb472b2bfa5f1aac368d598a760c29a77

Revert "DO NOT MERGE: stagefright: add support for Intel's YUV420SP format in SoftwareRenderer"

This reverts commit 7a9510dcf637cc1e5c953d77c7bd4409c80a820f.

Bug: 19317169
Change-Id: I881ce6b1592b7250f423a561dadd40d379e16104

media/libstagefright/colorconversion/SoftwareRenderer.cpp

diff --git a/media/libstagefright/colorconversion/SoftwareRenderer.cpp b/media/libstagefright/colorconversion/SoftwareRenderer.cpp
index a78465e..4e75250 100644
--- a/media/libstagefright/colorconversion/SoftwareRenderer.cpp
+++ b/media/libstagefright/colorconversion/SoftwareRenderer.cpp
@@ -101,10 +101,9 @@
     int halFormat;
     size_t bufWidth, bufHeight;
 
-    switch ((int)mColorFormat) {
+    switch (mColorFormat) {
         case OMX_COLOR_FormatYUV420Planar:
         case OMX_TI_COLOR_FormatYUV420PackedSemiPlanar:
-        case OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar:
         case OMX_COLOR_FormatYUV420SemiPlanar:
         {
             if (!runningInEmulator()) {
@@ -239,7 +238,6 @@
             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;