| commit | 1e79b0c156b631e6528ca4b60e159ce023cf310a | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Oct 10 23:14:36 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Oct 10 23:14:36 2017 +0000 |
| tree | dc3773b00fd17786c9233402ca7fb71a6f8501d4 | |
| parent | 1fd129f45786975854404186c50245764587e733 [diff] | |
| parent | 271defe729a10db25b45759c8ccfb5abed24c647 [diff] |
Merge "OMXNodeInstance: use a lock around OMX::freeNode" into oc-dev
diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp index 00b3c7b..34ecb22 100644 --- a/media/libstagefright/omx/OMXNodeInstance.cpp +++ b/media/libstagefright/omx/OMXNodeInstance.cpp
@@ -488,6 +488,9 @@ LOG_ALWAYS_FATAL("unknown state %s(%#x).", asString(state), state); break; } + + Mutex::Autolock _l(mLock); + status_t err = mOwner->freeNode(this); mDispatcher.clear();