Merge "NuPlayer: fix track error notification" (a4421734) · Commits · e / os / android_frameworks_av

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -1171,7 +1171,7 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) {
		if (mSource != nullptr) {
		if (audio) {
		if (mVideoDecoderError \|\| mSource->getFormat(false /* audio */) == NULL
		\|\| mSurface == NULL) {
		\|\| mSurface == NULL \|\| mVideoDecoder == 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);
		@@ -1182,7 +1182,7 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) {
		mAudioDecoderError = true;
		} else {
		if (mAudioDecoderError \|\| mSource->getFormat(true /* audio */) == NULL
		\|\| mAudioSink == NULL) {
		\|\| mAudioSink == NULL \|\| mAudioDecoder == 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);