| commit | 539a735a82fefb1944aa6135df73dfe9f541566c | [log] [tgz] |
|---|---|---|
| author | Chih-Chung Chang <chihchung@google.com> | Wed Aug 24 18:57:35 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Aug 24 18:57:35 2011 -0700 |
| tree | 8bf1247fa8ebac7e76a38ccbb141914be63aad00 | |
| parent | 1797e5d00e0ba4048c2258f091e6fd80748aa0ad [diff] | |
| parent | 84f74fbfeec81eb59e874660fd52ad42820ea8a2 [diff] |
Merge "Port setting change should happen before receiving any filled frame."
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 525ee8b..7f09319 100755 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp
@@ -2325,6 +2325,7 @@ { CODEC_LOGV("OMX_EventPortSettingsChanged(port=%ld, data2=0x%08lx)", data1, data2); + CHECK(mFilledBuffers.empty()); if (data2 == 0 || data2 == OMX_IndexParamPortDefinition) { onPortSettingsChanged(data1);