diff options
| author | Lajos Molnar <lajos@google.com> | 2015-02-11 20:04:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-11 20:04:53 +0000 |
| commit | 56fbb4d7bcb34af71a08cd126891afafdec217f1 (patch) | |
| tree | 76c5e7abdc6e251153da5128a2a277bd3f79b260 /media | |
| parent | 99c678fb5c159f67cd545d928267dcfdff12cdb4 (diff) | |
| parent | 5f13602782e10b331b962bd94f7d8eb3d73c772e (diff) | |
| download | frameworks_av-56fbb4d7bcb34af71a08cd126891afafdec217f1.zip frameworks_av-56fbb4d7bcb34af71a08cd126891afafdec217f1.tar.gz frameworks_av-56fbb4d7bcb34af71a08cd126891afafdec217f1.tar.bz2 | |
am 5f136027: am faefd08b: Revert "DO NOT MERGE: stagefright: add support for Intel\'s YUV420SP format in SoftwareRenderer"
* commit '5f13602782e10b331b962bd94f7d8eb3d73c772e':
Revert "DO NOT MERGE: stagefright: add support for Intel's YUV420SP format in SoftwareRenderer"
Diffstat (limited to 'media')
| -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; |