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/libmediaplayerservice/nuplayer/NuPlayerDriver.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/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp index 4bff90f..c52d837 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp @@ -637,8 +637,17 @@ void NuPlayerDriver::notifyListener_l( case MEDIA_PLAYBACK_COMPLETE: { if (mState != STATE_RESET_IN_PROGRESS) { - if (mLooping || (mAutoLoop - && (mAudioSink == NULL || mAudioSink->realtime()))) { + if (mAutoLoop) { + audio_stream_type_t streamType = AUDIO_STREAM_MUSIC; + if (mAudioSink != NULL) { + streamType = mAudioSink->getAudioStreamType(); + } + if (streamType == AUDIO_STREAM_NOTIFICATION) { + ALOGW("disabling auto-loop for notification"); + mAutoLoop = false; + } + } + if (mLooping || mAutoLoop) { mPlayer->seekToAsync(0); break; } |