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

Commit 33f45b51 authored by Wei Jia's avatar Wei Jia Committed by Android Git Automerger
Browse files

am 6200e7f4: am 5cccfce1: Merge "AnotherPacketSource.cpp: Do not queue... 

am 6200e7f4: am 5cccfce1: Merge "AnotherPacketSource.cpp: Do not queue discontinity signal buffer resulted from seek." into lmp-mr1-dev automerge: e86c6d59

* commit '6200e7f4':
  AnotherPacketSource.cpp: Do not queue discontinity signal buffer resulted from seek.
parents ac4189aa 6200e7f4

media/libmediaplayerservice/nuplayer/GenericSource.cpp

+3 −5
Original line number Diff line number Diff line
@@ -1311,11 +1311,9 @@ void NuPlayer::GenericSource::readBuffer( 
            if ((seeking || formatChange)

                    && (trackType == MEDIA_TRACK_TYPE_AUDIO

                    || trackType == MEDIA_TRACK_TYPE_VIDEO)) {

                ATSParser::DiscontinuityType type = formatChange

                        ? (seeking

                ATSParser::DiscontinuityType type = (formatChange && seeking)

                        ? ATSParser::DISCONTINUITY_FORMATCHANGE

                                : ATSParser::DISCONTINUITY_NONE)

                        : ATSParser::DISCONTINUITY_SEEK;

                        : ATSParser::DISCONTINUITY_NONE;

                track->mPackets->queueDiscontinuity( type, NULL, true /* discard */);

            }

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

+35 −42
Original line number Diff line number Diff line
@@ -95,21 +95,21 @@ private: 
    DISALLOW_EVIL_CONSTRUCTORS(SetSurfaceAction);

};



struct NuPlayer::ShutdownDecoderAction : public Action {

    ShutdownDecoderAction(bool audio, bool video)

struct NuPlayer::FlushDecoderAction : public Action {

    FlushDecoderAction(FlushCommand audio, FlushCommand video)

        : mAudio(audio),

          mVideo(video) {

    }



    virtual void execute(NuPlayer *player) {

        player->performDecoderShutdown(mAudio, mVideo);

        player->performDecoderFlush(mAudio, mVideo);

    }



private:

    bool mAudio;

    bool mVideo;

    FlushCommand mAudio;

    FlushCommand mVideo;



    DISALLOW_EVIL_CONSTRUCTORS(ShutdownDecoderAction);

    DISALLOW_EVIL_CONSTRUCTORS(FlushDecoderAction);

};



struct NuPlayer::PostMessageAction : public Action {
@@ -522,19 +522,24 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) { 
        {

            ALOGV("kWhatSetVideoNativeWindow");



            mDeferredActions.push_back(

                    new ShutdownDecoderAction(

                        false /* audio */, true /* video */));



            sp<RefBase> obj;

            CHECK(msg->findObject("native-window", &obj));



            if (mSource->getFormat(false /* audio */) == NULL) {

                performSetSurface(static_cast<NativeWindowWrapper *>(obj.get()));

                break;

            }



            mDeferredActions.push_back(

                    new FlushDecoderAction(FLUSH_CMD_FLUSH /* audio */,

                                           FLUSH_CMD_SHUTDOWN /* video */));



            mDeferredActions.push_back(

                    new SetSurfaceAction(

                        static_cast<NativeWindowWrapper *>(obj.get())));



            if (obj != NULL) {

                if (mStarted && mSource->getFormat(false /* audio */) != NULL) {

                if (mStarted) {

                    // Issue a seek to refresh the video screen only if started otherwise

                    // the extractor may not yet be started and will assert.

                    // If the video decoder is not set (perhaps audio only in this case)
@@ -749,7 +754,9 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) { 
                switch (*flushing) {

                    case NONE:

                        mDeferredActions.push_back(

                                new ShutdownDecoderAction(audio, !audio /* video */));

                                new FlushDecoderAction(

                                    audio ? FLUSH_CMD_SHUTDOWN : FLUSH_CMD_NONE,

                                    audio ? FLUSH_CMD_NONE : FLUSH_CMD_SHUTDOWN));

                        processDeferredActions();

                        break;

                    case FLUSHING_DECODER:
@@ -872,8 +879,9 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) { 
            ALOGV("kWhatReset");



            mDeferredActions.push_back(

                    new ShutdownDecoderAction(

                        true /* audio */, true /* video */));

                    new FlushDecoderAction(

                        FLUSH_CMD_SHUTDOWN /* audio */,

                        FLUSH_CMD_SHUTDOWN /* video */));



            mDeferredActions.push_back(

                    new SimpleAction(&NuPlayer::performReset));
@@ -893,7 +901,8 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) { 
                    seekTimeUs, needNotify);



            mDeferredActions.push_back(

                    new SimpleAction(&NuPlayer::performDecoderFlush));

                    new FlushDecoderAction(FLUSH_CMD_FLUSH /* audio */,

                                           FLUSH_CMD_FLUSH /* video */));



            mDeferredActions.push_back(

                    new SeekAction(seekTimeUs, needNotify));
@@ -1625,7 +1634,9 @@ void NuPlayer::queueDecoderShutdown( 
    ALOGI("queueDecoderShutdown audio=%d, video=%d", audio, video);



    mDeferredActions.push_back(

            new ShutdownDecoderAction(audio, video));

            new FlushDecoderAction(

                audio ? FLUSH_CMD_SHUTDOWN : FLUSH_CMD_NONE,

                video ? FLUSH_CMD_SHUTDOWN : FLUSH_CMD_NONE));



    mDeferredActions.push_back(

            new SimpleAction(&NuPlayer::performScanSources));
@@ -1770,40 +1781,22 @@ void NuPlayer::performSeek(int64_t seekTimeUs, bool needNotify) { 
    // everything's flushed, continue playback.

}



void NuPlayer::performDecoderFlush() {

    ALOGV("performDecoderFlush");



    if (mAudioDecoder == NULL && mVideoDecoder == NULL) {

        return;

    }



    mTimeDiscontinuityPending = true;



    if (mAudioDecoder != NULL) {

        flushDecoder(true /* audio */, false /* needShutdown */);

    }



    if (mVideoDecoder != NULL) {

        flushDecoder(false /* audio */, false /* needShutdown */);

    }

}



void NuPlayer::performDecoderShutdown(bool audio, bool video) {

    ALOGV("performDecoderShutdown audio=%d, video=%d", audio, video);

void NuPlayer::performDecoderFlush(FlushCommand audio, FlushCommand video) {

    ALOGV("performDecoderFlush audio=%d, video=%d", audio, video);



    if ((!audio || mAudioDecoder == NULL)

            && (!video || mVideoDecoder == NULL)) {

    if ((audio == FLUSH_CMD_NONE || mAudioDecoder == NULL)

            && (video == FLUSH_CMD_NONE || mVideoDecoder == NULL)) {

        return;

    }



    mTimeDiscontinuityPending = true;



    if (audio && mAudioDecoder != NULL) {

        flushDecoder(true /* audio */, true /* needShutdown */);

    if (audio != FLUSH_CMD_NONE && mAudioDecoder != NULL) {

        flushDecoder(true /* audio */, (audio == FLUSH_CMD_SHUTDOWN));

    }



    if (video && mVideoDecoder != NULL) {

        flushDecoder(false /* audio */, true /* needShutdown */);

    if (video != FLUSH_CMD_NONE && mVideoDecoder != NULL) {

        flushDecoder(false /* audio */, (video == FLUSH_CMD_SHUTDOWN));

    }

}

media/libmediaplayerservice/nuplayer/NuPlayer.h

+8 −3
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ private: 
    struct Action;

    struct SeekAction;

    struct SetSurfaceAction;

    struct ShutdownDecoderAction;

    struct FlushDecoderAction;

    struct PostMessageAction;

    struct SimpleAction;
@@ -159,6 +159,12 @@ private: 
        SHUT_DOWN,

    };



    enum FlushCommand {

        FLUSH_CMD_NONE,

        FLUSH_CMD_FLUSH,

        FLUSH_CMD_SHUTDOWN,

    };



    // Once the current flush is complete this indicates whether the

    // notion of time has changed.

    bool mTimeDiscontinuityPending;
@@ -229,8 +235,7 @@ private: 
    void processDeferredActions();



    void performSeek(int64_t seekTimeUs, bool needNotify);

    void performDecoderFlush();

    void performDecoderShutdown(bool audio, bool video);

    void performDecoderFlush(FlushCommand audio, FlushCommand video);

    void performReset();

    void performScanSources();

    void performSetSurface(const sp<NativeWindowWrapper> &wrapper);

media/libmediaplayerservice/nuplayer/RTSPSource.cpp

+1 −1
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ void NuPlayer::RTSPSource::onMessageReceived(const sp<AMessage> &msg) { 
            sp<AnotherPacketSource> source = info->mSource;

            if (source != NULL) {

                source->queueDiscontinuity(

                        ATSParser::DISCONTINUITY_SEEK,

                        ATSParser::DISCONTINUITY_TIME,

                        NULL,

                        true /* discard */);

            }

media/libmediaplayerservice/nuplayer/StreamingSource.cpp

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ status_t NuPlayer::StreamingSource::feedMoreTSData() { 
            mFinalResult = ERROR_END_OF_STREAM;

            break;

        } else if (n == INFO_DISCONTINUITY) {

            int32_t type = ATSParser::DISCONTINUITY_SEEK;

            int32_t type = ATSParser::DISCONTINUITY_TIME;



            int32_t mask;

            if (extra != NULL
@@ -118,7 +118,7 @@ status_t NuPlayer::StreamingSource::feedMoreTSData() { 


                mTSParser->signalDiscontinuity(

                        ((type & 1) == 0)

                            ? ATSParser::DISCONTINUITY_SEEK

                            ? ATSParser::DISCONTINUITY_TIME

                            : ATSParser::DISCONTINUITY_FORMATCHANGE,

                        extra);

            } else {