From bd9d03010d3c01fb2684372c256253f5ceb7a99b Mon Sep 17 00:00:00 2001 From: James Dong Date: Thu, 1 Sep 2011 19:31:01 -0700 Subject: [PATCH] Don't overwrite pending port setting change if there are more than one port setting change event. Change-Id: I3413f5235b191031252aa3785f5aaef00caef1ce related-to-bug: 5122512 --- media/libstagefright/OMXCodec.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index d5b013d381c69..fb49d7b97e060 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);