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

Commit 56415506 authored by Pawin Vongmasa's avatar Pawin Vongmasa Committed by JP Sugarbroad
Browse files

Refactor MediaPlayerBase's notify 

Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice

Bug: 70546581
Change-Id: Ia3a8eb99c2faf6935c63800ba08f65970cede48e
(cherry picked from commit 082e4f75)
parent 0ed3f308

media/libmediaplayerservice/MediaPlayerFactory.cpp

+2 −3
Original line number Diff line number Diff line
@@ -126,8 +126,7 @@ player_type MediaPlayerFactory::getPlayerType(const sp<IMediaPlayer>& client, 


sp<MediaPlayerBase> MediaPlayerFactory::createPlayer(

        player_type playerType,

        const wp<IMediaPlayer> &client,

        notify_callback_f notifyFunc,

        const sp<MediaPlayerBase::Listener> &listener,

        pid_t pid) {

    sp<MediaPlayerBase> p;

    IFactory* factory;
@@ -152,7 +151,7 @@ sp<MediaPlayerBase> MediaPlayerFactory::createPlayer( 


    init_result = p->initCheck();

    if (init_result == NO_ERROR) {

        p->setNotifyCallback(client, notifyFunc);

        p->setNotifyCallback(listener);

    } else {

        ALOGE("Failed to create player object of type %d, initCheck failed"

              " (res = %d)", playerType, init_result);

media/libmediaplayerservice/MediaPlayerFactory.h

+1 −2
Original line number Diff line number Diff line
@@ -65,8 +65,7 @@ class MediaPlayerFactory { 
                                     const sp<DataSource> &source);



    static sp<MediaPlayerBase> createPlayer(player_type playerType,

                                            const wp<IMediaPlayer> &client,

                                            notify_callback_f notifyFunc,

                                            const sp<MediaPlayerBase::Listener> &listener,

                                            pid_t pid);



    static void registerBuiltinFactories();

media/libmediaplayerservice/MediaPlayerService.cpp

+17 −22
Original line number Diff line number Diff line
@@ -590,10 +590,11 @@ MediaPlayerService::Client::Client( 
    mUid = uid;

    mRetransmitEndpointValid = false;

    mAudioAttributes = NULL;

    mListener = new Listener(this);



#if CALLBACK_ANTAGONIZER

    ALOGD("create Antagonizer");

    mAntagonizer = new Antagonizer(notify, this);

    mAntagonizer = new Antagonizer(mListener);

#endif

}
@@ -627,7 +628,7 @@ void MediaPlayerService::Client::disconnect() 
    // and reset the player. We assume the player will serialize

    // access to itself if necessary.

    if (p != 0) {

        p->setNotifyCallback(0, 0);

        p->setNotifyCallback(0);

#if CALLBACK_ANTAGONIZER

        ALOGD("kill Antagonizer");

        mAntagonizer->kill();
@@ -652,7 +653,7 @@ sp<MediaPlayerBase> MediaPlayerService::Client::createPlayer(player_type playerT 
        p.clear();

    }

    if (p == NULL) {

        p = MediaPlayerFactory::createPlayer(playerType, this, notify, mPid);

        p = MediaPlayerFactory::createPlayer(playerType, mListener, mPid);

    }



    if (p != NULL) {
@@ -1430,25 +1431,19 @@ status_t MediaPlayerService::Client::getRetransmitEndpoint( 
}



void MediaPlayerService::Client::notify(

        const wp<IMediaPlayer> &listener, int msg, int ext1, int ext2, const Parcel *obj)

        int msg, int ext1, int ext2, const Parcel *obj)

{

    sp<IMediaPlayer> spListener = listener.promote();

    if (spListener == NULL) {

        return;

    }

    Client* client = static_cast<Client*>(spListener.get());



    sp<IMediaPlayerClient> c;

    sp<Client> nextClient;

    status_t errStartNext = NO_ERROR;

    {

        Mutex::Autolock l(client->mLock);

        c = client->mClient;

        if (msg == MEDIA_PLAYBACK_COMPLETE && client->mNextClient != NULL) {

            nextClient = client->mNextClient;

        Mutex::Autolock l(mLock);

        c = mClient;

        if (msg == MEDIA_PLAYBACK_COMPLETE && mNextClient != NULL) {

            nextClient = mNextClient;



            if (client->mAudioOutput != NULL)

                client->mAudioOutput->switchToNextOutput();

            if (mAudioOutput != NULL)

                mAudioOutput->switchToNextOutput();



            errStartNext = nextClient->start();

        }
@@ -1474,17 +1469,17 @@ void MediaPlayerService::Client::notify( 
        MEDIA_INFO_METADATA_UPDATE == ext1) {

        const media::Metadata::Type metadata_type = ext2;



        if(client->shouldDropMetadata(metadata_type)) {

        if(shouldDropMetadata(metadata_type)) {

            return;

        }



        // Update the list of metadata that have changed. getMetadata

        // also access mMetadataUpdated and clears it.

        client->addNewMetadataUpdate(metadata_type);

        addNewMetadataUpdate(metadata_type);

    }



    if (c != NULL) {

        ALOGV("[%d] notify (%p, %d, %d, %d)", client->mConnId, spListener.get(), msg, ext1, ext2);

        ALOGV("[%d] notify (%d, %d, %d)", mConnId, msg, ext1, ext2);

        c->notify(msg, ext1, ext2, obj);

    }

}
@@ -1542,8 +1537,8 @@ status_t MediaPlayerService::Client::releaseDrm() 
#if CALLBACK_ANTAGONIZER

const int Antagonizer::interval = 10000; // 10 msecs



Antagonizer::Antagonizer(notify_callback_f cb, const wp<IMediaPlayer> &client) :

    mExit(false), mActive(false), mClient(client), mCb(cb)

Antagonizer::Antagonizer(const sp<MediaPlayerBase::Listener> &listener) :

    mExit(false), mActive(false), mListener(listener)

{

    createThread(callbackThread, this);

}
@@ -1563,7 +1558,7 @@ int Antagonizer::callbackThread(void* user) 
    while (!p->mExit) {

        if (p->mActive) {

            ALOGV("send event");

            p->mCb(p->mClient, 0, 0, 0);

            p->mListener->notify(0, 0, 0, 0);

        }

        usleep(interval);

    }

media/libmediaplayerservice/MediaPlayerService.h

+40 −28
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ class MediaRecorderClient; 
#if CALLBACK_ANTAGONIZER

class Antagonizer {

public:

    Antagonizer(notify_callback_f cb, const wp<IMediaPlayer> &client);

    Antagonizer(const sp<MediaPlayerBase::Listener> &listener);

    void start() { mActive = true; }

    void stop() { mActive = false; }

    void kill();
@@ -63,8 +63,7 @@ private: 
    Condition                     mCondition;

    bool                          mExit;

    bool                          mActive;

    wp<IMediaPlayer>    mClient;

    notify_callback_f   mCb;

    sp<MediaPlayerBase::Listener> mListener;

};

#endif
@@ -215,7 +214,6 @@ class MediaPlayerService : public BnMediaPlayerService 


    }; // AudioOutput





public:

    static  void                instantiate();
@@ -365,8 +363,7 @@ private: 
        status_t                setDataSource_post(const sp<MediaPlayerBase>& p,

                                                   status_t status);



        static  void            notify(const wp<IMediaPlayer> &cookie, int msg,

                                       int ext1, int ext2, const Parcel *obj);

                void            notify(int msg, int ext1, int ext2, const Parcel *obj);



                pid_t           pid() const { return mPid; }

        virtual status_t        dump(int fd, const Vector<String16>& args);
@@ -437,6 +434,20 @@ private: 


        status_t setAudioAttributes_l(const Parcel &request);



        class Listener : public MediaPlayerBase::Listener {

        public:

            Listener(const wp<Client> &client) : mClient(client) {}

            virtual ~Listener() {}

            virtual void notify(int msg, int ext1, int ext2, const Parcel *obj) {

                sp<Client> client = mClient.promote();

                if (client != NULL) {

                    client->notify(msg, ext1, ext2, obj);

                }

            }

        private:

            wp<Client> mClient;

        };



        mutable     Mutex                         mLock;

                    sp<MediaPlayerBase>           mPlayer;

                    sp<MediaPlayerService>        mService;
@@ -454,6 +465,7 @@ private: 
                    struct sockaddr_in            mRetransmitEndpoint;

                    bool                          mRetransmitEndpointValid;

                    sp<Client>                    mNextClient;

                    sp<MediaPlayerBase::Listener> mListener;



        // Metadata filters.

        media::Metadata::Filter mMetadataAllow;  // protected by mLock

media/libmediaplayerservice/include/MediaPlayerInterface.h

+16 −14
Original line number Diff line number Diff line
@@ -66,14 +66,17 @@ enum player_type { 
// duration below which we do not allow deep audio buffering

#define AUDIO_SINK_MIN_DEEP_BUFFER_DURATION_US 5000000



// callback mechanism for passing messages to MediaPlayer object

typedef void (*notify_callback_f)(const wp<IMediaPlayer> &listener,

        int msg, int ext1, int ext2, const Parcel *obj);



// abstract base class - use MediaPlayerInterface

class MediaPlayerBase : public RefBase

{

public:

    // callback mechanism for passing messages to MediaPlayer object

    class Listener : public RefBase {

    public:

        virtual void notify(int msg, int ext1, int ext2, const Parcel *obj) = 0;

        virtual ~Listener() {}

    };



    // AudioSink: abstraction layer for audio output

    class AudioSink : public RefBase {

    public:
@@ -152,7 +155,7 @@ public: 
        virtual sp<VolumeShaper::State> getVolumeShaperState(int id);

    };



                        MediaPlayerBase() : mClient(0), mNotify(0) {}

                        MediaPlayerBase() {}

    virtual             ~MediaPlayerBase() {}

    virtual status_t    initCheck() = 0;

    virtual bool        hardwareOutput() = 0;
@@ -263,22 +266,22 @@ public: 
    };



    void        setNotifyCallback(

            const wp<IMediaPlayer> &client, notify_callback_f notifyFunc) {

            const sp<Listener> &listener) {

        Mutex::Autolock autoLock(mNotifyLock);

        mClient = client; mNotify = notifyFunc;

        mListener = listener;

    }



    void        sendEvent(int msg, int ext1=0, int ext2=0,

                          const Parcel *obj=NULL) {

        notify_callback_f notifyCB;

        wp<IMediaPlayer> client;

        sp<Listener> listener;

        {

            Mutex::Autolock autoLock(mNotifyLock);

            notifyCB = mNotify;

            client = mClient;

            listener = mListener;

        }



        if (notifyCB) notifyCB(client, msg, ext1, ext2, obj);

        if (listener != NULL) {

            listener->notify(msg, ext1, ext2, obj);

        }

    }



    virtual status_t dump(int /* fd */, const Vector<String16>& /* args */) const {
@@ -297,8 +300,7 @@ private: 
    friend class MediaPlayerService;



    Mutex               mNotifyLock;

    wp<IMediaPlayer>    mClient;

    notify_callback_f   mNotify;

    sp<Listener>        mListener;

};



// Implement this class for media players that use the AudioFlinger software mixer