extractor: load extractors on boot, not on request.
Test: build + dumpsys media.extractor
Bug: 131106476
Change-Id: Idbea788340c4849f1286727c159a8eb43d6a7bb0
diff --git a/media/libstagefright/MediaExtractorFactory.cpp b/media/libstagefright/MediaExtractorFactory.cpp
index d97591f..4c8be1f 100644
--- a/media/libstagefright/MediaExtractorFactory.cpp
+++ b/media/libstagefright/MediaExtractorFactory.cpp
@@ -71,8 +71,6 @@
ALOGV("MediaExtractorFactory::CreateFromService %s", mime);
- UpdateExtractors();
-
// initialize source decryption if needed
source->DrmInitialization(nullptr /* mime */);
@@ -270,7 +268,7 @@
static std::unordered_set<std::string> gSupportedExtensions;
// static
-void MediaExtractorFactory::UpdateExtractors() {
+void MediaExtractorFactory::LoadExtractors() {
Mutex::Autolock autoLock(gPluginMutex);
if (gPluginsRegistered) {
diff --git a/media/libstagefright/include/media/stagefright/MediaExtractorFactory.h b/media/libstagefright/include/media/stagefright/MediaExtractorFactory.h
index ea87948..2ab98e1 100644
--- a/media/libstagefright/include/media/stagefright/MediaExtractorFactory.h
+++ b/media/libstagefright/include/media/stagefright/MediaExtractorFactory.h
@@ -37,6 +37,7 @@
const sp<DataSource> &source, const char *mime = NULL);
static status_t dump(int fd, const Vector<String16>& args);
static std::unordered_set<std::string> getSupportedTypes();
+ static void LoadExtractors();
private:
static Mutex gPluginMutex;
@@ -53,8 +54,6 @@
static void *sniff(const sp<DataSource> &source,
float *confidence, void **meta, FreeMetaFunc *freeMeta,
sp<ExtractorPlugin> &plugin, uint32_t *creatorVersion);
-
- static void UpdateExtractors();
};
} // namespace android
diff --git a/services/mediaextractor/MediaExtractorService.cpp b/services/mediaextractor/MediaExtractorService.cpp
index de5c3e4..36e084b 100644
--- a/services/mediaextractor/MediaExtractorService.cpp
+++ b/services/mediaextractor/MediaExtractorService.cpp
@@ -30,7 +30,9 @@
namespace android {
MediaExtractorService::MediaExtractorService()
- : BnMediaExtractorService() { }
+ : BnMediaExtractorService() {
+ MediaExtractorFactory::LoadExtractors();
+}
sp<IMediaExtractor> MediaExtractorService::makeExtractor(
const sp<IDataSource> &remoteSource, const char *mime) {