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

Commit 72012ea6 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I2278137e 

* changes:
  Disable HTTP playback and metadata support in stagefright, use PV instead.
parents 2e3708e4 6a3a018f

media/libmediaplayerservice/MediaPlayerService.cpp

+6 −0
Original line number Diff line number Diff line
@@ -720,6 +720,12 @@ player_type getPlayerType(const char* url) 
        }

    }



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

        // For now, we're going to use PV for http-based playback,

        // until we can clear up a few more issues.

        return PV_PLAYER;

    }



    return getDefaultPlayerType();

}

media/libmediaplayerservice/MetadataRetrieverClient.cpp

+11 −6
Original line number Diff line number Diff line
@@ -105,6 +105,17 @@ static sp<MediaMetadataRetrieverBase> createRetriever(player_type playerType) 
{

    sp<MediaMetadataRetrieverBase> p;

    switch (playerType) {

#if BUILD_WITH_FULL_STAGEFRIGHT

        case STAGEFRIGHT_PLAYER:

            // For now we are going to keep using PV for meta-data support

            // until stagefright is up to par.



            // LOGV("create StagefrightMetadataRetriever");

            // p = new StagefrightMetadataRetriever;

            // break;



            // fall through to PV_PLAYER

#endif

#ifndef NO_OPENCORE

        case PV_PLAYER:

            LOGV("create pv metadata retriever");
@@ -119,12 +130,6 @@ static sp<MediaMetadataRetrieverBase> createRetriever(player_type playerType) 
            LOGV("create midi metadata retriever");

            p = new MidiMetadataRetriever();

            break;

#if BUILD_WITH_FULL_STAGEFRIGHT

        case STAGEFRIGHT_PLAYER:

            LOGV("create StagefrightMetadataRetriever");

            p = new StagefrightMetadataRetriever;

            break;

#endif

        default:

            // TODO:

            // support for TEST_PLAYER