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

Commit eac28ab8 authored by Hong Teng's avatar Hong Teng
Browse files

Fix for 5154138 Titles are not aligned properly in a exported movie from Movie Studio 

Apply frame effect(overlay) after rendering mode was done

Change-Id: I1ff9cc868117cc8dcdc735e6854ff429b74e8154
parent 2534acb8

libvideoeditor/vss/inc/M4VSS3GPP_InternalTypes.h

+3 −0
Original line number Diff line number Diff line
@@ -607,6 +607,9 @@ typedef struct 
    M4OSA_Bool               bEncodeTillEoF;

    M4xVSS_EditSettings      xVSS;

    M4OSA_Context            m_air_context;



    M4OSA_Bool bClip1ActiveFramingEffect; /**< Overlay flag for clip1 */

    M4OSA_Bool bClip2ActiveFramingEffect; /**< Overlay flag for clip2, used in transition */

} M4VSS3GPP_InternalEditContext;

libvideoeditor/vss/src/M4VSS3GPP_Edit.c

+13 −4
Original line number Diff line number Diff line
@@ -157,6 +157,8 @@ M4OSA_ERR M4VSS3GPP_editInit( M4VSS3GPP_EditContext *pContext, 
    pC->pEffectsList = M4OSA_NULL;

    pC->pActiveEffectsList = M4OSA_NULL;

    pC->pActiveEffectsList1 = M4OSA_NULL;

    pC->bClip1ActiveFramingEffect = M4OSA_FALSE;

    pC->bClip2ActiveFramingEffect = M4OSA_FALSE;

    pC->uiCurrentClip = 0;

    pC->pC1 = M4OSA_NULL;

    pC->pC2 = M4OSA_NULL;
@@ -602,6 +604,8 @@ M4OSA_ERR M4VSS3GPP_editOpen( M4VSS3GPP_EditContext pContext, 
        pC->pEffectsList = M4OSA_NULL;

        pC->pActiveEffectsList = M4OSA_NULL;

        pC->pActiveEffectsList1 = M4OSA_NULL;

        pC->bClip1ActiveFramingEffect = M4OSA_FALSE;

        pC->bClip2ActiveFramingEffect = M4OSA_FALSE;

    }



    /**
@@ -2902,6 +2906,8 @@ static M4OSA_ERR M4VSS3GPP_intSwitchToNextClip( 
            pC->pC1->m_pPreResizeFrame = pC->pC2->m_pPreResizeFrame;

        }

        pC->pC2 = M4OSA_NULL;

        pC->bClip1ActiveFramingEffect = pC->bClip2ActiveFramingEffect;

        pC->bClip2ActiveFramingEffect = M4OSA_FALSE;

    }

    /**

    * else open it */
@@ -3247,12 +3253,15 @@ M4OSA_ERR M4VSS3GPP_intOpenClip( M4VSS3GPP_InternalEditContext *pC, 
        /* Video resize management   */

        /******************************/

        /**

        * Compare input video size with output video size

          to check if resize needed */

        * If the input clip is a rotate video or the output resolution is different

        * from the input resolution, then the video frame needs to be rotated

        * or resized, force to resize mode */

        if (((M4OSA_UInt32)pC->ewc.uiVideoWidth !=

                 pClipProperties->uiVideoWidth) ||

            ((M4OSA_UInt32)pC->ewc.uiVideoHeight !=

                 pClipProperties->uiVideoHeight)) {

                 pClipProperties->uiVideoHeight) ||

            pClipProperties->videoRotationDegrees != 0) {



            if (pClip->m_pPreResizeFrame == M4OSA_NULL) {

                /**

                * Allocate the intermediate video plane that will