diff options
| author | Chong Zhang <chz@google.com> | 2013-08-28 16:48:35 -0700 |
|---|---|---|
| committer | Chong Zhang <chz@google.com> | 2013-08-28 16:56:40 -0700 |
| commit | 22f03209ceed3bcdf8c6558fcf02dc7699dde259 (patch) | |
| tree | f243318b3e3129e584845a5ef1ba88e2bcae0d2f /media/libstagefright/AwesomePlayer.cpp | |
| parent | c063c1756cbffdc273fe50b208426f59439f1298 (diff) | |
| download | frameworks_av-22f03209ceed3bcdf8c6558fcf02dc7699dde259.zip frameworks_av-22f03209ceed3bcdf8c6558fcf02dc7699dde259.tar.gz frameworks_av-22f03209ceed3bcdf8c6558fcf02dc7699dde259.tar.bz2 | |
Set PREPARING flag after setDataSource_l()
Otherwise the reset_l() inside setDataSource_l() will get stuck
waiting for the PREPARING to be cleared.
Bug: 10426788
Change-Id: I7ccdf7abcea71cf150544c7cd3f4781e3a946b97
Diffstat (limited to 'media/libstagefright/AwesomePlayer.cpp')
| -rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index 52e178e..5fbee7e 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -2805,7 +2805,6 @@ void AwesomePlayer::onAudioTearDownEvent() { // Reset and recreate reset_l(); - mFlags |= PREPARING; status_t err; @@ -2816,6 +2815,7 @@ void AwesomePlayer::onAudioTearDownEvent() { err = setDataSource_l(uri, &uriHeaders); } + mFlags |= PREPARING; if ( err != OK ) { // This will force beingPrepareAsync_l() to notify // a MEDIA_ERROR to the client and abort the prepare |