diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2014-08-19 18:34:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-18 21:31:41 +0000 |
| commit | 1e2d7cd671ece1b9eaec7b4c56633884c9a899bd (patch) | |
| tree | 0f99d262a9f25dc06ef313e6d344432e46a7e6ec /media | |
| parent | 5a5a23255ad83ef378f924ead4e90e756773e278 (diff) | |
| parent | a518dd9ac06d519bf226e6b1e952f85d6078eecc (diff) | |
| download | frameworks_av-1e2d7cd671ece1b9eaec7b4c56633884c9a899bd.zip frameworks_av-1e2d7cd671ece1b9eaec7b4c56633884c9a899bd.tar.gz frameworks_av-1e2d7cd671ece1b9eaec7b4c56633884c9a899bd.tar.bz2 | |
Merge "stagefright: Fix thumbnail generation for some clips." into lmp-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 3d1d40e..78758da 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -2500,12 +2500,6 @@ void OMXCodec::onEvent(OMX_EVENTTYPE event, OMX_U32 data1, OMX_U32 data2) { data1, data2); if (data2 == 0 || data2 == OMX_IndexParamPortDefinition) { - // There is no need to check whether mFilledBuffers is empty or not - // when the OMX_EventPortSettingsChanged is not meant for reallocating - // the output buffers. - if (data1 == kPortIndexOutput) { - CHECK(mFilledBuffers.empty()); - } onPortSettingsChanged(data1); } else if (data1 == kPortIndexOutput && (data2 == OMX_IndexConfigCommonOutputCrop || @@ -2899,7 +2893,7 @@ status_t OMXCodec::freeBuffer(OMX_U32 portIndex, size_t bufIndex) { void OMXCodec::onPortSettingsChanged(OMX_U32 portIndex) { CODEC_LOGV("PORT_SETTINGS_CHANGED(%ld)", portIndex); - CHECK_EQ((int)mState, (int)EXECUTING); + CHECK(mState == EXECUTING || mState == EXECUTING_TO_IDLE); CHECK_EQ(portIndex, (OMX_U32)kPortIndexOutput); CHECK(!mOutputPortSettingsChangedPending); |