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

Commit 1ba22239 authored by Wonsik Kim's avatar Wonsik Kim Committed by android-build-merger
Browse files

Merge "Fix cannot play issue after seeking for Vorbis Playback." am:... 

Merge "Fix cannot play issue after seeking for Vorbis Playback." am: 3e0608b6 am: 3258fc04 am: cc51e690
am: ba293e43

Change-Id: I4ea41b5c52d5be44010de60de0dfc473771872f6
parents 9b34fb90 ba293e43

media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp

+7 −5
Original line number Diff line number Diff line
@@ -572,18 +572,19 @@ void SoftVorbis::onQueueFilled(OMX_U32 /* portIndex */) { 
}



void SoftVorbis::onPortFlushCompleted(OMX_U32 portIndex) {

    if (portIndex == 0 && mState != NULL) {

        // Make sure that the next buffer output does not still

        // depend on fragments from the last one decoded.



    if (portIndex == 0) {

        mInputBufferCount = 0;

        mNumFramesOutput = 0;

        mSawInputEos = false;

        mSignalledOutputEos = false;

        mNumFramesLeftOnPage = -1;

        if (mState != NULL) {

            // Make sure that the next buffer output does not still

            // depend on fragments from the last one decoded.

            vorbis_dsp_restart(mState);

        }

    }

}



void SoftVorbis::onReset() {

    mInputBufferCount = 0;
@@ -603,6 +604,7 @@ void SoftVorbis::onReset() { 
    mSawInputEos = false;

    mSignalledOutputEos = false;

    mSignalledError = false;

    mNumFramesLeftOnPage = -1;

    mOutputPortSettingsChange = NONE;

}