diff options
| author | Chong Zhang <chz@google.com> | 2013-08-29 18:58:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-29 18:58:07 +0000 |
| commit | bdd467edb8550ab006c89a59b556759386e99898 (patch) | |
| tree | 4313d6eb8a90c5838e97b12d72b6280deaafc82d | |
| parent | 45e4eb050d2cd7f2d7433bf1262bd39e3144584e (diff) | |
| parent | 22f03209ceed3bcdf8c6558fcf02dc7699dde259 (diff) | |
| download | frameworks_av-bdd467edb8550ab006c89a59b556759386e99898.zip frameworks_av-bdd467edb8550ab006c89a59b556759386e99898.tar.gz frameworks_av-bdd467edb8550ab006c89a59b556759386e99898.tar.bz2 | |
Merge "Set PREPARING flag after setDataSource_l()" into klp-dev
| -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 |