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

Commit 686e8e57 authored by Wei Jia's avatar Wei Jia
Browse files

NuPlayer: notify client of playback error of individual track. 

Test: mediaplayer doesn't send error notify to client when only one
track has error.
Bug: 24761723
Change-Id: Ie956f2c29483ac722a75bea86d649ce6d934a43d
parent 34bc4d97

media/libmedia/include/mediaplayer.h

+4 −0
Original line number Diff line number Diff line
@@ -133,6 +133,10 @@ enum media_info_type { 
    MEDIA_INFO_NOT_SEEKABLE = 801,

    // New media metadata is available.

    MEDIA_INFO_METADATA_UPDATE = 802,

    // Audio can not be played.

    MEDIA_INFO_PLAY_AUDIO_ERROR = 804,

    // Video can not be played.

    MEDIA_INFO_PLAY_VIDEO_ERROR = 805,



    //9xx

    MEDIA_INFO_TIMED_TEXT_ERROR = 900,

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

+30 −1
Original line number Diff line number Diff line
@@ -197,6 +197,8 @@ NuPlayer::NuPlayer(pid_t pid) 
      mPrepared(false),

      mResetting(false),

      mSourceStarted(false),

      mAudioDecoderError(false),

      mVideoDecoderError(false),

      mPaused(false),

      mPausedByClient(true),

      mPausedForBuffering(false),
@@ -1093,12 +1095,14 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) { 
                ALOGV("%s shutdown completed", audio ? "audio" : "video");

                if (audio) {

                    mAudioDecoder.clear();

                    mAudioDecoderError = false;

                    ++mAudioDecoderGeneration;



                    CHECK_EQ((int)mFlushingAudio, (int)SHUTTING_DOWN_DECODER);

                    mFlushingAudio = SHUT_DOWN;

                } else {

                    mVideoDecoder.clear();

                    mVideoDecoderError = false;

                    ++mVideoDecoderGeneration;



                    CHECK_EQ((int)mFlushingVideo, (int)SHUTTING_DOWN_DECODER);
@@ -1153,7 +1157,29 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) { 
                        finishFlushIfPossible();  // Should not occur.

                        break;                    // Finish anyways.

                }

                if (mSource != nullptr) {

                    if (audio) {

                        if (mVideoDecoderError || mSource->getFormat(false /* audio */) == 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);

                        } else {

                            // Only audio track has error. Video track could be still good to play.

                            notifyListener(MEDIA_INFO, MEDIA_INFO_PLAY_AUDIO_ERROR, err);

                        }

                        mAudioDecoderError = true;

                    } else {

                        if (mAudioDecoderError || mSource->getFormat(true /* audio */) == 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);

                        } else {

                            // Only video track has error. Audio track could be still good to play.

                            notifyListener(MEDIA_INFO, MEDIA_INFO_PLAY_VIDEO_ERROR, err);

                        }

                        mVideoDecoderError = true;

                    }

                }

            } else {

                ALOGV("Unhandled decoder notification %d '%c%c%c%c'.",

                      what,
@@ -1637,6 +1663,7 @@ void NuPlayer::restartAudio( 
    if (mAudioDecoder != NULL) {

        mAudioDecoder->pause();

        mAudioDecoder.clear();

        mAudioDecoderError = false;

        ++mAudioDecoderGeneration;

    }

    if (mFlushingAudio == FLUSHING_DECODER) {
@@ -1774,6 +1801,7 @@ status_t NuPlayer::instantiateDecoder( 
            *decoder = new Decoder(notify, mSource, mPID, mUID, mRenderer);

            ALOGV("instantiateDecoder audio Decoder");

        }

        mAudioDecoderError = false;

    } else {

        sp<AMessage> notify = new AMessage(kWhatVideoNotify, this);

        ++mVideoDecoderGeneration;
@@ -1781,6 +1809,7 @@ status_t NuPlayer::instantiateDecoder( 


        *decoder = new Decoder(

                notify, mSource, mPID, mUID, mRenderer, mSurface, mCCDecoder);

        mVideoDecoderError = false;



        // enable FRC if high-quality AV sync is requested, even if not

        // directly queuing to display, as this will even improve textureview

media/libmediaplayerservice/nuplayer/NuPlayer.h

+2 −0
Original line number Diff line number Diff line
@@ -218,6 +218,8 @@ private: 
    bool mPrepared;

    bool mResetting;

    bool mSourceStarted;

    bool mAudioDecoderError;

    bool mVideoDecoderError;



    // Actual pause state, either as requested by client or due to buffering.

    bool mPaused;