| commit | 335e0f89aab2a22f0e4259add976c22ac1a087f6 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Sep 08 19:28:00 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Sep 08 19:28:00 2017 +0000 |
| tree | 1e2bfd7e5de3662423977464e8ebb181bd2ca5e0 | |
| parent | 5e6df68c89456ae7a948b6424f5ff1e7cb061c8e [diff] | |
| parent | bdc0f0f0ab2e2c8d1ef43637eafba0b58549f089 [diff] |
Merge "OMXNodeInstance: use a lock around OMX::freeNode" into oc-mr1-dev
diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp index c749454..cc96172 100644 --- a/media/libstagefright/omx/OMXNodeInstance.cpp +++ b/media/libstagefright/omx/OMXNodeInstance.cpp
@@ -495,6 +495,9 @@ LOG_ALWAYS_FATAL("unknown state %s(%#x).", asString(state), state); break; } + + Mutex::Autolock _l(mLock); + status_t err = mOwner->freeNode(this); mDispatcher.clear();