commit edffc0fcbe02409e8e56e06c3b1dccc7215d2947
author Jamie Gennis <jgennis@google.com> Wed Oct 20 16:04:12 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 20 16:04:12 2010 -0700
tree 35965c85b7eacc8723c2f9b0554edfc370863831
parent 642a8eac64b7370fd874c4d34654583c50c0850c
parent bf2ba2a97927c24d14c0e71158abe7b49c557c68

Merge "Fix the non-ANW video decode path."

media/libstagefright/OMXCodec.cpp

diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 560d0f1..2e368b6 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -744,7 +744,8 @@
         mQuirks &= ~kOutputBuffersAreUnreadable;
     }
 
-    if (!mIsEncoder
+    if (mNativeWindow != NULL
+        && !mIsEncoder
         && !strncasecmp(mMIME, "video/", 6)
         && !strncmp(mComponentName, "OMX.", 4)) {
         status_t err = initNativeWindow();
@@ -1606,7 +1607,7 @@
 }
 
 status_t OMXCodec::allocateBuffersOnPort(OMX_U32 portIndex) {
-    if (mNativeWindow != 0 && portIndex == kPortIndexOutput) {
+    if (mNativeWindow != NULL && portIndex == kPortIndexOutput) {
         return allocateOutputBuffersFromNativeWindow();
     }
 
@@ -1676,6 +1677,7 @@
 
         info.mBuffer = buffer;
         info.mOwnedByComponent = false;
+        info.mOwnedByNativeWindow = false;
         info.mMem = mem;
         info.mMediaBuffer = NULL;