commit 6e89801b62e3df72b91c34ccb96cd75e71e6b054
author Chong Zhang <chz@google.com> Tue May 14 04:03:47 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue May 14 04:03:47 2019 -0700
tree 86ee3166722da4fddb0202718f293a57da69a78e
parent 01adc5719fb4885e20c97b345235616f703b2b8c
parent 243787c8856d17a0e23fe0f2508f460d3f8c705f

Merge "Fix color conversion from OMX_COLOR_FormatYUV420SemiPlanar" into qt-dev
am: 243787c885

Change-Id: I2360dffdd69a8279ae6040f3e30ab98193b33dd7

media/libstagefright/colorconversion/ColorConverter.cpp

diff --git a/media/libstagefright/colorconversion/ColorConverter.cpp b/media/libstagefright/colorconversion/ColorConverter.cpp
index d136d9e..d685321 100644
--- a/media/libstagefright/colorconversion/ColorConverter.cpp
+++ b/media/libstagefright/colorconversion/ColorConverter.cpp
@@ -395,11 +395,16 @@
                 dst.mStride, src.cropWidth(), src.cropHeight());
         break;
 
-    case OMX_COLOR_Format32BitRGBA8888:
+    case OMX_COLOR_Format32bitBGRA8888:
         libyuv::NV12ToARGB(src_y, src.mStride, src_u, src.mStride, (uint8 *)dst_ptr,
                 dst.mStride, src.cropWidth(), src.cropHeight());
         break;
 
+    case OMX_COLOR_Format32BitRGBA8888:
+        libyuv::NV12ToABGR(src_y, src.mStride, src_u, src.mStride, (uint8 *)dst_ptr,
+                dst.mStride, src.cropWidth(), src.cropHeight());
+        break;
+
     default:
         return ERROR_UNSUPPORTED;
    }