Merge "Port setting change should happen before receiving any filled frame."

2011-08-24 18:57:35 -07:00
parent 2382c3a92f e649668331
commit 7096c4a0e2
1 changed files with 1 additions and 0 deletions
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -2325,6 +2325,7 @@ void OMXCodec::onEvent(OMX_EVENTTYPE event, OMX_U32 data1, OMX_U32 data2) {
        {
            CODEC_LOGV("OMX_EventPortSettingsChanged(port=%ld, data2=0x%08lx)",
                       data1, data2);
+            CHECK(mFilledBuffers.empty());

            if (data2 == 0 || data2 == OMX_IndexParamPortDefinition) {
                onPortSettingsChanged(data1);