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

Commit 2db8455d authored by Andreas Huber's avatar Andreas Huber
Browse files

API Extension: Support for optionally specifying a map of extra request... 

API Extension: Support for optionally specifying a map of extra request headers when specifying the uri of media data to be played.

related-to-bug: 2393577

Original change by Andrei Popescu <andreip@google.com>
parent 8566a635

include/media/IMediaPlayerService.h

+3 −1
Original line number Diff line number Diff line
@@ -18,7 +18,9 @@ 
#define ANDROID_IMEDIAPLAYERSERVICE_H



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

#include <utils/KeyedVector.h>

#include <utils/RefBase.h>

#include <utils/String8.h>

#include <binder/IInterface.h>

#include <binder/Parcel.h>
@@ -38,7 +40,7 @@ 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, const char* url, const KeyedVector<String8, String8> *headers = NULL) = 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;

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

include/media/MediaPlayerInterface.h

+8 −2
Original line number Diff line number Diff line
@@ -21,8 +21,10 @@ 


#include <sys/types.h>

#include <ui/ISurface.h>

#include <utils/RefBase.h>

#include <utils/Errors.h>

#include <utils/KeyedVector.h>

#include <utils/String8.h>

#include <utils/RefBase.h>



#include <media/mediaplayer.h>

#include <media/AudioSystem.h>
@@ -96,7 +98,11 @@ public: 
    virtual             ~MediaPlayerBase() {}

    virtual status_t    initCheck() = 0;

    virtual bool        hardwareOutput() = 0;

    virtual status_t    setDataSource(const char *url) = 0;



    virtual status_t    setDataSource(

            const char *url,

            const KeyedVector<String8, String8> *headers = NULL) = 0;



    virtual status_t    setDataSource(int fd, int64_t offset, int64_t length) = 0;

    virtual status_t    setVideoSurface(const sp<ISurface>& surface) = 0;

    virtual status_t    prepare() = 0;

include/media/PVPlayer.h

+4 −1
Original line number Diff line number Diff line
@@ -38,7 +38,10 @@ public: 
    virtual             ~PVPlayer();



    virtual status_t    initCheck();

    virtual status_t    setDataSource(const char *url);



    virtual status_t    setDataSource(

            const char *url, const KeyedVector<String8, String8> *headers);



    virtual status_t    setDataSource(int fd, int64_t offset, int64_t length);

    virtual status_t    setVideoSurface(const sp<ISurface>& surface);

    virtual status_t    prepare();

include/media/mediaplayer.h

+8 −1
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ 
#include <media/IMediaPlayer.h>

#include <media/IMediaDeathNotifier.h>



#include <utils/KeyedVector.h>

#include <utils/String8.h>



namespace android {



enum media_event_type {
@@ -130,7 +133,11 @@ public: 
    ~MediaPlayer();

            void            died();

            void            disconnect();

            status_t        setDataSource(const char *url);



            status_t        setDataSource(

                    const char *url,

                    const KeyedVector<String8, String8> *headers);



            status_t        setDataSource(int fd, int64_t offset, int64_t length);

            status_t        setVideoSurface(const sp<Surface>& surface);

            status_t        setListener(const sp<MediaPlayerListener>& listener);

media/libmedia/IMediaPlayerService.cpp

+29 −4
Original line number Diff line number Diff line
@@ -56,13 +56,26 @@ public: 
        return interface_cast<IMediaMetadataRetriever>(reply.readStrongBinder());

    }



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

    {

    virtual sp<IMediaPlayer> create(

            pid_t pid, const sp<IMediaPlayerClient>& client,

            const char* url, const KeyedVector<String8, String8> *headers) {

        Parcel data, reply;

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

        data.writeInt32(pid);

        data.writeStrongBinder(client->asBinder());

        data.writeCString(url);



        if (headers == NULL) {

            data.writeInt32(0);

        } else {

            // serialize the headers

            data.writeInt32(headers->size());

            for (size_t i = 0; i < headers->size(); ++i) {

                data.writeString8(headers->keyAt(i));

                data.writeString8(headers->valueAt(i));

            }

        }



        remote()->transact(CREATE_URL, data, &reply);

        return interface_cast<IMediaPlayer>(reply.readStrongBinder());

    }
@@ -142,9 +155,21 @@ status_t BnMediaPlayerService::onTransact( 
        case CREATE_URL: {

            CHECK_INTERFACE(IMediaPlayerService, data, reply);

            pid_t pid = data.readInt32();

            sp<IMediaPlayerClient> client = interface_cast<IMediaPlayerClient>(data.readStrongBinder());

            sp<IMediaPlayerClient> client =

                interface_cast<IMediaPlayerClient>(data.readStrongBinder());

            const char* url = data.readCString();

            sp<IMediaPlayer> player = create(pid, client, url);



            KeyedVector<String8, String8> headers;

            int32_t numHeaders = data.readInt32();

            for (int i = 0; i < numHeaders; ++i) {

                String8 key = data.readString8();

                String8 value = data.readString8();

                headers.add(key, value);

            }



            sp<IMediaPlayer> player = create(

                    pid, client, url, numHeaders > 0 ? &headers : NULL);



            reply->writeStrongBinder(player->asBinder());

            return NO_ERROR;

        } break;