diff options
| author | Marco Nelissen <marcone@google.com> | 2015-01-27 17:49:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-27 17:49:19 +0000 |
| commit | 47deb15e99cbf60e558027e074b7415c95637943 (patch) | |
| tree | 6331a49fb809fd8a7bd977adf849501fe7a5f340 /include/media/mediaplayer.h | |
| parent | cbb803a57f8bbfbdcc3e9857d16a38a47106a26c (diff) | |
| parent | b7848f1c442bc8c71020957948d1b003a62a25b7 (diff) | |
| download | frameworks_av-47deb15e99cbf60e558027e074b7415c95637943.zip frameworks_av-47deb15e99cbf60e558027e074b7415c95637943.tar.gz frameworks_av-47deb15e99cbf60e558027e074b7415c95637943.tar.bz2 | |
Merge "Remove MediaPlayerService::decode()"
Diffstat (limited to 'include/media/mediaplayer.h')
| -rw-r--r-- | include/media/mediaplayer.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/include/media/mediaplayer.h b/include/media/mediaplayer.h index 9cc208e..5830933 100644 --- a/include/media/mediaplayer.h +++ b/include/media/mediaplayer.h @@ -232,17 +232,6 @@ public: bool isLooping(); status_t setVolume(float leftVolume, float rightVolume); void notify(int msg, int ext1, int ext2, const Parcel *obj = NULL); - static 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); - static status_t decode(int fd, int64_t offset, int64_t length, uint32_t *pSampleRate, - int* pNumChannels, audio_format_t* pFormat, - const sp<IMemoryHeap>& heap, size_t *pSize); 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); |