summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-08-30 12:46:12 -0700
committerAndreas Huber <andih@google.com>2010-08-30 12:46:12 -0700
commit30cfa20dfc67583411db58674d3d97bc42fa7951 (patch)
tree45c48a66a2624d085fa8bfd1a421ce771e4da55e /media
parentf6639c46e83a1ccab7b293192c208091d17c61be (diff)
downloadframeworks_base-30cfa20dfc67583411db58674d3d97bc42fa7951.zip
frameworks_base-30cfa20dfc67583411db58674d3d97bc42fa7951.tar.gz
frameworks_base-30cfa20dfc67583411db58674d3d97bc42fa7951.tar.bz2
Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore.
Change-Id: I1ca6bd8faba0185f9694f9dc04d2b3e6a7ab5ac3 related-to-bug: 2370115
Diffstat (limited to 'media')
-rw-r--r--media/libmediaplayerservice/MediaPlayerService.cpp4
-rw-r--r--media/libmediaplayerservice/MediaRecorderClient.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index b5972e7..aba5f52 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -737,8 +737,8 @@ player_type getPlayerType(const char* url)
if (!strncasecmp(url, "rtsp://", 7)) {
char value[PROPERTY_VALUE_MAX];
- if (!property_get("media.stagefright.enable-rtsp", value, NULL)
- || (strcmp(value, "1") && strcasecmp(value, "true"))) {
+ 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;
diff --git a/media/libmediaplayerservice/MediaRecorderClient.cpp b/media/libmediaplayerservice/MediaRecorderClient.cpp
index 73862c3..19915f1 100644
--- a/media/libmediaplayerservice/MediaRecorderClient.cpp
+++ b/media/libmediaplayerservice/MediaRecorderClient.cpp
@@ -295,8 +295,8 @@ MediaRecorderClient::MediaRecorderClient(const sp<MediaPlayerService>& service,
mPid = pid;
char value[PROPERTY_VALUE_MAX];
- if (property_get("media.stagefright.enable-record", value, NULL)
- && (!strcmp(value, "1") || !strcasecmp(value, "true"))) {
+ if (!property_get("media.stagefright.enable-record", value, NULL)
+ || !strcmp(value, "1") || !strcasecmp(value, "true")) {
mRecorder = new StagefrightRecorder;
} else
#ifndef NO_OPENCORE