diff options
author | James Dong <jdong@google.com> | 2011-09-06 09:54:43 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-06 09:54:43 -0700 |
commit | adc857e80a1045897ebad85e691dc04451d364e3 (patch) | |
tree | a0fe509045d916e8c7dd853f63d3e8a72ade9f79 /media | |
parent | 71b63e3ef687c379368be6b02e70bd2feb0b6b8d (diff) | |
parent | 97857479de48fda4c33bb415b2fbb15193f768e8 (diff) | |
download | frameworks_av-adc857e80a1045897ebad85e691dc04451d364e3.zip frameworks_av-adc857e80a1045897ebad85e691dc04451d364e3.tar.gz frameworks_av-adc857e80a1045897ebad85e691dc04451d364e3.tar.bz2 |
Merge "Don't overwrite pending port setting change if there are more than one port setting change event."
Diffstat (limited to 'media')
-rwxr-xr-x | media/libstagefright/OMXCodec.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index d5b013d..fb49d7b 100755 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -2442,8 +2442,10 @@ void OMXCodec::onCmdComplete(OMX_COMMANDTYPE cmd, OMX_U32 data) { // Don't notify clients if the output port settings change // wasn't of importance to them, i.e. it may be that just the // number of buffers has changed and nothing else. - mOutputPortSettingsHaveChanged = - formatHasNotablyChanged(oldOutputFormat, mOutputFormat); + bool formatChanged = formatHasNotablyChanged(oldOutputFormat, mOutputFormat); + if (!mOutputPortSettingsHaveChanged) { + mOutputPortSettingsHaveChanged = formatChanged; + } enablePortAsync(portIndex); |