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
This commit is contained in:
@@ -1443,6 +1443,8 @@ void OMXCodec::setComponentRole() {
|
||||
}
|
||||
|
||||
OMXCodec::~OMXCodec() {
|
||||
mSource.clear();
|
||||
|
||||
CHECK(mState == LOADED || mState == ERROR);
|
||||
|
||||
status_t err = mOMX->freeNode(mNode);
|
||||
|
||||
@@ -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(
|
||||
|
||||
Reference in New Issue
Block a user