commit 77f877f82733263bca825b92a3f4537caafabf74
author Rachad <rachad@google.com> Sat Jan 31 21:05:48 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jan 31 21:05:49 2015 +0000
tree e9630f9589c5053c778956212786cf02eadbfc93
parent 36dca156e0b5bf1865d1f6a1c692c71e10583481
parent 3fb3917ae19f07ddfb2176a9da3c7cfa514522a5

Merge "Acodec: reset sideband handle for all non tunneled mode video playback" into lmp-mr1-dev

media/libstagefright/ACodec.cpp

diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 9b9153b..7994716 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -1334,6 +1334,15 @@
             ALOGV("Configuring CPU controlled video playback.");
             mTunneled = false;
 
+            // Explicity reset the sideband handle of the window for
+            // non-tunneled video in case the window was previously used
+            // for a tunneled video playback.
+            err = native_window_set_sideband_stream(nativeWindow.get(), NULL);
+            if (err != OK) {
+                ALOGE("set_sideband_stream(NULL) failed! (err %d).", err);
+                return err;
+            }
+
             // Always try to enable dynamic output buffers on native surface
             err = mOMX->storeMetaDataInBuffers(
                     mNode, kPortIndexOutput, OMX_TRUE);