Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f86731d6 authored by Wei Jia's avatar Wei Jia
Browse files

NuPlayer: fix track error notification 

Audio/video decoder could have been shut down due to error. When the
counter track has error, it should take this into consideration.
Test: MediaPlayer sends out corrent error notification.
Bug: 63116575

Change-Id: Ie31d4e6d9b2bc6715d657a4c8e2dc7c1368257b1
parent f34e3f27

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);