Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore." into gingerbread

Browse Source
This commit is contained in:
Andreas Huber
2010-08-30 13:04:21 -07:00
committed by Android (Google) Code Review
parent 858bb4f66e 30cfa20dfc
commit 681c5ff208
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/libmediaplayerservice/MediaPlayerService.cpp
View File

@@ -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;

4
media/libmediaplayerservice/MediaRecorderClient.cpp
View File

@@ -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