Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1

Browse Source 
* commit 'c1b1709b2faa985fb9c2b273ca2191b5bfba5fdd':
  Make sure not to cancel pending seek/EOS notifications on a cache underrun...
This commit is contained in:
Andreas Huber
2011-11-17 09:07:36 -08:00
committed by Android Git Automerger
parent 0551287f6e c1b1709b2f
commit 624efe4567
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
media/libstagefright/AwesomePlayer.cpp
View File

@@ -224,17 +224,18 @@ AwesomePlayer::~AwesomePlayer() {
mClient.disconnect(); mClient.disconnect();
} }
void AwesomePlayer::cancelPlayerEvents(bool keepBufferingGoing) { void AwesomePlayer::cancelPlayerEvents(bool keepNotifications) {
mQueue.cancelEvent(mVideoEvent->eventID()); mQueue.cancelEvent(mVideoEvent->eventID());
mVideoEventPending = false; mVideoEventPending = false;
mQueue.cancelEvent(mStreamDoneEvent->eventID());
mStreamDoneEventPending = false;
mQueue.cancelEvent(mCheckAudioStatusEvent->eventID());
mAudioStatusEventPending = false;
mQueue.cancelEvent(mVideoLagEvent->eventID()); mQueue.cancelEvent(mVideoLagEvent->eventID());
mVideoLagEventPending = false; mVideoLagEventPending = false;
if (!keepBufferingGoing) { if (!keepNotifications) {
mQueue.cancelEvent(mStreamDoneEvent->eventID());
mStreamDoneEventPending = false;
mQueue.cancelEvent(mCheckAudioStatusEvent->eventID());
mAudioStatusEventPending = false;
mQueue.cancelEvent(mBufferingEvent->eventID()); mQueue.cancelEvent(mBufferingEvent->eventID());
mBufferingEventPending = false; mBufferingEventPending = false;
} }
@@ -1095,7 +1096,7 @@ status_t AwesomePlayer::pause_l(bool at_eos) {
return OK; return OK;
} }
cancelPlayerEvents(true /* keepBufferingGoing */); cancelPlayerEvents(true /* keepNotifications */);
if (mAudioPlayer != NULL && (mFlags & AUDIO_RUNNING)) { if (mAudioPlayer != NULL && (mFlags & AUDIO_RUNNING)) {
if (at_eos) { if (at_eos) {

2
media/libstagefright/include/AwesomePlayer.h
View File

@@ -250,7 +250,7 @@ private:
void notifyVideoSize_l(); void notifyVideoSize_l();
void seekAudioIfNecessary_l(); void seekAudioIfNecessary_l();
void cancelPlayerEvents(bool keepBufferingGoing = false); void cancelPlayerEvents(bool keepNotifications = false);
void setAudioSource(sp<MediaSource> source); void setAudioSource(sp<MediaSource> source);
status_t initAudioDecoder(); status_t initAudioDecoder();