diff options
author | Marco Nelissen <marcone@google.com> | 2015-01-27 10:04:01 -0800 |
---|---|---|
committer | Marco Nelissen <marcone@google.com> | 2015-01-27 10:04:01 -0800 |
commit | 9391844deb3f6a442745cea62f78aca2cea19e50 (patch) | |
tree | c8868256f6cbd8e683b45c7fa4e3d56aa26d2574 /media/libmedia/mediaplayer.cpp | |
parent | b7909adcef247c627fbe8026624b9ecbeba47655 (diff) | |
parent | b955b7224382b488a4d8d5663c92118feb8deb1e (diff) | |
download | frameworks_av-9391844deb3f6a442745cea62f78aca2cea19e50.zip frameworks_av-9391844deb3f6a442745cea62f78aca2cea19e50.tar.gz frameworks_av-9391844deb3f6a442745cea62f78aca2cea19e50.tar.bz2 |
resolved conflicts for merge of b955b722 to lmp-mr1-dev-plus-aosp
Change-Id: I385371869169eee4fe6330ffe0abc5eda4cb4f72
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; |