summaryrefslogtreecommitdiffstats
path: root/include/media/mediaplayer.h
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-12-04 08:57:56 -0800
committerMarco Nelissen <marcone@google.com>2015-01-26 07:57:39 -0800
commitb7848f1c442bc8c71020957948d1b003a62a25b7 (patch)
treeb0a1dfd418429171c0af5379a1820569775a840b /include/media/mediaplayer.h
parent1ed13b3b443735e7f7b5002954f31741b0b1c572 (diff)
downloadframeworks_av-b7848f1c442bc8c71020957948d1b003a62a25b7.zip
frameworks_av-b7848f1c442bc8c71020957948d1b003a62a25b7.tar.gz
frameworks_av-b7848f1c442bc8c71020957948d1b003a62a25b7.tar.bz2
Remove MediaPlayerService::decode()
and make SoundPool use MediaCodec for decoding files to PCM. Bug: 18239054 Change-Id: Ia144fc1bbb0d2787638ee972e2224339b4965310
Diffstat (limited to 'include/media/mediaplayer.h')
-rw-r--r--include/media/mediaplayer.h11
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);