summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/include/WVMExtractor.h
diff options
context:
space:
mode:
authorJeff Tinker <jtinker@google.com>2011-06-27 10:48:26 -0700
committerJeff Tinker <jtinker@google.com>2011-06-27 12:42:39 -0700
commit50255a92dfb2ffd35955035ae9ac9d4b85f606b8 (patch)
tree86093d1e49f305a52d867262079493f4112c1b58 /media/libstagefright/include/WVMExtractor.h
parentb1af69b8f91cf71bef79f56faf981f9a77e507b6 (diff)
downloadframeworks_av-50255a92dfb2ffd35955035ae9ac9d4b85f606b8.zip
frameworks_av-50255a92dfb2ffd35955035ae9ac9d4b85f606b8.tar.gz
frameworks_av-50255a92dfb2ffd35955035ae9ac9d4b85f606b8.tar.bz2
Fix for b/4165024: Serious Memory leak when playing a WV protected streaming video.
This change allows the WVM extractor to close and reopen when not in use which resolves the issue with heap fragmentation between plays. Change-Id: I160ee1e98aada2bfdd0818eeb6300ad50644fb75
Diffstat (limited to 'media/libstagefright/include/WVMExtractor.h')
-rw-r--r--media/libstagefright/include/WVMExtractor.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/media/libstagefright/include/WVMExtractor.h b/media/libstagefright/include/WVMExtractor.h
index deecd25..0817bab 100644
--- a/media/libstagefright/include/WVMExtractor.h
+++ b/media/libstagefright/include/WVMExtractor.h
@@ -18,6 +18,7 @@
#define WVM_EXTRACTOR_H_
+#include <media/stagefright/DataSource.h>
#include <media/stagefright/MediaExtractor.h>
#include <utils/Errors.h>
@@ -67,6 +68,10 @@ private:
WVMExtractor(const WVMExtractor &);
WVMExtractor &operator=(const WVMExtractor &);
+
+ static Mutex sMutex;
+ static uint32_t sActiveExtractors;
+ static void *sVendorLibHandle;
};
} // namespace android