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

Commit c9729ca1 authored by Insun Kang's avatar Insun Kang
Browse files

Unifying TimedTextDriver's resume() and start(). 

(cherry picked from gtv bb23a2b7e06c59f56e353fd4a2a66a9b8179d425)

Change-Id: If5f14549fa315c34e32d6fed7c1ea09deabceb63
parent 6472badc

include/media/stagefright/timedtext/TimedTextDriver.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ public: 


    status_t start();

    status_t pause();

    status_t resume();

    status_t selectTrack(size_t index);

    status_t unselectTrack(size_t index);
@@ -65,6 +64,7 @@ private: 


    enum State {

        UNINITIALIZED,

        PREPARED,

        PLAYING,

        PAUSED,

    };

media/libstagefright/timedtext/TimedTextDriver.cpp

+19 −22
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ status_t TimedTextDriver::selectTrack_l(size_t index) { 
    source = mTextSourceVector.valueFor(index);

    mPlayer->setDataSource(source);

    if (mState == UNINITIALIZED) {

        mState = PAUSED;

        mState = PREPARED;

    }

    mCurrentTrackIndex = index;

    return OK;
@@ -74,22 +74,23 @@ status_t TimedTextDriver::start() { 
            return INVALID_OPERATION;

        case PLAYING:

            return OK;

        case PAUSED:

        case PREPARED:

            mPlayer->start();

            mState = PLAYING;

            return OK;

        case PAUSED:

            mPlayer->resume();

            mState = PLAYING;

            return OK;

        default:

            TRESPASS();

    }

    return UNKNOWN_ERROR;

}



// TODO: Test if pause() works properly.

// Scenario 1: start - pause - resume

// Scenario 2: start - seek

// Scenario 3: start - pause - seek - resume

status_t TimedTextDriver::pause() {

    Mutex::Autolock autoLock(mLock);

    ALOGV("%s() is called", __FUNCTION__);

    switch (mState) {

        case UNINITIALIZED:

            return INVALID_OPERATION;
@@ -97,24 +98,9 @@ status_t TimedTextDriver::pause() { 
            mPlayer->pause();

            mState = PAUSED;

            return OK;

        case PAUSED:

            return OK;

        default:

            TRESPASS();

    }

    return UNKNOWN_ERROR;

}



status_t TimedTextDriver::resume() {

    Mutex::Autolock autoLock(mLock);

    switch (mState) {

        case UNINITIALIZED:

        case PREPARED:

            return INVALID_OPERATION;

        case PLAYING:

            return OK;

        case PAUSED:

            mPlayer->resume();

            mState = PLAYING;

            return OK;

        default:

            TRESPASS();
@@ -125,8 +111,10 @@ status_t TimedTextDriver::resume() { 
status_t TimedTextDriver::selectTrack(size_t index) {

    status_t ret = OK;

    Mutex::Autolock autoLock(mLock);

    ALOGV("%s() is called", __FUNCTION__);

    switch (mState) {

        case UNINITIALIZED:

        case PREPARED:

        case PAUSED:

            ret = selectTrack_l(index);

            break;
@@ -146,6 +134,7 @@ status_t TimedTextDriver::selectTrack(size_t index) { 


status_t TimedTextDriver::unselectTrack(size_t index) {

    Mutex::Autolock autoLock(mLock);

    ALOGV("%s() is called", __FUNCTION__);

    if (mCurrentTrackIndex != index) {

        return INVALID_OPERATION;

    }
@@ -156,6 +145,7 @@ status_t TimedTextDriver::unselectTrack(size_t index) { 
            mPlayer->pause();

            mState = UNINITIALIZED;

            return OK;

        case PREPARED:

        case PAUSED:

            mState = UNINITIALIZED;

            return OK;
@@ -167,11 +157,18 @@ status_t TimedTextDriver::unselectTrack(size_t index) { 


status_t TimedTextDriver::seekToAsync(int64_t timeUs) {

    Mutex::Autolock autoLock(mLock);

    ALOGV("%s() is called", __FUNCTION__);

    switch (mState) {

        case UNINITIALIZED:

            return INVALID_OPERATION;

        case PREPARED:

            mPlayer->seekToAsync(timeUs);

            mPlayer->pause();

            mState = PAUSED;

            return OK;

        case PAUSED:

            mPlayer->seekToAsync(timeUs);

            mPlayer->pause();

            return OK;

        case PLAYING:

            mPlayer->seekToAsync(timeUs);