Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6615defd: Make sure the OMX callback thread is properly shutdown after the node goes away.

Browse Source 
Merge commit '6615defd4b8ae627e7f0bbb2382c4d86481f76bd' into gingerbread-plus-aosp

* commit '6615defd4b8ae627e7f0bbb2382c4d86481f76bd':
  Make sure the OMX callback thread is properly shutdown after the node goes away.
This commit is contained in:
Andreas Huber
2010-07-07 09:40:58 -07:00
committed by Android Git Automerger
parent 877045aa85 6615defd4b
commit ff119e746a
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
media/libstagefright/omx/OMX.cpp
View File

@@ -164,6 +164,10 @@ void OMX::binderDied(const wp<IBinder> &the_late_who) {
instance = mLiveNodes.editValueAt(index); instance = mLiveNodes.editValueAt(index);
mLiveNodes.removeItemsAt(index); mLiveNodes.removeItemsAt(index);
index = mDispatchers.indexOfKey(instance->nodeID());
CHECK(index >= 0);
mDispatchers.removeItemsAt(index);
invalidateNodeID_l(instance->nodeID()); invalidateNodeID_l(instance->nodeID());
} }
@@ -240,6 +244,11 @@ status_t OMX::freeNode(node_id node) {
ssize_t index = mLiveNodes.indexOfKey(instance->observer()->asBinder()); ssize_t index = mLiveNodes.indexOfKey(instance->observer()->asBinder());
CHECK(index >= 0); CHECK(index >= 0);
mLiveNodes.removeItemsAt(index); mLiveNodes.removeItemsAt(index);
index = mDispatchers.indexOfKey(node);
CHECK(index >= 0);
mDispatchers.removeItemsAt(index);
instance->observer()->asBinder()->unlinkToDeath(this); instance->observer()->asBinder()->unlinkToDeath(this);
return instance->freeNode(mMaster); return instance->freeNode(mMaster);