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

Commit 43b9401d authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am f25410ed: Merge "Use NuPlayer for HTTP live streaming playback by default." into honeycomb 

* commit 'f25410ed':
  Use NuPlayer for HTTP live streaming playback by default.
parents d603fbe3 f25410ed

media/libmediaplayerservice/MediaPlayerService.cpp

+2 −2
Original line number Diff line number Diff line
@@ -733,8 +733,8 @@ player_type getPlayerType(const char* url) 
    }



    char value[PROPERTY_VALUE_MAX];

    if (property_get("media.httplive.enable-nuplayer", value, NULL)

            && (!strcasecmp(value, "true") || !strcmp(value, "1"))) {

    if (!property_get("media.httplive.disable-nuplayer", value, NULL)

            || (strcasecmp(value, "true") && strcmp(value, "1"))) {

        if (!strncasecmp("http://", url, 7)) {

            size_t len = strlen(url);

            if (len >= 5 && !strcasecmp(".m3u8", &url[len - 5])) {

media/libstagefright/httplive/LiveSession.cpp

+2 −2
Original line number Diff line number Diff line
@@ -158,8 +158,8 @@ void LiveSession::onConnect(const sp<AMessage> &msg) { 
        mBandwidthItems.sort(SortByBandwidth);



        char value[PROPERTY_VALUE_MAX];

        if (!property_get("media.httplive.enable-nuplayer", value, NULL)

                || (strcasecmp(value, "true") && strcmp(value, "1"))) {

        if (property_get("media.httplive.disable-nuplayer", value, NULL)

                && (!strcasecmp(value, "true") || !strcmp(value, "1"))) {

            // The "legacy" player cannot deal with audio format changes,

            // some streams use different audio encoding parameters for

            // their lowest bandwidth stream.