}
//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
#include "VideoEditorPreviewController.h"\r
\r
namespace android {\r
- \r
+\r
#define PREVIEW_THREAD_STACK_SIZE (65536)\r
\r
VideoEditorPreviewController::VideoEditorPreviewController()\r
if(mOutputVideoWidth == 0) {\r
mOutputVideoWidth = pFrameStr->uiFrameWidth;\r
}\r
+\r
if(mOutputVideoHeight == 0) {\r
mOutputVideoHeight = pFrameStr->uiFrameHeight;\r
}\r
}\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
\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