diff options
author | Marco Nelissen <marcone@google.com> | 2014-12-04 08:57:56 -0800 |
---|---|---|
committer | Marco Nelissen <marcone@google.com> | 2015-01-26 07:57:39 -0800 |
commit | b7848f1c442bc8c71020957948d1b003a62a25b7 (patch) | |
tree | b0a1dfd418429171c0af5379a1820569775a840b /media/libmedia/mediaplayer.cpp | |
parent | 1ed13b3b443735e7f7b5002954f31741b0b1c572 (diff) | |
download | frameworks_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 'media/libmedia/mediaplayer.cpp')
-rw-r--r-- | media/libmedia/mediaplayer.cpp | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp index 9611ac7..05c89ed 100644 --- a/media/libmedia/mediaplayer.cpp +++ b/media/libmedia/mediaplayer.cpp @@ -835,53 +835,12 @@ void MediaPlayer::notify(int msg, int ext1, int ext2, const Parcel *obj) } } -/*static*/ status_t MediaPlayer::decode( - const sp<IMediaHTTPService> &httpService, - const char* url, - uint32_t *pSampleRate, - int* pNumChannels, - audio_format_t* pFormat, - const sp<IMemoryHeap>& heap, - size_t *pSize) -{ - ALOGV("decode(%s)", url); - status_t status; - const sp<IMediaPlayerService>& service = getMediaPlayerService(); - if (service != 0) { - status = service->decode(httpService, url, pSampleRate, pNumChannels, pFormat, heap, pSize); - } else { - ALOGE("Unable to locate media service"); - status = DEAD_OBJECT; - } - return status; - -} - void MediaPlayer::died() { ALOGV("died"); notify(MEDIA_ERROR, MEDIA_ERROR_SERVER_DIED, 0); } -/*static*/ status_t MediaPlayer::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) -{ - ALOGV("decode(%d, %" PRId64 ", %" PRId64 ")", fd, offset, length); - status_t status; - const sp<IMediaPlayerService>& service = getMediaPlayerService(); - if (service != 0) { - status = service->decode(fd, offset, length, pSampleRate, - pNumChannels, pFormat, heap, pSize); - } else { - ALOGE("Unable to locate media service"); - status = DEAD_OBJECT; - } - return status; - -} - status_t MediaPlayer::setNextMediaPlayer(const sp<MediaPlayer>& next) { if (mPlayer == NULL) { return NO_INIT; |