commit e7616724e7054a013bc013dc62008b9d98dc2b5f
author Marco Nelissen <marcone@google.com> Sat Jun 13 00:41:28 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Jun 13 00:41:28 2015 +0000
tree 71f9e73330c9cbd09623c0c2ca0646087637e1de
parent 521864e7cb52bf784636f8ee1b3808d71484f6e4
parent 2b63384b6d338f2c3320818a698c3f9d6221fe5d

am 2b63384b: Merge "Serialize calls to getFrameAtTime in the mediaserver" into mnc-dev

* commit '2b63384b6d338f2c3320818a698c3f9d6221fe5d':
  Serialize calls to getFrameAtTime in the mediaserver

media/libmediaplayerservice/MetadataRetrieverClient.cpp

diff --git a/media/libmediaplayerservice/MetadataRetrieverClient.cpp b/media/libmediaplayerservice/MetadataRetrieverClient.cpp
index bec6203..b45fd4f 100644
--- a/media/libmediaplayerservice/MetadataRetrieverClient.cpp
+++ b/media/libmediaplayerservice/MetadataRetrieverClient.cpp
@@ -188,10 +188,13 @@
     return ret;
 }
 
+Mutex MetadataRetrieverClient::sLock;
+
 sp<IMemory> MetadataRetrieverClient::getFrameAtTime(int64_t timeUs, int option)
 {
     ALOGV("getFrameAtTime: time(%lld us) option(%d)", timeUs, option);
     Mutex::Autolock lock(mLock);
+    Mutex::Autolock glock(sLock);
     mThumbnail.clear();
     if (mRetriever == NULL) {
         ALOGE("retriever is not initialized");

media/libmediaplayerservice/MetadataRetrieverClient.h

diff --git a/media/libmediaplayerservice/MetadataRetrieverClient.h b/media/libmediaplayerservice/MetadataRetrieverClient.h
index e71a29e..fe7547c 100644
--- a/media/libmediaplayerservice/MetadataRetrieverClient.h
+++ b/media/libmediaplayerservice/MetadataRetrieverClient.h
@@ -63,6 +63,7 @@
     virtual ~MetadataRetrieverClient();
 
     mutable Mutex                          mLock;
+    static  Mutex                          sLock;
     sp<MediaMetadataRetrieverBase>         mRetriever;
     pid_t                                  mPid;