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

Commit ab280b8d authored by Dharmaray Kundargi's avatar Dharmaray Kundargi
Browse files

Fix issue 3426489 Overlay background changed when exported 

Change-Id: I53d05732f6de6363cfb64fc84b2539e957adfcd6
parent b894f895

media/java/android/media/videoeditor/MediaArtistNativeHelper.java

+8 −6
Original line number Diff line number Diff line
@@ -2555,21 +2555,23 @@ class MediaArtistNativeHelper { 


        final List<Effect> effects = m.getAllEffects();

        final List<Overlay> overlays = m.getAllOverlays();

        for (Effect effect : effects) {

            if (effect instanceof EffectColor) {

                effectSettings[i] = getEffectSettings((EffectColor)effect);



        for (Overlay overlay : overlays) {

            effectSettings[i] = getOverlaySettings((OverlayFrame)overlay);

            adjustEffectsStartTimeAndDuration(effectSettings[i], beginCutTime, endCutTime);

            effectSettings[i].startTime += storyBoardTime;

            i++;

        }

        }



        for (Overlay overlay : overlays) {

            effectSettings[i] = getOverlaySettings((OverlayFrame)overlay);

        for (Effect effect : effects) {

            if (effect instanceof EffectColor) {

                effectSettings[i] = getEffectSettings((EffectColor)effect);

                adjustEffectsStartTimeAndDuration(effectSettings[i], beginCutTime, endCutTime);

                effectSettings[i].startTime += storyBoardTime;

                i++;

            }

        }



        return i;

    }

media/java/android/media/videoeditor/Transition.java

+11 −9
Original line number Diff line number Diff line
@@ -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;

    }