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 | 3c09d025b60dedc605e893d630177bd54552f061 (patch) | |
tree | 3ad49abd8f3e6793aaf068700ef56f2bba7752fd /media/libstagefright/OMXCodec.cpp | |
parent | ecba7488c5cceaacef95836b1b476433451e7761 (diff) | |
download | frameworks_av-3c09d025b60dedc605e893d630177bd54552f061.zip frameworks_av-3c09d025b60dedc605e893d630177bd54552f061.tar.gz frameworks_av-3c09d025b60dedc605e893d630177bd54552f061.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 |