Propagate errors all the way through the MediaSources and send either... (d7d22eba) · Commits · e / os / android_frameworks_base

include/media/stagefright/AudioPlayer.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@ public:
		status_t seekTo(int64_t time_us);

		bool isSeeking();
		bool reachedEOS();
		bool reachedEOS(status_t *finalStatus);

		private:
		sp<MediaSource> mSource;
		@@ -81,6 +81,7 @@ private:

		bool mSeeking;
		bool mReachedEOS;
		status_t mFinalStatus;
		int64_t mSeekTimeUs;

		bool mStarted;

+1 −0

Original line number	Diff line number	Diff line
		@@ -132,6 +132,7 @@ private:
		PortStatus mPortStatus[2];
		bool mInitialBufferSubmit;
		bool mSignalledEOS;
		status_t mFinalStatus;
		bool mNoMoreOutputData;
		bool mOutputPortSettingsHaveChanged;
		int64_t mSeekTimeUs;

+7 −1

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ AudioPlayer::AudioPlayer(const sp<MediaPlayerBase::AudioSink> &audioSink)
		mPositionTimeRealUs(-1),
		mSeeking(false),
		mReachedEOS(false),
		mFinalStatus(OK),
		mStarted(false),
		mAudioSink(audioSink) {
		}
		@@ -168,6 +169,7 @@ void AudioPlayer::stop() {
		mPositionTimeRealUs = -1;
		mSeeking = false;
		mReachedEOS = false;
		mFinalStatus = OK;
		mStarted = false;
		}

		@@ -181,8 +183,11 @@ bool AudioPlayer::isSeeking() {
		return mSeeking;
		}

		bool AudioPlayer::reachedEOS() {
		bool AudioPlayer::reachedEOS(status_t *finalStatus) {
		*finalStatus = OK;

		Mutex::Autolock autoLock(mLock);
		*finalStatus = mFinalStatus;
		return mReachedEOS;
		}

		@@ -245,6 +250,7 @@ size_t AudioPlayer::fillBuffer(void *data, size_t size) {

		if (err != OK) {
		mReachedEOS = true;
		mFinalStatus = err;
		break;
		}

+17 −6

Original line number	Diff line number	Diff line
		@@ -434,14 +434,22 @@ void AwesomePlayer::onStreamDone() {
		}
		mStreamDoneEventPending = false;

		if (mFlags & LOOPING) {
		if (mStreamDoneStatus == ERROR_END_OF_STREAM && (mFlags & LOOPING)) {
		seekTo_l(0);

		if (mVideoSource != NULL) {
		postVideoEvent_l();
		}
		} else {
		if (mStreamDoneStatus == ERROR_END_OF_STREAM) {
		LOGV("MEDIA_PLAYBACK_COMPLETE");
		notifyListener_l(MEDIA_PLAYBACK_COMPLETE);
		} else {
		LOGV("MEDIA_ERROR %d", mStreamDoneStatus);

		notifyListener_l(
		MEDIA_ERROR, MEDIA_ERROR_UNKNOWN, mStreamDoneStatus);
		}

		pause_l();

		@@ -802,7 +810,7 @@ void AwesomePlayer::onVideoEvent() {
		continue;
		}

		postStreamDoneEvent_l();
		postStreamDoneEvent_l(err);
		return;
		}

		@@ -904,11 +912,13 @@ void AwesomePlayer::postVideoEvent_l(int64_t delayUs) {
		mQueue.postEventWithDelay(mVideoEvent, delayUs < 0 ? 10000 : delayUs);
		}

		void AwesomePlayer::postStreamDoneEvent_l() {
		void AwesomePlayer::postStreamDoneEvent_l(status_t status) {
		if (mStreamDoneEventPending) {
		return;
		}
		mStreamDoneEventPending = true;

		mStreamDoneStatus = status;
		mQueue.postEvent(mStreamDoneEvent);
		}

		@@ -947,9 +957,10 @@ void AwesomePlayer::onCheckAudioStatus() {
		notifyListener_l(MEDIA_SEEK_COMPLETE);
		}

		if (mWatchForAudioEOS && mAudioPlayer->reachedEOS()) {
		status_t finalStatus;
		if (mWatchForAudioEOS && mAudioPlayer->reachedEOS(&finalStatus)) {
		mWatchForAudioEOS = false;
		postStreamDoneEvent_l();
		postStreamDoneEvent_l(finalStatus);
		}

		postCheckAudioStatusEvent_l();

+8 −0

Original line number	Diff line number	Diff line
		@@ -1450,6 +1450,14 @@ status_t MPEG4Source::read(
		&sampleIndex, SampleTable::kSyncSample_Flag);

		if (err != OK) {
		if (err == ERROR_OUT_OF_RANGE) {
		// An attempt to seek past the end of the stream would
		// normally cause this ERROR_OUT_OF_RANGE error. Propagating
		// this all the way to the MediaPlayer would cause abnormal
		// termination. Legacy behaviour appears to be to behave as if
		// we had seeked to the end of stream, ending normally.
		err = ERROR_END_OF_STREAM;
		}
		return err;
		}