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

Commit 29bf0694 authored by Dharmaray Kundargi's avatar Dharmaray Kundargi Committed by Android (Google) Code Review
Browse files

Merge "Fix issue 3369917 :Audio skips at clip edit points" into honeycomb

parents 2e7f31d4 53c567c3

libvideoeditor/lvpp/DummyVideoSource.cpp

+5 −4
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ status_t DummyVideoSource::read( 
    if (options && options->getSeekTo(&seekTimeUs, &seekMode)) {

        seeking = true;

        mImageSeekTime = seekTimeUs;

        M4OSA_clockGetTime(&mImagePlayStartTime, 1000); //1000 time scale for time in ms

    }



    if ((mImageSeekTime == mImageClipDuration) || (mFrameTimeUs == mImageClipDuration)) {

libvideoeditor/lvpp/PreviewPlayer.cpp

+9 −0
Original line number Diff line number Diff line
@@ -508,6 +508,15 @@ VideoEditorAudioPlayer *mVePlayer; 
        mTimeSource = &mSystemTimeSource;

    }



    // Set the seek option for Image source files and read.

    // This resets the timestamping for image play

    if (mIsVideoSourceJpg) {

        MediaSource::ReadOptions options;

        MediaBuffer *aLocalBuffer;

        options.setSeekTo(mSeekTimeUs);

        mVideoSource->read(&aLocalBuffer, &options);

    }



    if (mVideoSource != NULL) {

        // Kick off video playback

        postVideoEvent_l();

libvideoeditor/lvpp/VideoEditorPreviewController.cpp

+1 −2
Original line number Diff line number Diff line
@@ -1160,12 +1160,11 @@ void VideoEditorPreviewController::notify( 
            break;

        case 0xAAAAAAAA:

            LOGV("VIDEO PLAYBACK ALMOST over, prepare next player");

            pController->mPrepareReqest = M4OSA_TRUE;

            // Select next player and prepare it

            // If there is a clip after this one

            if ((pController->mCurrentClipNumber+1) <

             pController->mNumberClipsToPreview) {



                pController->mPrepareReqest = M4OSA_TRUE;

                pController->mCurrentPlayer++;

                if (pController->mCurrentPlayer >= NBPLAYER_INSTANCES) {

                    pController->mCurrentPlayer = 0;