diff options
| author | Andreas Huber <andih@google.com> | 2010-09-17 11:49:39 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-09-17 11:49:39 -0700 |
| commit | 00998fbb52dfa78ac3a4b3706d64fc612926bfbc (patch) | |
| tree | eb71b0b9525def53ea12949f421b68deb440dbb8 /media/libstagefright/omx/OMX.cpp | |
| parent | 095916d92ea2378aea6fc35e80e368172c02021b (diff) | |
| download | frameworks_av-00998fbb52dfa78ac3a4b3706d64fc612926bfbc.zip frameworks_av-00998fbb52dfa78ac3a4b3706d64fc612926bfbc.tar.gz frameworks_av-00998fbb52dfa78ac3a4b3706d64fc612926bfbc.tar.bz2 | |
Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec's destructor.
Change-Id: I9c896cf07dea0c3201b6f074dbaf27e6d85cd784
Diffstat (limited to 'media/libstagefright/omx/OMX.cpp')
| -rw-r--r-- | media/libstagefright/omx/OMX.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/media/libstagefright/omx/OMX.cpp b/media/libstagefright/omx/OMX.cpp index 6de761f..c927da1 100644 --- a/media/libstagefright/omx/OMX.cpp +++ b/media/libstagefright/omx/OMX.cpp @@ -245,13 +245,15 @@ status_t OMX::freeNode(node_id node) { CHECK(index >= 0); mLiveNodes.removeItemsAt(index); + instance->observer()->asBinder()->unlinkToDeath(this); + + status_t err = instance->freeNode(mMaster); + index = mDispatchers.indexOfKey(node); CHECK(index >= 0); mDispatchers.removeItemsAt(index); - instance->observer()->asBinder()->unlinkToDeath(this); - - return instance->freeNode(mMaster); + return err; } status_t OMX::sendCommand( |