Merge "Don't overwrite pending port setting change if there are more than one port setting change event."

This commit is contained in:
James Dong
2011-09-06 09:54:43 -07:00
committed by Android (Google) Code Review

View File

@@ -2442,8 +2442,10 @@ void OMXCodec::onCmdComplete(OMX_COMMANDTYPE cmd, OMX_U32 data) {
// Don't notify clients if the output port settings change // Don't notify clients if the output port settings change
// wasn't of importance to them, i.e. it may be that just the // wasn't of importance to them, i.e. it may be that just the
// number of buffers has changed and nothing else. // number of buffers has changed and nothing else.
mOutputPortSettingsHaveChanged = bool formatChanged = formatHasNotablyChanged(oldOutputFormat, mOutputFormat);
formatHasNotablyChanged(oldOutputFormat, mOutputFormat); if (!mOutputPortSettingsHaveChanged) {
mOutputPortSettingsHaveChanged = formatChanged;
}
enablePortAsync(portIndex); enablePortAsync(portIndex);