diff options
| author | Rachad <rachad@google.com> | 2015-02-02 15:30:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-02 15:30:03 +0000 |
| commit | 3097dafa3ee60440c10b5bf9ed4d355fee1c1ae5 (patch) | |
| tree | 67d7ea827191434bb97dd999deebb0f3abc30863 /media | |
| parent | a601b86287ab5437a7e9aaf6f09bc171803cdc3d (diff) | |
| parent | 0d8e85f929f0257a3af5ec743365b0140b5e75b4 (diff) | |
| download | frameworks_av-3097dafa3ee60440c10b5bf9ed4d355fee1c1ae5.zip frameworks_av-3097dafa3ee60440c10b5bf9ed4d355fee1c1ae5.tar.gz frameworks_av-3097dafa3ee60440c10b5bf9ed4d355fee1c1ae5.tar.bz2 | |
am 0d8e85f9: am 77f877f8: Merge "Acodec: reset sideband handle for all non tunneled mode video playback" into lmp-mr1-dev
* commit '0d8e85f929f0257a3af5ec743365b0140b5e75b4':
Acodec: reset sideband handle for all non tunneled mode video playback
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index 9fc6b23..8642ad5 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -1333,6 +1333,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); |