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

Commit 8e1b6cce authored by Nicolas Catania's avatar Nicolas Catania
Browse files

Basic plumbing to retrieve metadata from the native player. 

IMediaPlayer.h
Added a getMetadata method that mirrors the on in MediaPlayer.java.

MediaPlayer.java
Added a native method to get the metadata from the native player.
Parse the parcel into a Metadata object.

Metadata.java
Added a stub to parse the Parcel returned by the native player into
a set of metadata.

android_media_MediaPlayer.cpp
JNI call to forward the getMetadata call.

MediaPlayerService.cpp
MediaPlayerService::Client implements the new getMetadata method added in IMediaPlayer.h
parent a920ee99

include/media/IMediaPlayer.h

+17 −0
Original line number Diff line number Diff line
@@ -59,6 +59,23 @@ public: 
    // @param filter A set of allow and drop rules serialized in a Parcel.

    // @return OK if the invocation was made successfully.

    virtual status_t        setMetadataFilter(const Parcel& filter) = 0;



    // Retrieve a set of metadata.

    // @param update_only Include only the metadata that have changed

    //                    since the last invocation of getMetadata.

    //                    The set is built using the unfiltered

    //                    notifications the native player sent to the

    //                    MediaPlayerService during that period of

    //                    time. If false, all the metadatas are considered.

    // @param apply_filter If true, once the metadata set has been built based

    //                     on the value update_only, the current filter is

    //                     applied.

    // @param[out] metadata On exit contains a set (possibly empty) of metadata.

    //                      Valid only if the call returned OK.

    // @return OK if the invocation was made successfully.

    virtual status_t        getMetadata(bool update_only,

                                        bool apply_filter,

                                        Parcel *metadata) = 0;

};



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

include/media/mediaplayer.h

+1 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ public: 
    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);

            status_t        setMetadataFilter(const Parcel& filter);

            status_t        getMetadata(bool update_only, bool apply_filter, Parcel *metadata);

private:

            void            clear_l();

            status_t        seekTo_l(int msec);

media/libmedia/IMediaPlayer.cpp

+21 −2
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ enum { 
    SET_VOLUME,

    INVOKE,

    SET_METADATA_FILTER,

    GET_METADATA,

};



class BpMediaPlayer: public BpInterface<IMediaPlayer>
@@ -176,8 +177,7 @@ public: 
    status_t invoke(const Parcel& request, Parcel *reply)

    { // Avoid doing any extra copy. The interface descriptor should

      // have been set by MediaPlayer.java.

        status_t retcode = remote()->transact(INVOKE, request, reply);

        return retcode;

        return remote()->transact(INVOKE, request, reply);

    }



    status_t setMetadataFilter(const Parcel& request)
@@ -188,6 +188,17 @@ public: 
        remote()->transact(SET_METADATA_FILTER, request, &reply);

        return reply.readInt32();

    }



    status_t getMetadata(bool update_only, bool apply_filter, Parcel *reply)

    {

        Parcel request;

        request.writeInterfaceToken(IMediaPlayer::getInterfaceDescriptor());

        // TODO: Burning 2 ints for 2 boolean. Should probably use flags in an int here.

        request.writeInt32(update_only);

        request.writeInt32(apply_filter);

        remote()->transact(GET_METADATA, request, reply);

        return reply->readInt32();

    }

};



IMPLEMENT_META_INTERFACE(MediaPlayer, "android.media.IMediaPlayer");
@@ -288,6 +299,14 @@ status_t BnMediaPlayer::onTransact( 
            reply->writeInt32(setMetadataFilter(data));

            return NO_ERROR;

        } break;

        case GET_METADATA: {

            CHECK_INTERFACE(IMediaPlayer, data, reply);

            const status_t retcode = getMetadata(data.readInt32(), data.readInt32(), reply);

            reply->setDataPosition(0);

            reply->writeInt32(retcode);

            reply->setDataPosition(0);

            return NO_ERROR;

        } break;

        default:

            return BBinder::onTransact(code, data, reply, flags);

    }

media/libmedia/mediaplayer.cpp

+12 −3
Original line number Diff line number Diff line
@@ -211,14 +211,23 @@ status_t MediaPlayer::invoke(const Parcel& request, Parcel *reply) 
status_t MediaPlayer::setMetadataFilter(const Parcel& filter)

{

    LOGD("setMetadataFilter");

    Mutex::Autolock _l(mLock);

    if (mPlayer == NULL)

    {

    Mutex::Autolock lock(mLock);

    if (mPlayer == NULL) {

        return NO_INIT;

    }

    return mPlayer->setMetadataFilter(filter);

}



status_t MediaPlayer::getMetadata(bool update_only, bool apply_filter, Parcel *metadata)

{

    LOGD("getMetadata");

    Mutex::Autolock lock(mLock);

    if (mPlayer == NULL) {

        return NO_INIT;

    }

    return mPlayer->getMetadata(update_only, apply_filter, metadata);

}



status_t MediaPlayer::setVideoSurface(const sp<Surface>& surface)

{

    LOGV("setVideoSurface");

media/libmediaplayerservice/MediaPlayerService.cpp

+10 −0
Original line number Diff line number Diff line
@@ -846,6 +846,16 @@ status_t MediaPlayerService::Client::setMetadataFilter(const Parcel& filter) 
    return status;

}



status_t MediaPlayerService::Client::getMetadata(bool update_only, bool apply_filter, Parcel *metadata)

{

    status_t status;

    metadata->writeInt32(-1);  // Placeholder for the return code



    // FIXME: Implement, query the native player and do the optional filtering, etc...

    status = OK;

    return status;

}



status_t MediaPlayerService::Client::prepareAsync()

{

    LOGV("[%d] prepareAsync", mConnId);