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

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

Merge "Fix issue 3404563. Overlay is not seen when the clip is trimmed in the... 

Merge "Fix issue 3404563. Overlay is not seen when the clip is trimmed in the beginning." into honeycomb
parents 7f0ce8d6 254c8dfe

libvideoeditor/lvpp/PreviewPlayer.cpp

+4 −2
Original line number Diff line number Diff line
@@ -926,9 +926,11 @@ void PreviewPlayer::onVideoEvent() { 
                M4OSA_UInt32 timeOffset = mDecVideoTsStoryBoard/1000;

                if(mEffectsSettings[index].VideoEffectType ==

                    M4xVSS_kVideoEffectType_Framing) {

                    if (((mEffectsSettings[index].uiStartTime + 1) <= timeMs + timeOffset) &&

                    if (((mEffectsSettings[index].uiStartTime + 1) <=

                        timeMs + timeOffset - mPlayBeginTimeMsec) &&

                        ((mEffectsSettings[index].uiStartTime - 1 +

                        mEffectsSettings[index].uiDuration) >= timeMs + timeOffset))

                        mEffectsSettings[index].uiDuration) >=

                        timeMs + timeOffset - mPlayBeginTimeMsec))

                    {

                        break;

                    }