diff options
| author | Lajos Molnar <lajos@google.com> | 2015-02-10 16:06:38 -0800 |
|---|---|---|
| committer | Lajos Molnar <lajos@google.com> | 2015-02-11 10:01:53 -0800 |
| commit | faefd08b11d1f4955b5da6c10e1a9be1a5cbefad (patch) | |
| tree | d2f2b10f80b1ae99ca70ffc33d46e6f89f78c16e /media/libstagefright | |
| parent | 0c11f31b610534754f48b40d0a6ccdd311d43fcf (diff) | |
| download | frameworks_av-faefd08b11d1f4955b5da6c10e1a9be1a5cbefad.zip frameworks_av-faefd08b11d1f4955b5da6c10e1a9be1a5cbefad.tar.gz frameworks_av-faefd08b11d1f4955b5da6c10e1a9be1a5cbefad.tar.bz2 | |
Revert "DO NOT MERGE: stagefright: add support for Intel's YUV420SP format in SoftwareRenderer"
This reverts commit 7a9510dcf637cc1e5c953d77c7bd4409c80a820f.
Bug: 19317169
Change-Id: I881ce6b1592b7250f423a561dadd40d379e16104
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/colorconversion/SoftwareRenderer.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
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 @@ void SoftwareRenderer::resetFormatIfChanged(const sp<AMessage> &format) { 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 @@ 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; |