Fix Issues 3395836

Change-Id: I4cf83c99d09b27c92a7789a4c16b2e237011a7fd

diff --git a/libvideoeditor/lvpp/PreviewPlayer.cpp b/libvideoeditor/lvpp/PreviewPlayer.cpp
index 4d63a2f..7ad822b 100644 (file)
--- a/libvideoeditor/lvpp/PreviewPlayer.cpp
+++ b/libvideoeditor/lvpp/PreviewPlayer.cpp
@@ -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

diff --git a/libvideoeditor/lvpp/VideoEditorPreviewController.cpp b/libvideoeditor/lvpp/VideoEditorPreviewController.cpp
index b76eac6..0b7c3ef 100755 (executable)
--- a/libvideoeditor/lvpp/VideoEditorPreviewController.cpp
+++ b/libvideoeditor/lvpp/VideoEditorPreviewController.cpp
@@ -20,7 +20,7 @@
 #include "VideoEditorPreviewController.h"\r
 \r
 namespace android {\r
- \r
+\r
 #define PREVIEW_THREAD_STACK_SIZE                           (65536)\r
 \r
 VideoEditorPreviewController::VideoEditorPreviewController()\r
@@ -763,6 +763,7 @@ M4OSA_ERR VideoEditorPreviewController::renderPreviewFrame(
     if(mOutputVideoWidth == 0) {\r
         mOutputVideoWidth = pFrameStr->uiFrameWidth;\r
     }\r
+\r
     if(mOutputVideoHeight == 0) {\r
         mOutputVideoHeight = pFrameStr->uiFrameHeight;\r
     }\r
@@ -801,9 +802,9 @@ M4OSA_ERR VideoEditorPreviewController::renderPreviewFrame(
         }\r
 \r
         //Provide the overlay Update indication when there is an overlay effect\r
-        if (mCurrentVideoEffect == VIDEO_EFFECT_FRAMING) {\r
+        if (mCurrentVideoEffect & VIDEO_EFFECT_FRAMING) {\r
             int index;\r
-            mCurrentVideoEffect = VIDEO_EFFECT_NONE; //never apply framing here.\r
+            mCurrentVideoEffect &= ~VIDEO_EFFECT_FRAMING; //never apply framing here.\r
 \r
             // Find the effect in effectSettings array\r
             for (index = 0; index < mNumberEffects; index++) {\r
@@ -1304,14 +1305,14 @@ M4OSA_ERR VideoEditorPreviewController::applyVideoEffect(
 \r
     mTarget->getBufferYV12(&(postProcessParams.pOutBuffer), &(postProcessParams.outBufferStride));\r
 \r
-    err = applyEffectsAndRenderingMode(&postProcessParams, mOutputVideoWidth, mOutputVideoHeight);\r
+    err = applyEffectsAndRenderingMode(&postProcessParams, videoWidth, videoHeight);\r
     return err;\r
 }\r
 \r
 M4OSA_ERR VideoEditorPreviewController::setPreviewFrameRenderingMode(\r
     M4xVSS_MediaRendering mode, M4VIDEOEDITING_VideoFrameSize outputVideoSize) {\r
 \r
-    //LOGV("setMediaRenderingMode: outputVideoSize = %d", outputVideoSize);\r
+    LOGV("setMediaRenderingMode: outputVideoSize = %d", outputVideoSize);\r
     mRenderingMode = mode;\r
 \r
     switch(outputVideoSize) {\r