diff options
| author | Andreas Huber <andih@google.com> | 2013-04-11 11:37:28 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2013-04-11 11:37:28 -0700 |
| commit | 76ab6df08a2069eac6317715dadccbb6041e7fab (patch) | |
| tree | 5f7f1840df38916907316b4526f13f1b5dc87244 /media/libstagefright/OMXCodec.cpp | |
| parent | da0dc0af0effe9fbfb3ce3187c8472fca2baf3c6 (diff) | |
| download | frameworks_av-76ab6df08a2069eac6317715dadccbb6041e7fab.zip frameworks_av-76ab6df08a2069eac6317715dadccbb6041e7fab.tar.gz frameworks_av-76ab6df08a2069eac6317715dadccbb6041e7fab.tar.bz2 | |
The framework really doesn't need to know the specifics of the codec
color format, so stop trying to enforce a whitelist.
Change-Id: I0ceb3bdd5bcc6c1bbd56740b0cd662a2b5820dfe
related-to-bug: 8596546
Diffstat (limited to 'media/libstagefright/OMXCodec.cpp')
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 22aefcc..6c0779d 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -1213,13 +1213,6 @@ status_t OMXCodec::setVideoOutputFormat( CHECK_EQ(err, (status_t)OK); CHECK_EQ((int)format.eCompressionFormat, (int)OMX_VIDEO_CodingUnused); - CHECK(format.eColorFormat == OMX_COLOR_FormatYUV420Planar - || format.eColorFormat == OMX_COLOR_FormatYUV420SemiPlanar - || format.eColorFormat == OMX_COLOR_FormatCbYCrY - || format.eColorFormat == OMX_TI_COLOR_FormatYUV420PackedSemiPlanar - || format.eColorFormat == OMX_QCOM_COLOR_FormatYVU420SemiPlanar - || format.eColorFormat == OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar64x32Tile2m8ka); - int32_t colorFormat; if (meta->findInt32(kKeyColorFormat, &colorFormat) && colorFormat != OMX_COLOR_FormatUnused |