diff options
| author | Ed Heyl <ed@google.com> | 2012-07-29 16:47:58 -0700 |
|---|---|---|
| committer | Ed Heyl <ed@google.com> | 2012-07-29 16:47:58 -0700 |
| commit | 9fbe94294ce2053d102ff5de89846a0c5015fb58 (patch) | |
| tree | 7ba08233afeb658bdd59e1e0b12e96638ee796a4 /media/libstagefright/OMXCodec.cpp | |
| parent | 3beb3ff4af08ea02da87e6548e0544d2ba47daf1 (diff) | |
| parent | 5d246efa220a7c7b22e490576c488b3853c664dd (diff) | |
| download | frameworks_av-9fbe94294ce2053d102ff5de89846a0c5015fb58.zip frameworks_av-9fbe94294ce2053d102ff5de89846a0c5015fb58.tar.gz frameworks_av-9fbe94294ce2053d102ff5de89846a0c5015fb58.tar.bz2 | |
Merge remote-tracking branch 'goog/jb-dev-mako' into jb-mr1-dev
Conflicts:
services/audioflinger/AudioFlinger.cpp
Change-Id: If27e4ff35de1e182394cc149e1557a49f0f7c95b
Diffstat (limited to 'media/libstagefright/OMXCodec.cpp')
| -rwxr-xr-x | media/libstagefright/OMXCodec.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 8fbcb8a..2f5e9a4 100755 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -1217,7 +1217,8 @@ status_t OMXCodec::setVideoOutputFormat( || 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_FormatYVU420SemiPlanar + || format.eColorFormat == OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar64x32Tile2m8ka); err = mOMX->setParameter( mNode, OMX_IndexParamVideoPortFormat, @@ -2047,8 +2048,14 @@ int64_t OMXCodec::getDecodingTimeUs() { void OMXCodec::on_message(const omx_message &msg) { if (mState == ERROR) { - ALOGW("Dropping OMX message - we're in ERROR state."); - return; + /* + * only drop EVENT messages, EBD and FBD are still + * processed for bookkeeping purposes + */ + if (msg.type == omx_message::EVENT) { + ALOGW("Dropping OMX EVENT message - we're in ERROR state."); + return; + } } switch (msg.type) { |