summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/ACodec.cpp
diff options
context:
space:
mode:
authorRachad <rachad@google.com>2015-01-29 19:50:46 -0800
committerLajos Molnar <lajos@google.com>2015-01-31 03:11:27 +0000
commit3fb3917ae19f07ddfb2176a9da3c7cfa514522a5 (patch)
treebfe6558e601cf96a25cf2fc1238063d090d95705 /media/libstagefright/ACodec.cpp
parent78b01639c08fe5e7e9c1be5e9dc5de560f1383f9 (diff)
downloadframeworks_av-3fb3917ae19f07ddfb2176a9da3c7cfa514522a5.zip
frameworks_av-3fb3917ae19f07ddfb2176a9da3c7cfa514522a5.tar.gz
frameworks_av-3fb3917ae19f07ddfb2176a9da3c7cfa514522a5.tar.bz2
Acodec: reset sideband handle for all non tunneled mode video playback
Bug: 19202023 Change-Id: I414847d72a3c9fd79f858c4ee457270ec65470b6
Diffstat (limited to 'media/libstagefright/ACodec.cpp')
-rw-r--r--media/libstagefright/ACodec.cpp9
1 files changed, 9 insertions, 0 deletions
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 @@ status_t ACodec::configureCodec(
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);