diff options
| author | Lajos Molnar <lajos@google.com> | 2015-02-06 06:30:50 -0800 |
|---|---|---|
| committer | Lajos Molnar <lajos@google.com> | 2015-02-06 06:30:50 -0800 |
| commit | 3f9b0cc8c71ce6064bf2ed5c3ab5b48e74937385 (patch) | |
| tree | 3fa1d28d277a2f38d975b8a3476fb46cf4d6fd6a /media/libstagefright/colorconversion | |
| parent | eac728dcf35de0f74f46c9b65bde43ab6361c176 (diff) | |
| parent | ca50950615848b02bee9ab5f2463ede6cc016bf0 (diff) | |
| download | frameworks_av-3f9b0cc8c71ce6064bf2ed5c3ab5b48e74937385.zip frameworks_av-3f9b0cc8c71ce6064bf2ed5c3ab5b48e74937385.tar.gz frameworks_av-3f9b0cc8c71ce6064bf2ed5c3ab5b48e74937385.tar.bz2 | |
resolved conflicts for merge of ca509506 to master
Change-Id: I93a81bf167407307f209cf46249a8d65d26589f3
Diffstat (limited to 'media/libstagefright/colorconversion')
| -rw-r--r-- | media/libstagefright/colorconversion/SoftwareRenderer.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/media/libstagefright/colorconversion/SoftwareRenderer.cpp b/media/libstagefright/colorconversion/SoftwareRenderer.cpp index baa016e..21da707 100644 --- a/media/libstagefright/colorconversion/SoftwareRenderer.cpp +++ b/media/libstagefright/colorconversion/SoftwareRenderer.cpp @@ -107,6 +107,7 @@ void SoftwareRenderer::resetFormatIfChanged(const sp<AMessage> &format) { if (!runningInEmulator()) { switch (mColorFormat) { case OMX_COLOR_FormatYUV420Planar: + case OMX_COLOR_FormatYUV420SemiPlanar: case OMX_TI_COLOR_FormatYUV420PackedSemiPlanar: { halFormat = HAL_PIXEL_FORMAT_YV12; @@ -227,7 +228,6 @@ void SoftwareRenderer::render( buf->stride, buf->height, 0, 0, mCropWidth - 1, mCropHeight - 1); } else if (mColorFormat == OMX_COLOR_FormatYUV420Planar) { - // YV12 really const uint8_t *src_y = (const uint8_t *)data; const uint8_t *src_u = (const uint8_t *)data + mWidth * mHeight; @@ -256,7 +256,8 @@ void SoftwareRenderer::render( dst_u += dst_c_stride; dst_v += dst_c_stride; } - } else if (mColorFormat == OMX_TI_COLOR_FormatYUV420PackedSemiPlanar) { + } else if (mColorFormat == OMX_TI_COLOR_FormatYUV420PackedSemiPlanar + || mColorFormat == OMX_COLOR_FormatYUV420SemiPlanar) { const uint8_t *src_y = (const uint8_t *)data; const uint8_t *src_uv = (const uint8_t *)data + mWidth * (mHeight - mCropTop / 2); |