commit 4450a07dde807ea33cb44cf2e8e943e9a50290c0
author Chong Zhang <chz@google.com> Mon May 08 19:57:28 2017 -0700
committer gitbuildkicker <android-build@google.com> Tue May 09 16:15:44 2017 -0700
tree b089d916e486f2212c5263a2d2201bb95a0f55a2
parent c2732aba8f44c280fac2071aaab330a93059ef95

stagefright: lock mLock in codecBufferFilled

The locking is to protect mOriginalTimeUs, adding to which is done
in emptyBuffer under mLock.

bug: 38111548
Change-Id: If7853e3fe50c68279ee5d74373b53bc34bd56cfd
(cherry picked from commit 331207d51a620bf018081950da4b20133014657f)

media/libstagefright/omx/OMXNodeInstance.cpp

diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp
index d0f64ca..db99ef2 100644
--- a/media/libstagefright/omx/OMXNodeInstance.cpp
+++ b/media/libstagefright/omx/OMXNodeInstance.cpp
@@ -1861,7 +1861,7 @@
 }
 
 void OMXNodeInstance::codecBufferFilled(omx_message &msg) {
-    Mutex::Autolock autoLock(mBufferIDLock);
+    Mutex::Autolock autoLock(mLock);
 
     if (mMaxTimestampGapUs <= 0ll || mRestorePtsFailed) {
         return;