commit cb85a295a44eb5e3f639e2a29499b51ebf2cd012
author Jeff Tinker <jtinker@google.com> Mon Jan 09 16:03:59 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 09 16:04:00 2017 +0000
tree 6112d91c19cb564d5c1eee95c795ebe09543d094
parent c8ab1a8da50fbfbcf8143fcfea7d2412c1225a83
parent 08dbccd22da60bff73fe16706680ba2550731d21

Merge "DO NOT MERGE Move legacy widevine classic global lock from framework to vendor/widevine implementation." into nyc-mr2-dev

media/libstagefright/WVMExtractor.cpp

diff --git a/media/libstagefright/WVMExtractor.cpp b/media/libstagefright/WVMExtractor.cpp
index d1b2f54..1c170b8 100644
--- a/media/libstagefright/WVMExtractor.cpp
+++ b/media/libstagefright/WVMExtractor.cpp
@@ -42,13 +42,9 @@
 
 namespace android {
 
-static Mutex gWVMutex;
-
 WVMExtractor::WVMExtractor(const sp<DataSource> &source)
     : mDataSource(source)
 {
-    Mutex::Autolock autoLock(gWVMutex);
-
     if (!getVendorLibHandle()) {
         return;
     }
@@ -169,8 +165,6 @@
     const sp<DataSource> &source, String8 *mimeType, float *confidence,
         sp<AMessage> *) {
 
-    Mutex::Autolock autoLock(gWVMutex);
-
     if (!WVMExtractor::getVendorLibHandle()) {
         return false;
     }