Merge "NuPlayer: fix notification when one track is not played." into oc-dev (f4b7240b) · Commits · e / os / android_frameworks_av

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

+4 −2

Original line number	Diff line number	Diff line
		@@ -1159,7 +1159,8 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) {
		}
		if (mSource != nullptr) {
		if (audio) {
		if (mVideoDecoderError \|\| mSource->getFormat(false /* audio */) == NULL) {
		if (mVideoDecoderError \|\| mSource->getFormat(false /* audio */) == NULL
		\|\| mSurface == NULL) {
		// When both audio and video have error, or this stream has only audio
		// which has error, notify client of error.
		notifyListener(MEDIA_ERROR, MEDIA_ERROR_UNKNOWN, err);
		@@ -1169,7 +1170,8 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) {
		}
		mAudioDecoderError = true;
		} else {
		if (mAudioDecoderError \|\| mSource->getFormat(true /* audio */) == NULL) {
		if (mAudioDecoderError \|\| mSource->getFormat(true /* audio */) == NULL
		\|\| mAudioSink == NULL) {
		// When both audio and video have error, or this stream has only video
		// which has error, notify client of error.
		notifyListener(MEDIA_ERROR, MEDIA_ERROR_UNKNOWN, err);