diff options
| -rw-r--r-- | media/java/android/media/videoeditor/MediaArtistNativeHelper.java | 14 | ||||
| -rwxr-xr-x | media/java/android/media/videoeditor/Transition.java | 20 |
2 files changed, 19 insertions, 15 deletions
diff --git a/media/java/android/media/videoeditor/MediaArtistNativeHelper.java b/media/java/android/media/videoeditor/MediaArtistNativeHelper.java index 806b2845baa8..8214e7fffeb4 100644 --- a/media/java/android/media/videoeditor/MediaArtistNativeHelper.java +++ b/media/java/android/media/videoeditor/MediaArtistNativeHelper.java @@ -2555,6 +2555,14 @@ class MediaArtistNativeHelper { final List<Effect> effects = m.getAllEffects(); final List<Overlay> overlays = m.getAllOverlays(); + + for (Overlay overlay : overlays) { + effectSettings[i] = getOverlaySettings((OverlayFrame)overlay); + adjustEffectsStartTimeAndDuration(effectSettings[i], beginCutTime, endCutTime); + effectSettings[i].startTime += storyBoardTime; + i++; + } + for (Effect effect : effects) { if (effect instanceof EffectColor) { effectSettings[i] = getEffectSettings((EffectColor)effect); @@ -2564,12 +2572,6 @@ class MediaArtistNativeHelper { } } - for (Overlay overlay : overlays) { - effectSettings[i] = getOverlaySettings((OverlayFrame)overlay); - adjustEffectsStartTimeAndDuration(effectSettings[i], beginCutTime, endCutTime); - effectSettings[i].startTime += storyBoardTime; - i++; - } return i; } diff --git a/media/java/android/media/videoeditor/Transition.java b/media/java/android/media/videoeditor/Transition.java index 4d1bafbc6a32..95f002c442f2 100755 --- a/media/java/android/media/videoeditor/Transition.java +++ b/media/java/android/media/videoeditor/Transition.java @@ -288,6 +288,16 @@ public abstract class Transition { List<EffectSettings> effectSettings = new ArrayList<EffectSettings>(); EffectSettings tmpEffectSettings; + overlays = m.getAllOverlays(); + for (Overlay overlay : overlays) { + tmpEffectSettings = mNativeHelper.getOverlaySettings((OverlayFrame)overlay); + mNativeHelper.adjustEffectsStartTimeAndDuration(tmpEffectSettings, + clipSettings.beginCutTime, clipSettings.endCutTime); + if (tmpEffectSettings.duration != 0) { + effectSettings.add(tmpEffectSettings); + } + } + effects = m.getAllEffects(); for (Effect effect : effects) { if (effect instanceof EffectColor) { @@ -303,15 +313,7 @@ public abstract class Transition { } } } - overlays = m.getAllOverlays(); - for (Overlay overlay : overlays) { - tmpEffectSettings = mNativeHelper.getOverlaySettings((OverlayFrame)overlay); - mNativeHelper.adjustEffectsStartTimeAndDuration(tmpEffectSettings, - clipSettings.beginCutTime, clipSettings.endCutTime); - if (tmpEffectSettings.duration != 0) { - effectSettings.add(tmpEffectSettings); - } - } + return effectSettings; } |