summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2015-02-05 18:17:39 -0800
committerLajos Molnar <lajos@google.com>2015-02-06 19:27:50 +0000
commit35395ea6ad11824a4a89cc1ab9ee84f936188296 (patch)
treefb5f26a9ef1df22b0d2fb5dfa389353ba2ea928c /media
parent99cef1ef1cf1232966fabf3793ce7964c01474d7 (diff)
downloadframeworks_av-35395ea6ad11824a4a89cc1ab9ee84f936188296.zip
frameworks_av-35395ea6ad11824a4a89cc1ab9ee84f936188296.tar.gz
frameworks_av-35395ea6ad11824a4a89cc1ab9ee84f936188296.tar.bz2
DO NOT MERGE: stagefright: add support for Intel's YUV420SP format in SoftwareRenderer
This seems to have the same layout as OMX_COLOR_FormatYUV420SemiPlanar Bug: 19246722 Change-Id: Ief41bfaf997426a6900c3632dadaf8f4a6a38baf
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/colorconversion/SoftwareRenderer.cpp4
1 files changed, 3 insertions, 1 deletions
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 @@ void SoftwareRenderer::resetFormatIfChanged(const sp<AMessage> &format) {
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 @@ void SoftwareRenderer::render(
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;