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

Commit d42173a4 authored by Rachad Alao's avatar Rachad Alao Committed by Android (Google) Code Review
Browse files

Merge "Revert "disable AwesomePlayer for Ogg vorbis"" into lmp-dev

parents 8dad3f60 da65048e

media/libmediaplayerservice/MediaPlayerFactory.cpp

+11 −14
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ status_t MediaPlayerFactory::registerFactory_l(IFactory* factory, 
    return OK;

}



static player_type getDefaultPlayerType() {

player_type MediaPlayerFactory::getDefaultPlayerType() {

    char value[PROPERTY_VALUE_MAX];

    if (property_get("media.stagefright.use-awesome", value, NULL)

            && (!strcmp("1", value) || !strcasecmp("true", value))) {
@@ -181,8 +181,6 @@ class StagefrightPlayerFactory : 
                               int64_t offset,

                               int64_t /*length*/,

                               float /*curScore*/) {

        if (getDefaultPlayerType()

                == STAGEFRIGHT_PLAYER) {

        char buf[20];

        lseek(fd, offset, SEEK_SET);

        read(fd, buf, sizeof(buf));
@@ -193,7 +191,6 @@ class StagefrightPlayerFactory : 
        // Ogg vorbis?

        if (ident == 0x5367674f) // 'OggS'

            return 1.0;

        }



        return 0.0;

    }

media/libmediaplayerservice/MediaPlayerFactory.h

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ class MediaPlayerFactory { 


    static status_t registerFactory_l(IFactory* factory,

                                      player_type type);

    static player_type getDefaultPlayerType();



    static Mutex       sLock;

    static tFactoryMap sFactoryMap;