diff --git a/modules/OpticalFlowDualTVL1.cpp b/modules/OpticalFlowDualTVL1.cpp index fdd412e..bd619b8 100644 --- a/modules/OpticalFlowDualTVL1.cpp +++ b/modules/OpticalFlowDualTVL1.cpp @@ -41,8 +41,14 @@ OpticalFlowDualTVL1::OpticalFlowDualTVL1() m_pchModuleName = "OpticalFlowDualTVL1"; m_pchModuleTooltip = "Measure optical flow"; m_uiNumberOfFrames = MODULE_REQUIRES_TWO_FRAMES; - m_uiModuleRequirements = MODULE_REQUIRES_SKIP_WHILE_PLAY | MODULE_REQUIRES_NEW_WINDOW; + m_uiModuleRequirements = MODULE_REQUIRES_SKIP_WHILE_PLAY | MODULE_REQUIRES_NEW_WINDOW | MODULE_REQUIRES_OPTIONS; + + m_cModuleOptions.addOptions()/**/ + ( "Show reconstruction", m_bShowReconstruction, "Show reconstructed frame instead of MVs [false]" ); + + m_bShowReconstruction = false; m_pcOutputFrame = NULL; + } Bool OpticalFlowDualTVL1::create( std::vector apcFrameList ) @@ -121,8 +127,8 @@ Void OpticalFlowDualTVL1::compensateFlow() PlaYUVerFrame* OpticalFlowDualTVL1::process( std::vector apcFrameList ) { - m_pcFramePrev = apcFrameList[0]; - m_pcFrameAfter = apcFrameList[1]; + m_pcFrameAfter = apcFrameList[0]; + m_pcFramePrev = apcFrameList[1]; Mat cvMatPrev, cvMatAfter; if( !m_pcFramePrev->toMat( cvMatPrev, true ) || !m_pcFrameAfter->toMat( cvMatAfter, true ) ) @@ -131,6 +137,7 @@ PlaYUVerFrame* OpticalFlowDualTVL1::process( std::vector apcFram } m_cTvl1->calc( cvMatPrev, cvMatAfter, m_cvFlow ); +// drawFlow(); compensateFlow(); return m_pcOutputFrame; diff --git a/modules/OpticalFlowDualTVL1.h b/modules/OpticalFlowDualTVL1.h index 0a300e2..eb7c012 100644 --- a/modules/OpticalFlowDualTVL1.h +++ b/modules/OpticalFlowDualTVL1.h @@ -34,6 +34,7 @@ class OpticalFlowDualTVL1: public PlaYUVerModuleIf REGISTER_CLASS_FACTORY( OpticalFlowDualTVL1 ) private: + Bool m_bShowReconstruction; Int m_iStep; cv::Ptr m_cTvl1; cv::Mat_ m_cvFlow;