Init the version 2 of module API. The process functions include a std vector and the create function signals if the module can be created with the chosen inputs
This commit is contained in:
1 parent
551b5d617d
commit
4508dcb178
10 files changed
+162
-70
No files matched your search
@@ -31,6 +31,7 @@ namespace plaYUVer
|
||||
AbsoluteFrameDifference::AbsoluteFrameDifference()
|
||||
{
|
||||
/* Module Definition */
|
||||
m_iModuleAPI = MODULE_API_2;
|
||||
m_iModuleType = FRAME_PROCESSING_MODULE;
|
||||
m_pchModuleCategory = "Measurements";
|
||||
m_pchModuleName = "AbsoluteFrameDifference";
|
||||
@@ -40,13 +41,16 @@ AbsoluteFrameDifference::AbsoluteFrameDifference()
|
||||
m_pcFrameDifference = NULL;
|
||||
}
|
||||
|
||||
Void AbsoluteFrameDifference::create( PlaYUVerFrame* Input )
|
||||
Bool AbsoluteFrameDifference::create( std::vector<PlaYUVerFrame*> apcFrameList )
|
||||
{
|
||||
m_pcFrameDifference = new PlaYUVerFrame( Input->getWidth(), Input->getHeight(), PlaYUVerFrame::GRAY );
|
||||
m_pcFrameDifference = new PlaYUVerFrame( apcFrameList[0]->getWidth(), apcFrameList[0]->getHeight(), PlaYUVerFrame::GRAY );
|
||||
return true;
|
||||
}
|
||||
|
||||
PlaYUVerFrame* AbsoluteFrameDifference::process( PlaYUVerFrame* Input1, PlaYUVerFrame* Input2 )
|
||||
PlaYUVerFrame* AbsoluteFrameDifference::process( std::vector<PlaYUVerFrame*> apcFrameList )
|
||||
{
|
||||
PlaYUVerFrame* Input1 = apcFrameList[0];
|
||||
PlaYUVerFrame* Input2 = apcFrameList[1];
|
||||
Pel* pInput1PelYUV = Input1->getPelBufferYUV()[0][0];
|
||||
Pel* pInput2PelYUV = Input2->getPelBufferYUV()[0][0];
|
||||
Pel* pOutputPelYUV = m_pcFrameDifference->getPelBufferYUV()[0][0];
|
||||
|
||||
@@ -34,7 +34,7 @@ namespace plaYUVer
|
||||
|
||||
class AbsoluteFrameDifference: public PlaYUVerModuleIf
|
||||
{
|
||||
REGISTER_CLASS_FACTORY( AbsoluteFrameDifference )
|
||||
REGISTER_CLASS_FACTORY( AbsoluteFrameDifference )
|
||||
|
||||
private:
|
||||
PlaYUVerFrame* m_pcFrameDifference;
|
||||
@@ -44,8 +44,8 @@ public:
|
||||
virtual ~AbsoluteFrameDifference()
|
||||
{
|
||||
}
|
||||
Void create( PlaYUVerFrame* Input );
|
||||
PlaYUVerFrame* process( PlaYUVerFrame* Input1, PlaYUVerFrame* Input2 );
|
||||
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
|
||||
PlaYUVerFrame* process( std::vector<PlaYUVerFrame*> apcFrameList );
|
||||
Void destroy();
|
||||
|
||||
};
|
||||
|
||||
@@ -32,6 +32,7 @@ namespace plaYUVer
|
||||
DisparityStereoVar::DisparityStereoVar()
|
||||
{
|
||||
/* Module Definition */
|
||||
m_iModuleAPI = MODULE_API_2;
|
||||
m_iModuleType = FRAME_PROCESSING_MODULE;
|
||||
m_pchModuleCategory = "Disparity";
|
||||
m_pchModuleName = "StereoVar";
|
||||
@@ -54,24 +55,27 @@ DisparityStereoVar::DisparityStereoVar()
|
||||
m_cStereoVar.flags = m_cStereoVar.USE_SMART_ID | m_cStereoVar.USE_AUTO_PARAMS | m_cStereoVar.USE_INITIAL_DISPARITY | m_cStereoVar.USE_MEDIAN_FILTERING;
|
||||
}
|
||||
|
||||
Void DisparityStereoVar::create( PlaYUVerFrame* InputFrame )
|
||||
Bool DisparityStereoVar::create( std::vector<PlaYUVerFrame*> apcFrameList )
|
||||
{
|
||||
m_pcDisparityFrame = new PlaYUVerFrame( InputFrame->getWidth(), InputFrame->getHeight(), PlaYUVerFrame::GRAY );
|
||||
m_cStereoVar.minDisp = -( ( ( InputFrame->getWidth() / 8 ) + 15 ) & -16 );
|
||||
m_pcDisparityFrame = new PlaYUVerFrame( apcFrameList[0]->getWidth(), apcFrameList[0]->getHeight(), PlaYUVerFrame::GRAY );
|
||||
m_cStereoVar.minDisp = -( ( ( apcFrameList[0]->getWidth() / 8 ) + 15 ) & -16 );
|
||||
return true;
|
||||
}
|
||||
|
||||
PlaYUVerFrame* DisparityStereoVar::process( PlaYUVerFrame* InputLeft, PlaYUVerFrame* InputRight )
|
||||
PlaYUVerFrame* DisparityStereoVar::process( std::vector<PlaYUVerFrame*> apcFrameList )
|
||||
{
|
||||
PlaYUVerFrame* InputLeft = apcFrameList[0];
|
||||
PlaYUVerFrame* InputRight = apcFrameList[1];
|
||||
|
||||
cv::Mat* leftImage;
|
||||
InputLeft->getCvMat( (Void**)&leftImage );
|
||||
InputLeft->getCvMat( ( Void** )&leftImage );
|
||||
cv::Mat* rightImage;
|
||||
InputRight->getCvMat( (Void**)&rightImage );
|
||||
InputRight->getCvMat( ( Void** )&rightImage );
|
||||
cv::Mat disparityImage, disparityImage8;
|
||||
|
||||
m_cStereoVar(*leftImage,*rightImage,disparityImage);
|
||||
disparityImage.convertTo(disparityImage8,CV_8U);
|
||||
m_cStereoVar( *leftImage, *rightImage, disparityImage );
|
||||
disparityImage.convertTo( disparityImage8, CV_8U );
|
||||
|
||||
m_pcDisparityFrame->fromCvMat( (Void*)&disparityImage8);
|
||||
m_pcDisparityFrame->fromCvMat( ( Void* )&disparityImage8 );
|
||||
return m_pcDisparityFrame;
|
||||
}
|
||||
|
||||
|
||||
@@ -47,8 +47,8 @@ public:
|
||||
{
|
||||
}
|
||||
|
||||
Void create( PlaYUVerFrame* InputFrame );
|
||||
PlaYUVerFrame* process( PlaYUVerFrame* InputLeft, PlaYUVerFrame* InputRight );
|
||||
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
|
||||
PlaYUVerFrame* process( std::vector<PlaYUVerFrame*> apcFrameList );
|
||||
Void destroy();
|
||||
};
|
||||
|
||||
|
||||
@@ -29,6 +29,7 @@
|
||||
#include "lib/PlaYUVerFrame.h"
|
||||
#include "lib/PlaYUVerStream.h"
|
||||
#include "lib/ProgramOptions.h"
|
||||
#include <vector>
|
||||
|
||||
namespace plaYUVer
|
||||
{
|
||||
@@ -38,6 +39,12 @@ public: \
|
||||
static PlaYUVerModuleIf* Create() { return new X(); } \
|
||||
void Delete() { delete this; }
|
||||
|
||||
enum // Module API
|
||||
{
|
||||
MODULE_API_1,
|
||||
MODULE_API_2,
|
||||
};
|
||||
|
||||
enum // Module type
|
||||
{
|
||||
FRAME_PROCESSING_MODULE,
|
||||
@@ -66,6 +73,7 @@ class PlaYUVerModuleIf
|
||||
{
|
||||
public:
|
||||
|
||||
Int m_iModuleAPI;
|
||||
Int m_iModuleType;
|
||||
const Char* m_pchModuleCategory;
|
||||
const Char* m_pchModuleName;
|
||||
@@ -77,6 +85,7 @@ public:
|
||||
|
||||
PlaYUVerModuleIf()
|
||||
{
|
||||
m_iModuleAPI = MODULE_API_1;
|
||||
}
|
||||
virtual ~PlaYUVerModuleIf()
|
||||
{
|
||||
@@ -90,7 +99,9 @@ public:
|
||||
virtual Void create( PlaYUVerFrame* )
|
||||
{
|
||||
}
|
||||
|
||||
virtual Bool create( std::vector<PlaYUVerFrame*> apcFrameList )
|
||||
{
|
||||
}
|
||||
virtual PlaYUVerFrame* process( PlaYUVerFrame* )
|
||||
{
|
||||
return NULL;
|
||||
@@ -99,7 +110,7 @@ public:
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
virtual PlaYUVerFrame* process( PlaYUVerFrame*, PlaYUVerFrame*, PlaYUVerFrame* )
|
||||
virtual PlaYUVerFrame* process( std::vector<PlaYUVerFrame*> )
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
@@ -112,7 +123,7 @@ public:
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
virtual Double measure( PlaYUVerFrame*, PlaYUVerFrame*, PlaYUVerFrame* )
|
||||
virtual Double measure( std::vector<PlaYUVerFrame*> )
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user