summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/AwesomePlayer.cpp
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 /media/libstagefright/AwesomePlayer.cpp
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 'media/libstagefright/AwesomePlayer.cpp')
-rw-r--r--media/libstagefright/AwesomePlayer.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index ab8ac79..a31b317 100644
--- a/media/libstagefright/AwesomePlayer.cpp
+++ b/media/libstagefright/AwesomePlayer.cpp
@@ -879,10 +879,7 @@ void AwesomePlayer::onStreamDone() {
}
if ((mFlags & LOOPING)
- || ((mFlags & AUTO_LOOPING)
- && (mAudioSink == NULL || mAudioSink->realtime()))) {
- // Don't AUTO_LOOP if we're being recorded, since that cannot be
- // turned off and recording would go on indefinitely.
+ || (mFlags & AUTO_LOOPING)) {
seekTo_l(0);