diff options
| author | Andreas Huber <andih@google.com> | 2010-06-07 15:19:40 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-06-07 15:34:45 -0700 |
| commit | 7a747b8e0dadf909ea4ac0b67fd88fc14b4eb3f8 (patch) | |
| tree | fc5d4df0f1e22027e927fe3c0a609ab46c97ba6e /media/libmediaplayerservice/MediaPlayerService.cpp | |
| parent | 2cbff0edb67e47fb75f4142dce7ba104c6336fc7 (diff) | |
| download | frameworks_base-7a747b8e0dadf909ea4ac0b67fd88fc14b4eb3f8.zip frameworks_base-7a747b8e0dadf909ea4ac0b67fd88fc14b4eb3f8.tar.gz frameworks_base-7a747b8e0dadf909ea4ac0b67fd88fc14b4eb3f8.tar.bz2 | |
Initial checkin of preliminary rtsp support for stagefright.
Change-Id: I0722aa888098c0c1361c97a4c1b123d910afc207
Diffstat (limited to 'media/libmediaplayerservice/MediaPlayerService.cpp')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 9 |
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(); |