Remove some files from the Calyp lib and clean up code
This commit is contained in:
43 files changed
+374
-444
No files matched your search
@@ -199,9 +199,9 @@ bool HEVCIntraPrediction::keyPressed( enum Module_Key_Supported value )
|
||||
return false;
|
||||
}
|
||||
|
||||
ClpString HEVCIntraPrediction::moduleInfo()
|
||||
std::string HEVCIntraPrediction::moduleInfo()
|
||||
{
|
||||
return ClpString( "Intra mode: " ) + std::to_string( m_uiMode );
|
||||
return std::string( "Intra mode: " ) + std::to_string( m_uiMode );
|
||||
}
|
||||
|
||||
void HEVCIntraPrediction::destroy()
|
||||
|
||||
@@ -47,7 +47,7 @@ public:
|
||||
bool create( std::vector<CalypFrame*> apcFrameList );
|
||||
CalypFrame* process( std::vector<CalypFrame*> apcFrameList );
|
||||
bool keyPressed( enum Module_Key_Supported value );
|
||||
ClpString moduleInfo();
|
||||
std::string moduleInfo();
|
||||
void destroy();
|
||||
};
|
||||
|
||||
|
||||
@@ -27,7 +27,6 @@
|
||||
|
||||
// CalypLib
|
||||
#include "lib/CalypModuleIf.h"
|
||||
#include "lib/CalypPlane.h"
|
||||
|
||||
class InterFrameVariance : public CalypModuleIf
|
||||
{
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
#define __SALIENCYDETECTION_H__
|
||||
|
||||
// CalypLib
|
||||
#include "lib/CalypOpenCVModuleIf.h"
|
||||
#include "lib/CalypModuleIf.h"
|
||||
|
||||
// OpenCV
|
||||
#include <opencv2/core/core.hpp>
|
||||
|
||||
@@ -88,9 +88,9 @@ ThreeSixtyDownsampling::ThreeSixtyDownsampling()
|
||||
//#endif
|
||||
}
|
||||
|
||||
ClpString ThreeSixtyDownsampling::moduleInfo()
|
||||
std::string ThreeSixtyDownsampling::moduleInfo()
|
||||
{
|
||||
ClpString info( "" );
|
||||
std::string info( "" );
|
||||
info += "Interpolation: ";
|
||||
switch( m_iInterpolation )
|
||||
{
|
||||
|
||||
@@ -68,7 +68,7 @@ public:
|
||||
virtual ~ThreeSixtyDownsampling() {}
|
||||
bool create( std::vector<CalypFrame*> apcFrameList );
|
||||
CalypFrame* process( std::vector<CalypFrame*> apcFrameList );
|
||||
ClpString moduleInfo();
|
||||
std::string moduleInfo();
|
||||
bool keyPressed( enum Module_Key_Supported value );
|
||||
void destroy();
|
||||
};
|
||||
|
||||
@@ -59,7 +59,7 @@ ThreeSixtyDynamicDownsampling::ThreeSixtyDynamicDownsampling()
|
||||
m_uiFaceHeight = 0;
|
||||
}
|
||||
|
||||
void processFPSString( const ClpString& fps, ClpVideoFPStruct* pcFPSStruct )
|
||||
void processFPSString( const std::string& fps, ClpVideoFPStruct* pcFPSStruct )
|
||||
{
|
||||
std::istringstream ss( fps );
|
||||
ss >> pcFPSStruct->numFaces;
|
||||
|
||||
@@ -48,8 +48,8 @@ class ThreeSixtyDynamicDownsampling : public CalypModuleIf
|
||||
REGISTER_CLASS_FACTORY( ThreeSixtyDynamicDownsampling )
|
||||
|
||||
private:
|
||||
ClpString m_arrayInputDefinitionString;
|
||||
ClpString m_arrayOutputDefinitionString;
|
||||
std::string m_arrayInputDefinitionString;
|
||||
std::string m_arrayOutputDefinitionString;
|
||||
ClpVideoFPStruct m_cInputFPSStruct;
|
||||
ClpVideoFPStruct m_cOutputFPSStruct;
|
||||
unsigned m_uiFaceWidth;
|
||||
|
||||
@@ -36,10 +36,10 @@ protected:
|
||||
// Can be omitted if not needed.
|
||||
static void SetUpTestCase()
|
||||
{
|
||||
ClpString moduleName = CALYP_TEST_MODULE_NAME;
|
||||
std::string moduleName = CALYP_TEST_MODULE_NAME;
|
||||
|
||||
pcStream = std::make_unique<CalypStream>();
|
||||
pcStream->open( ClpString( CALYP_TEST_DATA_DIR ) + ClpString( "/BasketballDrill_F10_832x480_yuv420p.yuv" ), 832, 480, 0, 8,
|
||||
pcStream->open( std::string( CALYP_TEST_DATA_DIR ) + std::string( "/BasketballDrill_F10_832x480_yuv420p.yuv" ), 832, 480, 0, 8,
|
||||
CLP_BIG_ENDIAN, 1, true );
|
||||
}
|
||||
|
||||
@@ -54,7 +54,7 @@ protected:
|
||||
// Called before each test
|
||||
void SetUp()
|
||||
{
|
||||
ClpString moduleName = CALYP_TEST_MODULE_NAME;
|
||||
std::string moduleName = CALYP_TEST_MODULE_NAME;
|
||||
|
||||
CalypModulesFactoryMap& moduleFactoryMap = CalypModulesFactory::Get()->getMap();
|
||||
CalypModulesFactoryMap::iterator it = moduleFactoryMap.begin();
|
||||
|
||||
@@ -49,10 +49,10 @@ protected:
|
||||
// Called before each test
|
||||
void SetUp()
|
||||
{
|
||||
ClpString moduleName = CALYP_TEST_MODULE_NAME;
|
||||
std::string moduleName = CALYP_TEST_MODULE_NAME;
|
||||
|
||||
pcStream = std::make_unique<CalypStream>();
|
||||
pcStream->open( ClpString( CALYP_TEST_DATA_DIR ) + ClpString( "/BasketballDrill_F10_832x480_yuv420p.yuv" ), 832, 480, 0, 8,
|
||||
pcStream->open( std::string( CALYP_TEST_DATA_DIR ) + std::string( "/BasketballDrill_F10_832x480_yuv420p.yuv" ), 832, 480, 0, 8,
|
||||
CLP_BIG_ENDIAN, 1, true );
|
||||
|
||||
CalypModulesFactoryMap& moduleFactoryMap = CalypModulesFactory::Get()->getMap();
|
||||
|
||||
Reference in new issue
Block a user