diff options
| author | Lajos Molnar <lajos@google.com> | 2015-02-07 00:05:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-07 00:05:59 +0000 |
| commit | a1d50ea76418a9effbb341a82f5df6f77efbfec4 (patch) | |
| tree | 561792f67513a4a454c93cf0a999b2dfa7b66e3f | |
| parent | bb7ea7fd0e8738043a13c7c25178e2acc54796cc (diff) | |
| parent | bdb1112d2c9a818d34094e58c74055131fc27f45 (diff) | |
| download | frameworks_av-a1d50ea76418a9effbb341a82f5df6f77efbfec4.zip frameworks_av-a1d50ea76418a9effbb341a82f5df6f77efbfec4.tar.gz frameworks_av-a1d50ea76418a9effbb341a82f5df6f77efbfec4.tar.bz2 | |
am bdb1112d: am 35395ea6: DO NOT MERGE: stagefright: add support for Intel\'s YUV420SP format in SoftwareRenderer
* commit 'bdb1112d2c9a818d34094e58c74055131fc27f45':
DO NOT MERGE: stagefright: add support for Intel's YUV420SP format in SoftwareRenderer
| -rw-r--r-- | media/libstagefright/colorconversion/SoftwareRenderer.cpp | 4 |
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; |