commit d2b1f29aa0c056a497e45634aabea360c7d231c9
author Iliyan Malchev <malchev@google.com> Mon Mar 28 17:07:02 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 28 17:07:02 2011 -0700
tree 8c6a09d3e3c38bb13e98ba439049aca128dd8c6e
parent 3a28b022bcf06da7d0019abe3d569322c7aaee82
parent 40c364136f09e82602692f359bcf8aa9b0df18d3

Merge "frameworks/base: some camera-interface cleanup"

media/libstagefright/OMXCodec.cpp

diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index a6a34b3..904bd62 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -1912,6 +1912,11 @@
 }
 
 void OMXCodec::on_message(const omx_message &msg) {
+    if (mState == ERROR) {
+        LOGW("Dropping OMX message - we're in ERROR state.");
+        return;
+    }
+
     switch (msg.type) {
         case omx_message::EVENT:
         {

media/libstagefright/omx/OMXNodeInstance.cpp

diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp
index 6cbd599..cdce772 100644
--- a/media/libstagefright/omx/OMXNodeInstance.cpp
+++ b/media/libstagefright/omx/OMXNodeInstance.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define LOG_NDEBUG 0
+//#define LOG_NDEBUG 0
 #define LOG_TAG "OMXNodeInstance"
 #include <utils/Log.h>