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

Commit 2d846a14 authored by Mingming Yin's avatar Mingming Yin Committed by Linux Build Service Account
Browse files

stagefright: Disable AwesomePlayer 

Permanently remove StagefrightPlayer codebase & remove its entry
from MediaPlayerFactory as AwesomePlayer is completely replaced
by NuPlayer. Keep the AwesomePlayer codebase to make
libstagefright_timedtext available to NuPlayer via libstagefright.

Conflicts:
	media/libmediaplayerservice/MediaPlayerFactory.cpp

Change-Id: Idfecdc519919ee940817c7bb515433fc37588bd3
parent f48b75f9

include/media/MediaPlayerInterface.h

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ class IGraphicBufferProducer; 
template<typename T> class SortedVector;



enum player_type {

    STAGEFRIGHT_PLAYER = 3,

    NU_PLAYER = 4,

    // Test players are available only in the 'test' and 'eng' builds.

    // The shared library with the test player is passed passed as an

media/libmediaplayerservice/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ LOCAL_SRC_FILES:= \ 
    MetadataRetrieverClient.cpp \

    RemoteDisplay.cpp           \

    SharedLibrary.cpp           \

    StagefrightPlayer.cpp       \

    StagefrightRecorder.cpp     \

    TestPlayerStub.cpp          \

media/libmediaplayerservice/MediaPlayerFactory.cpp

+1 −66
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include "MediaPlayerFactory.h"



#include "TestPlayerStub.h"

#include "StagefrightPlayer.h"

#include "nuplayer/NuPlayerDriver.h"



namespace android {
@@ -64,12 +63,6 @@ status_t MediaPlayerFactory::registerFactory_l(IFactory* factory, 
}



static player_type getDefaultPlayerType() {

    char value[PROPERTY_VALUE_MAX];

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

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

        return STAGEFRIGHT_PLAYER;

    }



    return NU_PLAYER;

}
@@ -87,7 +80,7 @@ void MediaPlayerFactory::unregisterFactory(player_type type) { 
#define GET_PLAYER_TYPE_IMPL(a...)                      \

    Mutex::Autolock lock_(&sLock);                      \

                                                        \

    player_type ret = STAGEFRIGHT_PLAYER;               \

    player_type ret = NU_PLAYER;                        \

    float bestScore = 0.0;                              \

                                                        \

    for (size_t i = 0; i < sFactoryMap.size(); ++i) {   \
@@ -176,63 +169,6 @@ sp<MediaPlayerBase> MediaPlayerFactory::createPlayer( 
 *                                                                           *

 *****************************************************************************/



class StagefrightPlayerFactory :

    public MediaPlayerFactory::IFactory {

  public:

    virtual float scoreFactory(const sp<IMediaPlayer>& /*client*/,

                               int fd,

                               int64_t offset,

                               int64_t length,

                               float /*curScore*/) {

        if (legacyDrm()) {

            sp<DataSource> source = new FileSource(dup(fd), offset, length);

            String8 mimeType;

            float confidence;

            if (SniffWVM(source, &mimeType, &confidence, NULL /* format */)) {

                return 1.0;

            }

        }



        if (getDefaultPlayerType() == STAGEFRIGHT_PLAYER) {

            char buf[20];

            lseek(fd, offset, SEEK_SET);

            read(fd, buf, sizeof(buf));

            lseek(fd, offset, SEEK_SET);



            uint32_t ident = *((uint32_t*)buf);



            // Ogg vorbis?

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

                return 1.0;

        }



        return 0.0;

    }



    virtual float scoreFactory(const sp<IMediaPlayer>& /*client*/,

                               const char* url,

                               float /*curScore*/) {

        if (legacyDrm() && !strncasecmp("widevine://", url, 11)) {

            return 1.0;

        }

        return 0.0;

    }



    virtual sp<MediaPlayerBase> createPlayer(pid_t /* pid */) {

        ALOGV(" create StagefrightPlayer");

        return new StagefrightPlayer();

    }

  private:

    bool legacyDrm() {

        char value[PROPERTY_VALUE_MAX];

        if (property_get("persist.sys.media.legacy-drm", value, NULL)

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

            return true;

        }

        return false;

    }

};



class NuPlayerFactory : public MediaPlayerFactory::IFactory {

  public:

    virtual float scoreFactory(const sp<IMediaPlayer>& /*client*/,
@@ -310,7 +246,6 @@ void MediaPlayerFactory::registerBuiltinFactories() { 
    if (sInitComplete)

        return;



    registerFactory_l(new StagefrightPlayerFactory(), STAGEFRIGHT_PLAYER);

    registerFactory_l(new NuPlayerFactory(), NU_PLAYER);

    registerFactory_l(new TestPlayerFactory(), TEST_PLAYER);

media/libmediaplayerservice/MediaPlayerService.cpp

+0 −1
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ 
#include "MediaPlayerFactory.h"



#include "TestPlayerStub.h"

#include "StagefrightPlayer.h"

#include "nuplayer/NuPlayerDriver.h"



#include <OMX.h>

media/libmediaplayerservice/MetadataRetrieverClient.cpp

+0 −1
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ static sp<MediaMetadataRetrieverBase> createRetriever(player_type playerType) 
{

    sp<MediaMetadataRetrieverBase> p;

    switch (playerType) {

        case STAGEFRIGHT_PLAYER:

        case NU_PLAYER:

        {

            p = new StagefrightMetadataRetriever;