summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-06-07 15:19:40 -0700
committerAndreas Huber <andih@google.com>2010-06-07 15:34:45 -0700
commitcf7b9c7aae758ac0b99833915053c63c2ac46e09 (patch)
tree2480a2da149f7ba8fe651876a6173947ec8c6a16 /media/libmediaplayerservice
parente71d10e7ad55ccbcb0756c007caef1c959090384 (diff)
downloadframeworks_av-cf7b9c7aae758ac0b99833915053c63c2ac46e09.zip
frameworks_av-cf7b9c7aae758ac0b99833915053c63c2ac46e09.tar.gz
frameworks_av-cf7b9c7aae758ac0b99833915053c63c2ac46e09.tar.bz2
Initial checkin of preliminary rtsp support for stagefright.
Change-Id: I0722aa888098c0c1361c97a4c1b123d910afc207
Diffstat (limited to 'media/libmediaplayerservice')
-rw-r--r--media/libmediaplayerservice/MediaPlayerService.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index 11f3016..d7ca635 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -771,9 +771,14 @@ player_type getPlayerType(const char* url)
}
}
- // Use PV_PLAYER for rtsp for now
if (!strncasecmp(url, "rtsp://", 7)) {
- return PV_PLAYER;
+ char value[PROPERTY_VALUE_MAX];
+ if (!property_get("media.stagefright.enable-rtsp", value, NULL)
+ || (strcmp(value, "1") && strcasecmp(value, "true"))) {
+ // For now, we're going to use PV for rtsp-based playback
+ // by default until we can clear up a few more issues.
+ return PV_PLAYER;
+ }
}
return getDefaultPlayerType();