Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue 3426489 Overlay background changed when exported" into honeycomb

Browse Source
This commit is contained in:
Dharmaray Kundargi
2011-02-04 19:09:20 -08:00
committed by Android (Google) Code Review
parent b0d34f9c99 ab280b8db6
commit f7f2499638
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
media/java/android/media/videoeditor/MediaArtistNativeHelper.java
View File

@@ -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;
}

20
media/java/android/media/videoeditor/Transition.java
View File

@@ -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;
}