diff options
| author | Andreas Huber <andih@google.com> | 2010-01-04 15:08:32 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-01-04 15:08:32 -0800 |
| commit | b8f92e8fc059693f0b857a185a183f618c4defb0 (patch) | |
| tree | bdf4841d826d0d6eb5b8716bb74b271d0067e179 | |
| parent | 82c162310a506f74741fb32cddee937a4beec1fa (diff) | |
| parent | 065c05e72091567632f927d9e5411e277480c1bf (diff) | |
| download | frameworks_av-b8f92e8fc059693f0b857a185a183f618c4defb0.zip frameworks_av-b8f92e8fc059693f0b857a185a183f618c4defb0.tar.gz frameworks_av-b8f92e8fc059693f0b857a185a183f618c4defb0.tar.bz2 | |
Merge "Make metadata support through stagefright property dependent until it's ready."
| -rw-r--r-- | media/libmediaplayerservice/MetadataRetrieverClient.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/media/libmediaplayerservice/MetadataRetrieverClient.cpp b/media/libmediaplayerservice/MetadataRetrieverClient.cpp index 3572b52..66de2ee 100644 --- a/media/libmediaplayerservice/MetadataRetrieverClient.cpp +++ b/media/libmediaplayerservice/MetadataRetrieverClient.cpp @@ -27,6 +27,7 @@ #include <string.h> #include <cutils/atomic.h> +#include <cutils/properties.h> #include <binder/MemoryDealer.h> #include <android_runtime/ActivityManager.h> #include <binder/IPCThreadState.h> @@ -107,14 +108,17 @@ static sp<MediaMetadataRetrieverBase> createRetriever(player_type playerType) switch (playerType) { #if BUILD_WITH_FULL_STAGEFRIGHT case STAGEFRIGHT_PLAYER: - // For now we are going to keep using PV for meta-data support - // until stagefright is up to par. + { + char value[PROPERTY_VALUE_MAX]; + if (property_get("media.stagefright.enable-meta", value, NULL) + && (!strcmp(value, "1") || !strcasecmp(value, "true"))) { + LOGV("create StagefrightMetadataRetriever"); + p = new StagefrightMetadataRetriever; + break; + } - // LOGV("create StagefrightMetadataRetriever"); - // p = new StagefrightMetadataRetriever; - // break; - - // fall through to PV_PLAYER + // fall through + } #endif #ifndef NO_OPENCORE case PV_PLAYER: |