diff options
| author | Sungsoo Lim <sungsoo@google.com> | 2014-07-09 14:42:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-02 21:09:42 +0000 |
| commit | 82d04827c290c0d7b81840897b6466170a500fa3 (patch) | |
| tree | d64d838a1f5a6599009d13989a1f4b6a72587897 /media | |
| parent | 72d039f007722c92ee5ea7ffd03ece19d2781103 (diff) | |
| parent | 3a8d3eae3899f8923e3386aaa015b24ef6739489 (diff) | |
| download | frameworks_av-82d04827c290c0d7b81840897b6466170a500fa3.zip frameworks_av-82d04827c290c0d7b81840897b6466170a500fa3.tar.gz frameworks_av-82d04827c290c0d7b81840897b6466170a500fa3.tar.bz2 | |
Merge "Restore the LOOPING flag in onAudioTearDownEvent"
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index 63799e1..cd05c54 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -2949,6 +2949,7 @@ void AwesomePlayer::onAudioTearDownEvent() { sp<IMediaHTTPService> savedHTTPService = mHTTPService; + bool wasLooping = mFlags & LOOPING; // Reset and recreate reset_l(); @@ -2967,6 +2968,9 @@ void AwesomePlayer::onAudioTearDownEvent() { // a MEDIA_ERROR to the client and abort the prepare mFlags |= PREPARE_CANCELLED; } + if (wasLooping) { + mFlags |= LOOPING; + } mAudioTearDown = true; mIsAsyncPrepare = true; |