Disable HTTP playback and metadata support in stagefright, use PV instead.
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index 540d4ba..8e71700 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -720,6 +720,12 @@
}
}
+ if (!strncasecmp(url, "http://", 7)) {
+ // For now, we're going to use PV for http-based playback,
+ // until we can clear up a few more issues.
+ return PV_PLAYER;
+ }
+
return getDefaultPlayerType();
}
diff --git a/media/libmediaplayerservice/MetadataRetrieverClient.cpp b/media/libmediaplayerservice/MetadataRetrieverClient.cpp
index 0fcfb8e..3572b52 100644
--- a/media/libmediaplayerservice/MetadataRetrieverClient.cpp
+++ b/media/libmediaplayerservice/MetadataRetrieverClient.cpp
@@ -105,6 +105,17 @@
{
sp<MediaMetadataRetrieverBase> p;
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.
+
+ // LOGV("create StagefrightMetadataRetriever");
+ // p = new StagefrightMetadataRetriever;
+ // break;
+
+ // fall through to PV_PLAYER
+#endif
#ifndef NO_OPENCORE
case PV_PLAYER:
LOGV("create pv metadata retriever");
@@ -119,12 +130,6 @@
LOGV("create midi metadata retriever");
p = new MidiMetadataRetriever();
break;
-#if BUILD_WITH_FULL_STAGEFRIGHT
- case STAGEFRIGHT_PLAYER:
- LOGV("create StagefrightMetadataRetriever");
- p = new StagefrightMetadataRetriever;
- break;
-#endif
default:
// TODO:
// support for TEST_PLAYER