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

Commit 2f6d8c55 authored by Wei Jia's avatar Wei Jia
Browse files

NuPlayer: fix notification when one track is not played. 

One track is not played because it has no sink component.
Test: pass failed cts test
Bug: 37216899
Bug: 24761723

Change-Id: I669d59d6c193794da8973b9dd58bc8eac0b51996
parent dab5aae9

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