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

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

Fix Issues 3395836

Change-Id: I4cf83c99d09b27c92a7789a4c16b2e237011a7fd
parent e6c0750c
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -905,8 +905,8 @@ void PreviewPlayer::onVideoEvent() {
    }

    //Provide the overlay Update indication when there is an overlay effect
    if (mCurrentVideoEffect == VIDEO_EFFECT_FRAMING) {
        mCurrentVideoEffect = VIDEO_EFFECT_NONE; //never apply framing here.
    if (mCurrentVideoEffect & VIDEO_EFFECT_FRAMING) {
        mCurrentVideoEffect &= ~VIDEO_EFFECT_FRAMING; //never apply framing here.
        if (!mOverlayUpdateEventPosted) {

            // Find the effect in effectSettings array
+6 −5
Original line number Diff line number Diff line
@@ -763,6 +763,7 @@ M4OSA_ERR VideoEditorPreviewController::renderPreviewFrame(
    if(mOutputVideoWidth == 0) {
        mOutputVideoWidth = pFrameStr->uiFrameWidth;
    }

    if(mOutputVideoHeight == 0) {
        mOutputVideoHeight = pFrameStr->uiFrameHeight;
    }
@@ -801,9 +802,9 @@ M4OSA_ERR VideoEditorPreviewController::renderPreviewFrame(
        }

        //Provide the overlay Update indication when there is an overlay effect
        if (mCurrentVideoEffect == VIDEO_EFFECT_FRAMING) {
        if (mCurrentVideoEffect & VIDEO_EFFECT_FRAMING) {
            int index;
            mCurrentVideoEffect = VIDEO_EFFECT_NONE; //never apply framing here.
            mCurrentVideoEffect &= ~VIDEO_EFFECT_FRAMING; //never apply framing here.

            // Find the effect in effectSettings array
            for (index = 0; index < mNumberEffects; index++) {
@@ -1304,14 +1305,14 @@ M4OSA_ERR VideoEditorPreviewController::applyVideoEffect(

    mTarget->getBufferYV12(&(postProcessParams.pOutBuffer), &(postProcessParams.outBufferStride));

    err = applyEffectsAndRenderingMode(&postProcessParams, mOutputVideoWidth, mOutputVideoHeight);
    err = applyEffectsAndRenderingMode(&postProcessParams, videoWidth, videoHeight);
    return err;
}

M4OSA_ERR VideoEditorPreviewController::setPreviewFrameRenderingMode(
    M4xVSS_MediaRendering mode, M4VIDEOEDITING_VideoFrameSize outputVideoSize) {

    //LOGV("setMediaRenderingMode: outputVideoSize = %d", outputVideoSize);
    LOGV("setMediaRenderingMode: outputVideoSize = %d", outputVideoSize);
    mRenderingMode = mode;

    switch(outputVideoSize) {