summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andreas Huber <andih@google.com> 2010-08-31 09:09:27 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2010-08-31 09:09:27 -0700
commitc855deba16f6b7fa1238b8ca8186b0adece50d3c (patch)
tree25998fe53aeaa609f37672dd6cecd6ef174317ba
parentef6c1431fa2039a4b8c604d651bb8f4dc0806581 (diff)
parent29c03c6e7d3eb0196bfec9eac50f0bdeddeca513 (diff)
Merge "Make sure we only reallocate buffers on a genuine port definition change."
-rw-r--r--media/libstagefright/OMXCodec.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 9d45c80fcee5..f68c08a3b220 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -1811,7 +1811,9 @@ void OMXCodec::onEvent(OMX_EVENTTYPE event, OMX_U32 data1, OMX_U32 data2) {
case OMX_EventPortSettingsChanged:
{
- onPortSettingsChanged(data1);
+ if (data2 == 0 || data2 == OMX_IndexParamPortDefinition) {
+ onPortSettingsChanged(data1);
+ }
break;
}