diff options
| author | Dave Burke <daveburke@google.com> | 2011-08-30 14:39:17 +0100 |
|---|---|---|
| committer | Dave Burke <daveburke@google.com> | 2011-09-02 11:26:59 +0100 |
| commit | d681bbb1767bed09415e050ba78975df214bcd68 (patch) | |
| tree | 2030c617c61bbf7b6cd8c6bafab601a99b1ac83d /media/libmediaplayerservice/MediaPlayerService.h | |
| parent | d942202ee0c92608c648735c3ad0f1bab4312420 (diff) | |
| download | frameworks_av-d681bbb1767bed09415e050ba78975df214bcd68.zip frameworks_av-d681bbb1767bed09415e050ba78975df214bcd68.tar.gz frameworks_av-d681bbb1767bed09415e050ba78975df214bcd68.tar.bz2 | |
Require INTERNET permission for network-based content.
Bug #1870981
Change-Id: Ia3ad166390c4d60cea19c3783895b078a2c4c15f
Diffstat (limited to 'media/libmediaplayerservice/MediaPlayerService.h')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.h | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.h b/media/libmediaplayerservice/MediaPlayerService.h index e32b92a..53e625a 100644 --- a/media/libmediaplayerservice/MediaPlayerService.h +++ b/media/libmediaplayerservice/MediaPlayerService.h @@ -188,16 +188,7 @@ public: void removeMediaRecorderClient(wp<MediaRecorderClient> client); virtual sp<IMediaMetadataRetriever> createMetadataRetriever(pid_t pid); - // House keeping for media player clients - virtual sp<IMediaPlayer> create( - pid_t pid, const sp<IMediaPlayerClient>& client, const char* url, - const KeyedVector<String8, String8> *headers, int audioSessionId); - - virtual sp<IMediaPlayer> create(pid_t pid, const sp<IMediaPlayerClient>& client, int fd, int64_t offset, int64_t length, int audioSessionId); - - virtual sp<IMediaPlayer> create( - pid_t pid, const sp<IMediaPlayerClient> &client, - const sp<IStreamSource> &source, int audioSessionId); + virtual sp<IMediaPlayer> create(pid_t pid, const sp<IMediaPlayerClient>& client, int audioSessionId); virtual sp<IMemory> decode(const char* url, uint32_t *pSampleRate, int* pNumChannels, int* pFormat); virtual sp<IMemory> decode(int fd, int64_t offset, int64_t length, uint32_t *pSampleRate, int* pNumChannels, int* pFormat); @@ -284,13 +275,13 @@ private: sp<MediaPlayerBase> createPlayer(player_type playerType); - status_t setDataSource( + virtual status_t setDataSource( const char *url, const KeyedVector<String8, String8> *headers); - status_t setDataSource(int fd, int64_t offset, int64_t length); + virtual status_t setDataSource(int fd, int64_t offset, int64_t length); - status_t setDataSource(const sp<IStreamSource> &source); + virtual status_t setDataSource(const sp<IStreamSource> &source); static void notify(void* cookie, int msg, int ext1, int ext2, const Parcel *obj); |