commit 254c8dfe514fd45eef251763639f63615379570f
author Dharmaray Kundargi <dharmaray@google.com> Fri Jan 28 19:28:31 2011 -0800
committer Dharmaray Kundargi <dharmaray@google.com> Fri Jan 28 19:28:31 2011 -0800
tree be43d7dd3dcce0a4ebbf7ad935f90be87d0fbf8e
parent eab39fb973444f2c03b0e92d4df263b83c31f71b

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

Change-Id: Iec0fcea164f6909283c8686605378c3e1db127f0

libvideoeditor/lvpp/PreviewPlayer.cpp

diff --git a/libvideoeditor/lvpp/PreviewPlayer.cpp b/libvideoeditor/lvpp/PreviewPlayer.cpp
index a23e6ca..242db5e 100644
--- a/libvideoeditor/lvpp/PreviewPlayer.cpp
+++ b/libvideoeditor/lvpp/PreviewPlayer.cpp
@@ -926,9 +926,11 @@
                 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;
                     }