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

Commit 20cb94ee authored by Nicolas Catania's avatar Nicolas Catania Committed by niko
Browse files

Direct api to the native media player. 

MediaPlayer.java has 3 new methods:
* newRequest creates a Parcel that can be used to send data to the
  native player using invoke.
* invoke issues synchronous calls to the native player using opaque
  parcels for the request and reply.

IMediaPlayer.h has 1 new abstract method:
* invoke

The Midi and Vorbis players have a stub for these. So far only PV
makes use of that new feature.

To avoid any copy overhead, the JNI interface uses Parcel as a java
object (no serialization/copy happens at the JNI layer).

The remote interface token is inserted when the Parcel is constructed
in java. That way the parcel is already routable when it reaches
 IMediaPlayer.cpp (proxy). No extra copy is needed there.
parent 5a123732

api/current.xml

+26 −0
Original line number Diff line number Diff line
@@ -73258,6 +73258,21 @@ 
 visibility="public"

>

</method>

<method name="invoke"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="request" type="android.os.Parcel">

</parameter>

<parameter name="reply" type="android.os.Parcel">

</parameter>

</method>

<method name="isLooping"

 return="boolean"

 abstract="false"
@@ -73280,6 +73295,17 @@ 
 visibility="public"

>

</method>

<method name="newRequest"

 return="android.os.Parcel"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="pause"

 return="void"

 abstract="false"

include/media/IMediaPlayer.h

+9 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 


namespace android {



class Parcel;

class ISurface;



class IMediaPlayer: public IInterface
@@ -45,6 +46,14 @@ public: 
    virtual status_t        setAudioStreamType(int type) = 0;

    virtual status_t        setLooping(int loop) = 0;

    virtual status_t        setVolume(float leftVolume, float rightVolume) = 0;



    // Invoke a generic method on the player by using opaque parcels

    // for the request and reply.

    // @param request Parcel that must start with the media player

    // interface token.

    // @param[out] reply Parcel to hold the reply data. Cannot be null.

    // @return OK if the invocation was made. PERMISSION_DENIED otherwise.

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

};



// ----------------------------------------------------------------------------
@@ -61,4 +70,3 @@ public: 
}; // namespace android



#endif // ANDROID_IMEDIAPLAYER_H

include/media/IMediaPlayerService.h

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#ifndef ANDROID_IMEDIAPLAYERSERVICE_H

#define ANDROID_IMEDIAPLAYERSERVICE_H



#include <utils/Errors.h>  // for status_t

#include <utils/RefBase.h>

#include <binder/IInterface.h>

#include <binder/Parcel.h>
@@ -36,7 +37,6 @@ public: 


    virtual sp<IMediaRecorder>  createMediaRecorder(pid_t pid) = 0;

    virtual sp<IMediaMetadataRetriever> createMetadataRetriever(pid_t pid) = 0;



    virtual sp<IMediaPlayer>    create(pid_t pid, const sp<IMediaPlayerClient>& client, const char* url) = 0;

    virtual sp<IMediaPlayer>    create(pid_t pid, const sp<IMediaPlayerClient>& client, int fd, int64_t offset, int64_t length) = 0;

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

include/media/MediaPlayerInterface.h

+11 −2
Original line number Diff line number Diff line
@@ -27,12 +27,15 @@ 


namespace android {



class Parcel;



enum player_type {

    PV_PLAYER = 1,

    SONIVOX_PLAYER = 2,

    VORBIS_PLAYER = 3

};





#define DEFAULT_AUDIOSINK_BUFFERCOUNT 4

#define DEFAULT_AUDIOSINK_BUFFERSIZE 1200

#define DEFAULT_AUDIOSINK_SAMPLERATE 44100
@@ -45,7 +48,6 @@ typedef void (*notify_callback_f)(void* cookie, int msg, int ext1, int ext2); 
class MediaPlayerBase : public RefBase

{

public:



    // AudioSink: abstraction layer for audio output

    class AudioSink : public RefBase {

    public:
@@ -88,7 +90,14 @@ public: 
    virtual player_type playerType() = 0;

    virtual void        setNotifyCallback(void* cookie, notify_callback_f notifyFunc) {

                            mCookie = cookie; mNotify = notifyFunc; }



    // Invoke a generic method on the player by using opaque parcels

    // for the request and reply.

    // @param request Parcel that is positioned at the start of the

    //                data sent by the java layer.

    // @param[out] reply Parcel to hold the reply data. Cannot be null.

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

    // not supporting the direct API should return INVALID_OPERATION.

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

protected:

    virtual void        sendEvent(int msg, int ext1=0, int ext2=0) { if (mNotify) mNotify(mCookie, msg, ext1, ext2); }

include/media/PVPlayer.h

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ public: 
    virtual status_t    reset();

    virtual status_t    setLooping(int loop);

    virtual player_type playerType() { return PV_PLAYER; }

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



    // make available to PlayerDriver

    void        sendEvent(int msg, int ext1=0, int ext2=0) { MediaPlayerBase::sendEvent(msg, ext1, ext2); }