Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 681c5ff2 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "Reverse the default setting of media.stagefright.enable-{rtsp,record}... 

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

media/libmediaplayerservice/MediaPlayerService.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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;

media/libmediaplayerservice/MediaRecorderClient.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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