diff options
| author | Andreas Huber <andih@google.com> | 2014-01-29 11:13:26 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2014-02-04 15:11:53 -0800 |
| commit | 1b86fe063badb5f28c467ade39be0f4008688947 (patch) | |
| tree | d88660112d407540184ad8e1292ed8aa98fae317 /media/libmediaplayerservice/MediaPlayerService.h | |
| parent | 5ce88270eb2d41462de8c4155673b802b2ca48cb (diff) | |
| download | frameworks_av-1b86fe063badb5f28c467ade39be0f4008688947.zip frameworks_av-1b86fe063badb5f28c467ade39be0f4008688947.tar.gz frameworks_av-1b86fe063badb5f28c467ade39be0f4008688947.tar.bz2 | |
FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to media code
Change-Id: I9f74a86e70422187c9cf0ca1318a29019700192d
Diffstat (limited to 'media/libmediaplayerservice/MediaPlayerService.h')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.h b/media/libmediaplayerservice/MediaPlayerService.h index 9c084e1..6749f4a 100644 --- a/media/libmediaplayerservice/MediaPlayerService.h +++ b/media/libmediaplayerservice/MediaPlayerService.h @@ -256,9 +256,15 @@ public: virtual sp<IMediaPlayer> create(const sp<IMediaPlayerClient>& client, int audioSessionId); - virtual status_t decode(const char* url, uint32_t *pSampleRate, int* pNumChannels, - audio_format_t* pFormat, - const sp<IMemoryHeap>& heap, size_t *pSize); + virtual status_t decode( + const sp<IMediaHTTPService> &httpService, + const char* url, + uint32_t *pSampleRate, + int* pNumChannels, + audio_format_t* pFormat, + const sp<IMemoryHeap>& heap, + size_t *pSize); + virtual status_t decode(int fd, int64_t offset, int64_t length, uint32_t *pSampleRate, int* pNumChannels, audio_format_t* pFormat, @@ -356,6 +362,7 @@ private: sp<MediaPlayerBase> createPlayer(player_type playerType); virtual status_t setDataSource( + const sp<IMediaHTTPService> &httpService, const char *url, const KeyedVector<String8, String8> *headers); |