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

Commit e2e3f479 authored by Gloria Wang's avatar Gloria Wang Committed by Android (Google) Code Review
Browse files

Merge "- Add another parameter in notify() to be able to send timed text... 

Merge "- Add another parameter in notify() to be able to send timed text sample through listener during video playback. - Add OnTimedTextListener in the MediaPlayer For feature request 800939."
parents 53e1c049 b483c472

cmds/stagefright/stream.cpp

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ struct MyClient : public BnMediaPlayerClient { 
        : mEOS(false) {

    }



    virtual void notify(int msg, int ext1, int ext2) {

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

        Mutex::Autolock autoLock(mLock);



        if (msg == MEDIA_ERROR || msg == MEDIA_PLAYBACK_COMPLETE) {

include/media/IMediaPlayerClient.h

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ class IMediaPlayerClient: public IInterface 
public:

    DECLARE_META_INTERFACE(MediaPlayerClient);



    virtual void notify(int msg, int ext1, int ext2) = 0;

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

};



// ----------------------------------------------------------------------------

include/media/MediaPlayerInterface.h

+5 −3
Original line number Diff line number Diff line
@@ -55,7 +55,8 @@ enum player_type { 




// callback mechanism for passing messages to MediaPlayer object

typedef void (*notify_callback_f)(void* cookie, int msg, int ext1, int ext2);

typedef void (*notify_callback_f)(void* cookie,

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



// abstract base class - use MediaPlayerInterface

class MediaPlayerBase : public RefBase
@@ -159,9 +160,10 @@ public: 
        mCookie = cookie; mNotify = notifyFunc;

    }



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

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

                          const Parcel *obj=NULL) {

        Mutex::Autolock autoLock(mNotifyLock);

        if (mNotify) mNotify(mCookie, msg, ext1, ext2);

        if (mNotify) mNotify(mCookie, msg, ext1, ext2, obj);

    }



private:

include/media/mediaplayer.h

+3 −2
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ enum media_event_type { 
    MEDIA_BUFFERING_UPDATE  = 3,

    MEDIA_SEEK_COMPLETE     = 4,

    MEDIA_SET_VIDEO_SIZE    = 5,

    MEDIA_TIMED_TEXT        = 99,

    MEDIA_ERROR             = 100,

    MEDIA_INFO              = 200,

};
@@ -129,7 +130,7 @@ enum media_player_states { 
class MediaPlayerListener: virtual public RefBase

{

public:

    virtual void notify(int msg, int ext1, int ext2) = 0;

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

};



class MediaPlayer : public BnMediaPlayerClient,
@@ -166,7 +167,7 @@ public: 
            status_t        setLooping(int loop);

            bool            isLooping();

            status_t        setVolume(float leftVolume, float rightVolume);

            void            notify(int msg, int ext1, int ext2);

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

    static  sp<IMemory>     decode(const char* url, uint32_t *pSampleRate, int* pNumChannels, int* pFormat);

    static  sp<IMemory>     decode(int fd, int64_t offset, int64_t length, uint32_t *pSampleRate, int* pNumChannels, int* pFormat);

            status_t        invoke(const Parcel& request, Parcel *reply);

media/libmedia/IMediaPlayerClient.cpp

+10 −2
Original line number Diff line number Diff line
@@ -35,13 +35,16 @@ public: 
    {

    }



    virtual void notify(int msg, int ext1, int ext2)

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

    {

        Parcel data, reply;

        data.writeInterfaceToken(IMediaPlayerClient::getInterfaceDescriptor());

        data.writeInt32(msg);

        data.writeInt32(ext1);

        data.writeInt32(ext2);

        if (obj && obj->dataSize() > 0) {

            data.appendFrom(const_cast<Parcel *>(obj), 0, obj->dataSize());

        }

        remote()->transact(NOTIFY, data, &reply, IBinder::FLAG_ONEWAY);

    }

};
@@ -59,7 +62,12 @@ status_t BnMediaPlayerClient::onTransact( 
            int msg = data.readInt32();

            int ext1 = data.readInt32();

            int ext2 = data.readInt32();

            notify(msg, ext1, ext2);

            Parcel obj;

            if (data.dataAvail() > 0) {

                obj.appendFrom(const_cast<Parcel *>(&data), data.dataPosition(), data.dataAvail());

            }



            notify(msg, ext1, ext2, &obj);

            return NO_ERROR;

        } break;

        default: