Compare commits
20
Commits
f3df40cdf7
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
17e2a6084a | ||
|
|
77617ce53a | ||
|
|
6789ada346 | ||
|
|
f4c69fd894 | ||
|
|
c24ddcdc59 | ||
|
|
496bb54450 | ||
|
|
a048d2e0df | ||
|
|
9d28051f38 | ||
|
|
8717338bf9 | ||
|
|
84865a039f | ||
|
|
96b7576a1d | ||
|
|
b61fd9d0e0 | ||
|
|
5b4cdddde4 | ||
|
|
c43cb2bd0a | ||
|
|
e6970fb953 | ||
|
|
aac02a9959 | ||
|
|
500e0e85ba | ||
|
|
d4886a7fee | ||
|
|
f3919ac8e8 | ||
|
|
562fd915fe |
No files matched your search
@@ -26,14 +26,16 @@ jobs:
|
|||||||
|
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
|
||||||
- name: Configure CMake
|
- name: Build with default options
|
||||||
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
|
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
|
||||||
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
|
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
|
||||||
run: cmake -B ${{github.workspace}}/build -D CMAKE_C_COMPILER=gcc-10 -D CMAKE_CXX_COMPILER=g++-10 -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DUSE_WERROR=ON
|
run: cmake -B ${{github.workspace}}/build -D CMAKE_C_COMPILER=gcc-10 -D CMAKE_CXX_COMPILER=g++-10 -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DUSE_WERROR=ON; cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
|
||||||
|
|
||||||
- name: Build
|
- name: Build without threads
|
||||||
# Build your program with the given configuration
|
run: cmake -B ${{github.workspace}}/build -D CMAKE_C_COMPILER=gcc-10 -D CMAKE_CXX_COMPILER=g++-10 -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DUSE_WERROR=ON -DCALYP_MANAGED_RESOURCES=OFF -DCALYP_THREADED_MODULES=OFF; cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
|
||||||
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
|
|
||||||
|
- name: Build without dependencies
|
||||||
|
run: cmake -B ${{github.workspace}}/build -D CMAKE_C_COMPILER=gcc-10 -D CMAKE_CXX_COMPILER=g++-10 -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DUSE_WERROR=ON -DUSE_OPENCV=OFF -DUSE_FFMPEG=OFF; cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
|
||||||
|
|
||||||
check-tests:
|
check-tests:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|||||||
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
# Created by https://www.gitignore.io/api/c++,clion,linux
|
# Created by https://www.gitignore.io/api/c++,clion,linux
|
||||||
# Edit at https://www.gitignore.io/?templates=c++,clion,linux
|
# Edit at https://www.gitignore.io/?templates=c++,clion,linux
|
||||||
|
deps/**
|
||||||
### C++ ###
|
### C++ ###
|
||||||
# Prerequisites
|
# Prerequisites
|
||||||
*.d
|
*.d
|
||||||
@@ -146,4 +146,4 @@ doc/
|
|||||||
compile_commands.json
|
compile_commands.json
|
||||||
|
|
||||||
# Build dirs
|
# Build dirs
|
||||||
build*
|
build*
|
||||||
@@ -20,10 +20,10 @@ repos:
|
|||||||
entry: cmake -B build
|
entry: cmake -B build
|
||||||
pass_filenames: false
|
pass_filenames: false
|
||||||
language: system
|
language: system
|
||||||
- id: cmake-build
|
#- id: cmake-build
|
||||||
name: Cmake Build
|
#name: Cmake Build
|
||||||
entry: cmake --build build
|
#entry: cmake --build build
|
||||||
pass_filenames: false
|
#pass_filenames: false
|
||||||
language: system
|
#language: system
|
||||||
|
|
||||||
|
|
||||||
+14
-31
@@ -18,8 +18,8 @@ SET(PROJECT_LIBRARY
|
|||||||
)
|
)
|
||||||
|
|
||||||
SET(CALYP_VERSION_MAJOR "2")
|
SET(CALYP_VERSION_MAJOR "2")
|
||||||
SET(CALYP_VERSION_MINOR "0")
|
SET(CALYP_VERSION_MINOR "2")
|
||||||
SET(CALYP_VERSION_PATCH "1")
|
SET(CALYP_VERSION_PATCH "0")
|
||||||
SET(CALYP_VERSION
|
SET(CALYP_VERSION
|
||||||
"${CALYP_VERSION_MAJOR}.${CALYP_VERSION_MINOR}.${CALYP_VERSION_PATCH}"
|
"${CALYP_VERSION_MAJOR}.${CALYP_VERSION_MINOR}.${CALYP_VERSION_PATCH}"
|
||||||
CACHE INTERNAL "" FORCE
|
CACHE INTERNAL "" FORCE
|
||||||
@@ -104,7 +104,8 @@ SET(UPDATE_CHANNEL
|
|||||||
# ####################################################################################################################################################
|
# ####################################################################################################################################################
|
||||||
INCLUDE(FetchContent)
|
INCLUDE(FetchContent)
|
||||||
|
|
||||||
# ####################################################################################################################################################
|
SET(FETCHCONTENT_BASE_DIR "${CMAKE_BINARY_DIR}/deps")
|
||||||
|
|
||||||
# Doxygen
|
# Doxygen
|
||||||
IF(BUILD_DOC)
|
IF(BUILD_DOC)
|
||||||
FIND_PACKAGE(Doxygen)
|
FIND_PACKAGE(Doxygen)
|
||||||
@@ -117,7 +118,6 @@ SET_PACKAGE_PROPERTIES(
|
|||||||
TYPE OPTIONAL
|
TYPE OPTIONAL
|
||||||
)
|
)
|
||||||
|
|
||||||
# ####################################################################################################################################################
|
|
||||||
# Catch2 and Google Tests
|
# Catch2 and Google Tests
|
||||||
IF(BUILD_TESTS)
|
IF(BUILD_TESTS)
|
||||||
FETCHCONTENT_DECLARE(googletest URL https://github.com/google/googletest/archive/609281088cfefc76f9d0ce82e1ff6c30cc3591e5.zip)
|
FETCHCONTENT_DECLARE(googletest URL https://github.com/google/googletest/archive/609281088cfefc76f9d0ce82e1ff6c30cc3591e5.zip)
|
||||||
@@ -126,7 +126,12 @@ IF(BUILD_TESTS)
|
|||||||
ON
|
ON
|
||||||
CACHE BOOL "" FORCE
|
CACHE BOOL "" FORCE
|
||||||
)
|
)
|
||||||
FETCHCONTENT_MAKEAVAILABLE(googletest)
|
FETCHCONTENT_DECLARE(
|
||||||
|
Catch2
|
||||||
|
GIT_REPOSITORY https://github.com/catchorg/Catch2.git
|
||||||
|
GIT_TAG v2.13.1
|
||||||
|
)
|
||||||
|
|
||||||
SET_PACKAGE_PROPERTIES(
|
SET_PACKAGE_PROPERTIES(
|
||||||
googletest PROPERTIES
|
googletest PROPERTIES
|
||||||
URL "https://github.com/google/googletest"
|
URL "https://github.com/google/googletest"
|
||||||
@@ -134,19 +139,15 @@ IF(BUILD_TESTS)
|
|||||||
TYPE OPTIONAL
|
TYPE OPTIONAL
|
||||||
)
|
)
|
||||||
|
|
||||||
FETCHCONTENT_DECLARE(
|
|
||||||
Catch2
|
|
||||||
GIT_REPOSITORY https://github.com/catchorg/Catch2.git
|
|
||||||
GIT_TAG v2.13.1
|
|
||||||
)
|
|
||||||
FETCHCONTENT_MAKEAVAILABLE(Catch2)
|
|
||||||
SET_PACKAGE_PROPERTIES(
|
SET_PACKAGE_PROPERTIES(
|
||||||
Catch2 PROPERTIES
|
Catch2 PROPERTIES
|
||||||
URL "https://github.com/catchorg/Catch2"
|
URL "https://github.com/catchorg/Catch2"
|
||||||
DESCRIPTION "Catch2 unit tests"
|
DESCRIPTION "Catch2 unit tests"
|
||||||
TYPE OPTIONAL
|
TYPE OPTIONAL
|
||||||
)
|
)
|
||||||
INCLUDE(${CMAKE_CURRENT_BINARY_DIR}/_deps/catch2-src/contrib/Catch.cmake)
|
FETCHCONTENT_MAKEAVAILABLE(googletest Catch2)
|
||||||
|
|
||||||
|
INCLUDE(${CMAKE_BINARY_DIR}/deps/catch2-src/contrib/Catch.cmake)
|
||||||
INCLUDE(CTest)
|
INCLUDE(CTest)
|
||||||
ENABLE_TESTING()
|
ENABLE_TESTING()
|
||||||
|
|
||||||
@@ -156,23 +157,6 @@ IF(BUILD_TESTS)
|
|||||||
)
|
)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
# ####################################################################################################################################################
|
|
||||||
# Type safe
|
|
||||||
FETCHCONTENT_DECLARE(
|
|
||||||
type_safe
|
|
||||||
GIT_REPOSITORY https://github.com/foonathan/type_safe
|
|
||||||
GIT_TAG v0.2.2
|
|
||||||
)
|
|
||||||
FETCHCONTENT_MAKEAVAILABLE(type_safe)
|
|
||||||
SET_PACKAGE_PROPERTIES(
|
|
||||||
type_safe PROPERTIES
|
|
||||||
URL "https://github.com/foonathan/type_safe"
|
|
||||||
DESCRIPTION "Zero overhead abstractions that use the C++ type system to prevent bugs."
|
|
||||||
TYPE REQUIRED
|
|
||||||
)
|
|
||||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/_deps/type_safe-src/include/ ${CMAKE_CURRENT_BINARY_DIR}/_deps/type_safe-src/external/debug_assert/)
|
|
||||||
|
|
||||||
# ####################################################################################################################################################
|
|
||||||
# OpenCV
|
# OpenCV
|
||||||
OPTION(USE_OPENCV "Add OpenCV support" ON)
|
OPTION(USE_OPENCV "Add OpenCV support" ON)
|
||||||
IF(USE_OPENCV)
|
IF(USE_OPENCV)
|
||||||
@@ -199,7 +183,6 @@ SET_PACKAGE_PROPERTIES(
|
|||||||
TYPE OPTIONAL
|
TYPE OPTIONAL
|
||||||
)
|
)
|
||||||
|
|
||||||
# ####################################################################################################################################################
|
|
||||||
# FFmpeg
|
# FFmpeg
|
||||||
OPTION(USE_FFMPEG "Add FFMPEG support" ON)
|
OPTION(USE_FFMPEG "Add FFMPEG support" ON)
|
||||||
IF(USE_FFMPEG)
|
IF(USE_FFMPEG)
|
||||||
@@ -266,7 +249,7 @@ IF(USE_WERROR)
|
|||||||
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
|
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -O0")
|
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -O0 -DCLP_DEBUG")
|
||||||
IF(BUILD_WITH_SANITIZERS)
|
IF(BUILD_WITH_SANITIZERS)
|
||||||
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=address -fsanitize=leak -fsanitize=undefined")
|
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=address -fsanitize=leak -fsanitize=undefined")
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|||||||
@@ -131,7 +131,7 @@ bool CalypAppModuleIf::apply( bool isPlaying, bool disableThreads )
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if( !( isPlaying && m_pcModule->m_uiModuleRequirements.is_set( ClpModuleFeature::SkipWhilePlaying ) ) )
|
if( !( isPlaying && m_pcModule->has( ClpModuleFeature::SkipWhilePlaying ) ) )
|
||||||
{
|
{
|
||||||
m_frameList.clear();
|
m_frameList.clear();
|
||||||
for( unsigned int i = 0; i < m_pcModule->m_uiNumberOfFrames; i++ )
|
for( unsigned int i = 0; i < m_pcModule->m_uiNumberOfFrames; i++ )
|
||||||
|
|||||||
@@ -81,12 +81,11 @@ public:
|
|||||||
auto getSubWindowList() const -> const std::vector<VideoSubWindow*>& { return m_pcSubWindow; }
|
auto getSubWindowList() const -> const std::vector<VideoSubWindow*>& { return m_pcSubWindow; }
|
||||||
|
|
||||||
CalypModuleIf* getModule() { return m_pcModule.get(); }
|
CalypModuleIf* getModule() { return m_pcModule.get(); }
|
||||||
auto getModuleRequirements() const -> ClpModuleFeatures { return m_pcModule->m_uiModuleRequirements; }
|
auto hasFeature( ClpModuleFeature feature ) const -> bool { return m_pcModule->has( feature ); }
|
||||||
std::string moduleInfo() const { return m_pcModule->moduleInfo(); }
|
std::string moduleInfo() const { return m_pcModule->moduleInfo(); }
|
||||||
void update( bool isPlaying );
|
void update( bool isPlaying );
|
||||||
bool apply( bool isPlaying = false, bool disableThreads = false );
|
bool apply( bool isPlaying = false, bool disableThreads = false );
|
||||||
bool process();
|
bool process();
|
||||||
// void setPlaying( bool isPlaying );
|
|
||||||
bool isRunning() const;
|
bool isRunning() const;
|
||||||
void show();
|
void show();
|
||||||
void disable();
|
void disable();
|
||||||
|
|||||||
@@ -69,7 +69,7 @@ void ModuleSubWindow::updateVideoWindowInfo()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if( module_ptr->getModuleRequirements().is_set( ClpModuleFeature::HasInfo ) )
|
if( module_ptr->hasFeature( ClpModuleFeature::HasInfo ) )
|
||||||
{
|
{
|
||||||
QStringList list = QString::fromStdString( module_ptr->moduleInfo() ).split( '\n' );
|
QStringList list = QString::fromStdString( module_ptr->moduleInfo() ).split( '\n' );
|
||||||
windowInfoList.append( list );
|
windowInfoList.append( list );
|
||||||
|
|||||||
@@ -100,12 +100,11 @@ void ModulesHandle::buildMenu()
|
|||||||
m_pcModulesMenu->clear();
|
m_pcModulesMenu->clear();
|
||||||
m_pcModulesSubMenuList.clear();
|
m_pcModulesSubMenuList.clear();
|
||||||
|
|
||||||
CalypModulesFactoryMap& moduleFactoryMap = CalypModulesFactory::Get()->getMap();
|
const auto& moduleFactoryMap = CalypModulesFactory::Get()->getMap();
|
||||||
CalypModulesFactoryMap::iterator it = moduleFactoryMap.begin();
|
for( auto& [name, create_fct] : moduleFactoryMap )
|
||||||
for( ; it != moduleFactoryMap.end(); ++it )
|
|
||||||
{
|
{
|
||||||
auto pcCurrModuleIf = it->second();
|
auto pcCurrModuleIf = create_fct();
|
||||||
QString ModuleIfinternalName = QString::fromLocal8Bit( it->first );
|
QString moduleIfInternalName = QString::fromStdString( name );
|
||||||
|
|
||||||
QMenu* currSubMenu{ nullptr };
|
QMenu* currSubMenu{ nullptr };
|
||||||
if( pcCurrModuleIf->m_iModuleAPI <= CLP_MODULE_API_2 )
|
if( pcCurrModuleIf->m_iModuleAPI <= CLP_MODULE_API_2 )
|
||||||
@@ -134,7 +133,7 @@ void ModulesHandle::buildMenu()
|
|||||||
moduleTooltip += QString( " | Requires %1 frames" ).arg( pcCurrModuleIf->m_uiNumberOfFrames );
|
moduleTooltip += QString( " | Requires %1 frames" ).arg( pcCurrModuleIf->m_uiNumberOfFrames );
|
||||||
|
|
||||||
currAction->setStatusTip( moduleTooltip );
|
currAction->setStatusTip( moduleTooltip );
|
||||||
currAction->setData( ModuleIfinternalName );
|
currAction->setData( moduleIfInternalName );
|
||||||
currAction->setCheckable( false );
|
currAction->setCheckable( false );
|
||||||
connect( currAction, &QAction::triggered, this, &ModulesHandle::activateModule );
|
connect( currAction, &QAction::triggered, this, &ModulesHandle::activateModule );
|
||||||
m_arrayModulesActions.append( currAction );
|
m_arrayModulesActions.append( currAction );
|
||||||
@@ -283,7 +282,7 @@ void ModulesHandle::activateModule()
|
|||||||
{
|
{
|
||||||
int minNumFrames = numberOfFrames;
|
int minNumFrames = numberOfFrames;
|
||||||
int maxNumFrames = numberOfFrames;
|
int maxNumFrames = numberOfFrames;
|
||||||
if( pcCurrAppModuleIf->m_pcModule->m_uiModuleRequirements.is_set( ClpModuleFeature::VariableNumOfFrames ) )
|
if( pcCurrAppModuleIf->m_pcModule->has( ClpModuleFeature::VariableNumOfFrames ) )
|
||||||
{
|
{
|
||||||
minNumFrames = numberOfFrames;
|
minNumFrames = numberOfFrames;
|
||||||
maxNumFrames = 255;
|
maxNumFrames = 255;
|
||||||
@@ -356,7 +355,7 @@ void ModulesHandle::activateModule()
|
|||||||
pcCurrAppModuleIf->m_pcSubWindow[i] = videoSubWindowList.at( i );
|
pcCurrAppModuleIf->m_pcSubWindow[i] = videoSubWindowList.at( i );
|
||||||
}
|
}
|
||||||
|
|
||||||
if( pcCurrAppModuleIf->m_pcModule->m_uiModuleRequirements.is_set( ClpModuleFeature::Options ) )
|
if( pcCurrAppModuleIf->m_pcModule->has( ClpModuleFeature::Options ) )
|
||||||
{
|
{
|
||||||
ModulesHandleOptDialog moduleOptDialog( m_pcParent, pcCurrAppModuleIf.get() );
|
ModulesHandleOptDialog moduleOptDialog( m_pcParent, pcCurrAppModuleIf.get() );
|
||||||
if( moduleOptDialog.runConfiguration() == QDialog::Rejected )
|
if( moduleOptDialog.runConfiguration() == QDialog::Rejected )
|
||||||
@@ -373,7 +372,7 @@ void ModulesHandle::activateModule()
|
|||||||
|
|
||||||
if( pcCurrAppModuleIf->m_pcModule->m_iModuleType == ClpModuleType::FrameProcessing )
|
if( pcCurrAppModuleIf->m_pcModule->m_iModuleType == ClpModuleType::FrameProcessing )
|
||||||
{
|
{
|
||||||
if( bShowModulesNewWindow || pcCurrAppModuleIf->m_pcModule->m_uiModuleRequirements.is_set( ClpModuleFeature::NewWindow ) )
|
if( bShowModulesNewWindow || pcCurrAppModuleIf->m_pcModule->has( ClpModuleFeature::NewWindow ) )
|
||||||
{
|
{
|
||||||
auto pcModuleSubWindow = new ModuleSubWindow( pcCurrAppModuleIf.get() );
|
auto pcModuleSubWindow = new ModuleSubWindow( pcCurrAppModuleIf.get() );
|
||||||
pcModuleSubWindow->resetWindowName();
|
pcModuleSubWindow->resetWindowName();
|
||||||
|
|||||||
+10
-8
@@ -36,8 +36,8 @@
|
|||||||
#include <optional>
|
#include <optional>
|
||||||
|
|
||||||
ResourceWorker::ResourceWorker( std::shared_ptr<CalypStream> stream )
|
ResourceWorker::ResourceWorker( std::shared_ptr<CalypStream> stream )
|
||||||
|
: m_pcStream{ stream }
|
||||||
{
|
{
|
||||||
m_pcStream = stream;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ResourceWorker::stop()
|
void ResourceWorker::stop()
|
||||||
@@ -57,25 +57,23 @@ void ResourceWorker::wake()
|
|||||||
void ResourceWorker::run()
|
void ResourceWorker::run()
|
||||||
{
|
{
|
||||||
m_bStop = false;
|
m_bStop = false;
|
||||||
|
|
||||||
// Loop forever
|
// Loop forever
|
||||||
while( !m_bStop )
|
while( !m_bStop )
|
||||||
{
|
{
|
||||||
//auto start = std::chrono::steady_clock::now();
|
// auto start = std::chrono::steady_clock::now();
|
||||||
m_pcStream->readNextFrameFillRGBBuffer();
|
m_pcStream->readNextFrameFillRGBBuffer();
|
||||||
// auto end = std::chrono::steady_clock::now();
|
// auto end = std::chrono::steady_clock::now();
|
||||||
// std::cout << "Elapsed time reading and processing a frame: "
|
// std::cout << "Elapsed time reading and processing a frame: "
|
||||||
// << std::chrono::duration_cast<std::chrono::milliseconds>( end - start ).count()
|
// << std::chrono::duration_cast<std::chrono::milliseconds>( end - start ).count()
|
||||||
// << " ms" << std::endl;
|
// << " ms" << std::endl;
|
||||||
|
|
||||||
// if( !m_pcStream->hasWritingSlot() )
|
|
||||||
// {
|
|
||||||
// m_Mutex.lock();
|
|
||||||
// m_ResourceIdle.wait( &m_Mutex );
|
|
||||||
// m_Mutex.unlock();
|
|
||||||
// }
|
|
||||||
while( !m_bStop && !m_pcStream->hasWritingSlot() )
|
while( !m_bStop && !m_pcStream->hasWritingSlot() )
|
||||||
{
|
{
|
||||||
// Wait here
|
// Wait here
|
||||||
|
m_Mutex.lock();
|
||||||
|
m_ResourceIdle.wait( &m_Mutex );
|
||||||
|
m_Mutex.unlock();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -150,6 +148,10 @@ void ResourceHandle::startResourceWorker( std::size_t id )
|
|||||||
assert( false );
|
assert( false );
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if( m_apcStreamResourcesList[id]->getFrameNum() < 2 )
|
||||||
|
{
|
||||||
|
return; // No work to be done!
|
||||||
|
}
|
||||||
m_apcStreamResourcesWorkersList[id]->setObjectName(
|
m_apcStreamResourcesWorkersList[id]->setObjectName(
|
||||||
"RW-" +
|
"RW-" +
|
||||||
QFileInfo( QString::fromStdString( m_apcStreamResourcesList[id]->getFileName() ) ).completeBaseName() );
|
QFileInfo( QString::fromStdString( m_apcStreamResourcesList[id]->getFileName() ) ).completeBaseName() );
|
||||||
|
|||||||
@@ -29,6 +29,7 @@
|
|||||||
#include <QThread>
|
#include <QThread>
|
||||||
#include <QVector>
|
#include <QVector>
|
||||||
#include <QWaitCondition>
|
#include <QWaitCondition>
|
||||||
|
#include <atomic>
|
||||||
|
|
||||||
#include "CommonDefs.h"
|
#include "CommonDefs.h"
|
||||||
#include "lib/CalypStream.h"
|
#include "lib/CalypStream.h"
|
||||||
@@ -39,7 +40,7 @@ private:
|
|||||||
QMutex m_Mutex;
|
QMutex m_Mutex;
|
||||||
QWaitCondition m_ResourceIdle;
|
QWaitCondition m_ResourceIdle;
|
||||||
std::shared_ptr<CalypStream> m_pcStream;
|
std::shared_ptr<CalypStream> m_pcStream;
|
||||||
bool m_bStop{ false };
|
std::atomic<bool> m_bStop{ false };
|
||||||
|
|
||||||
public:
|
public:
|
||||||
ResourceWorker( std::shared_ptr<CalypStream> stream );
|
ResourceWorker( std::shared_ptr<CalypStream> stream );
|
||||||
|
|||||||
@@ -35,7 +35,7 @@
|
|||||||
#include "MdiSubWindow.h"
|
#include "MdiSubWindow.h"
|
||||||
|
|
||||||
SubWindowAbstract::SubWindowAbstract( QWidget* parent, unsigned int category )
|
SubWindowAbstract::SubWindowAbstract( QWidget* parent, unsigned int category )
|
||||||
: QWidget( parent ), m_cSubWindow( NULL )
|
: QWidget{ parent }, m_uiCategory{ category }, m_cWindowName{ " " }
|
||||||
{
|
{
|
||||||
setParent( parent );
|
setParent( parent );
|
||||||
setVisible( false );
|
setVisible( false );
|
||||||
@@ -46,11 +46,6 @@ SubWindowAbstract::SubWindowAbstract( QWidget* parent, unsigned int category )
|
|||||||
|
|
||||||
setWindowIcon( QIcon( ":/logos/calyp-icon.png" ) );
|
setWindowIcon( QIcon( ":/logos/calyp-icon.png" ) );
|
||||||
|
|
||||||
// setWidgetResizable( true );
|
|
||||||
m_pcLayout = NULL;
|
|
||||||
m_uiCategory = category;
|
|
||||||
m_cWindowName = QString( " " );
|
|
||||||
|
|
||||||
connect( this, SIGNAL( destroyed() ), this, SLOT( onDestroyed() ) );
|
connect( this, SIGNAL( destroyed() ), this, SLOT( onDestroyed() ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -56,11 +56,11 @@ class SubWindowAbstract : public QWidget
|
|||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QHBoxLayout* m_pcLayout;
|
QHBoxLayout* m_pcLayout{ nullptr };
|
||||||
unsigned int m_uiCategory;
|
unsigned int m_uiCategory;
|
||||||
QString m_cWindowName;
|
QString m_cWindowName;
|
||||||
|
|
||||||
MdiSubWindow* m_cSubWindow;
|
MdiSubWindow* m_cSubWindow{ nullptr };
|
||||||
|
|
||||||
public:
|
public:
|
||||||
enum SubWindowCategory
|
enum SubWindowCategory
|
||||||
@@ -90,7 +90,7 @@ public:
|
|||||||
*/
|
*/
|
||||||
virtual void zoomToFit() = 0;
|
virtual void zoomToFit() = 0;
|
||||||
/**
|
/**
|
||||||
* Scale the image (zoomed in or out) to speficied absolute zoom value (1.0 =
|
* Scale the image (zoomed in or out) to specified absolute zoom value (1.0 =
|
||||||
* original size).
|
* original size).
|
||||||
*/
|
*/
|
||||||
virtual void zoomToFactor( double factor, QPoint center = QPoint() ) = 0;
|
virtual void zoomToFactor( double factor, QPoint center = QPoint() ) = 0;
|
||||||
|
|||||||
@@ -121,7 +121,7 @@ void VideoStreamSubWindow::updateVideoWindowInfo()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if( m_pcDisplayModule->getModuleRequirements() & ClpModuleFeature::HasInfo )
|
if( m_pcDisplayModule->hasFeature( ClpModuleFeature::HasInfo ) )
|
||||||
{
|
{
|
||||||
QStringList list = QString::fromStdString( m_pcDisplayModule->moduleInfo() ).split( '\n' );
|
QStringList list = QString::fromStdString( m_pcDisplayModule->moduleInfo() ).split( '\n' );
|
||||||
windowInfoList.append( list );
|
windowInfoList.append( list );
|
||||||
|
|||||||
@@ -156,7 +156,7 @@ void VideoSubWindow::keyPressEvent( QKeyEvent* event )
|
|||||||
{
|
{
|
||||||
if( m_pcDisplayModule )
|
if( m_pcDisplayModule )
|
||||||
{
|
{
|
||||||
if( m_pcDisplayModule->getModuleRequirements().is_set( ClpModuleFeature::KeysShortcuts ) )
|
if( m_pcDisplayModule->hasFeature( ClpModuleFeature::KeysShortcuts ) )
|
||||||
{
|
{
|
||||||
bool bRet = false;
|
bool bRet = false;
|
||||||
switch( event->key() )
|
switch( event->key() )
|
||||||
@@ -455,19 +455,19 @@ void VideoSubWindow::adjustScrollBarByScale( double scale, QPoint center )
|
|||||||
|
|
||||||
void VideoSubWindow::updateScrollValues()
|
void VideoSubWindow::updateScrollValues()
|
||||||
{
|
{
|
||||||
double xPos = m_pcScrollArea->horizontalScrollBar()->value();
|
auto xPos = m_pcScrollArea->horizontalScrollBar()->value();
|
||||||
double yPos = m_pcScrollArea->verticalScrollBar()->value();
|
auto yPos = m_pcScrollArea->verticalScrollBar()->value();
|
||||||
|
|
||||||
m_cCurrScroll.setX( xPos != 0 );
|
m_cCurrScroll.setX( xPos );
|
||||||
m_cCurrScroll.setY( yPos != 0 );
|
m_cCurrScroll.setY( yPos );
|
||||||
|
|
||||||
m_dHorScroll = m_dVerScroll = 0;
|
m_dHorScroll = m_dVerScroll = 0;
|
||||||
|
|
||||||
if( xPos != 0 )
|
if( xPos != 0 )
|
||||||
m_dHorScroll = xPos / double( m_pcScrollArea->horizontalScrollBar()->maximum() );
|
m_dHorScroll = static_cast<double>( xPos ) / static_cast<double>( m_pcScrollArea->horizontalScrollBar()->maximum() );
|
||||||
|
|
||||||
if( yPos != 0 )
|
if( yPos != 0 )
|
||||||
m_dVerScroll = yPos / double( m_pcScrollArea->verticalScrollBar()->maximum() );
|
m_dVerScroll = static_cast<double>( yPos ) / static_cast<double>( m_pcScrollArea->verticalScrollBar()->maximum() );
|
||||||
}
|
}
|
||||||
|
|
||||||
void VideoSubWindow::normalSize()
|
void VideoSubWindow::normalSize()
|
||||||
@@ -476,8 +476,7 @@ void VideoSubWindow::normalSize()
|
|||||||
double curFactor = getScaleFactor();
|
double curFactor = getScaleFactor();
|
||||||
if( factor != curFactor )
|
if( factor != curFactor )
|
||||||
{
|
{
|
||||||
double usedScale;
|
double usedScale = m_cViewArea->scaleZoomFactor( factor / curFactor, QPoint(), QSize() );
|
||||||
usedScale = m_cViewArea->scaleZoomFactor( factor / curFactor, QPoint(), QSize() );
|
|
||||||
adjustScrollBarByScale( usedScale, QPoint() );
|
adjustScrollBarByScale( usedScale, QPoint() );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+12
-3
@@ -43,9 +43,15 @@
|
|||||||
|
|
||||||
#include "GridManager.h"
|
#include "GridManager.h"
|
||||||
|
|
||||||
|
#if QT_VERSION >= QT_VERSION_CHECK( 5, 14, 0 )
|
||||||
constexpr auto kSelectionColor = QColorConstants::Cyan;
|
constexpr auto kSelectionColor = QColorConstants::Cyan;
|
||||||
constexpr auto kImageMaskColor = QColorConstants::Green;
|
constexpr auto kImageMaskColor = QColorConstants::Green;
|
||||||
constexpr auto kEraserColor = QColorConstants::Red;
|
constexpr auto kEraserColor = QColorConstants::Red;
|
||||||
|
#else
|
||||||
|
static const QColor kSelectionColor = Qt::cyan;
|
||||||
|
static const QColor kImageMaskColor = Qt::green;
|
||||||
|
static const QColor kEraserColor = Qt::red;
|
||||||
|
#endif
|
||||||
constexpr double kMaxZoom = 100.0;
|
constexpr double kMaxZoom = 100.0;
|
||||||
constexpr double kMinZoom = 0.01;
|
constexpr double kMinZoom = 0.01;
|
||||||
|
|
||||||
@@ -75,7 +81,8 @@ void ViewArea::setImage( std::shared_ptr<CalypFrame> frame )
|
|||||||
m_nextFrame->fillRGBBuffer();
|
m_nextFrame->fillRGBBuffer();
|
||||||
}
|
}
|
||||||
|
|
||||||
m_image = QImage( m_nextFrame->getRGBBuffer(),
|
auto rgb_buffer = *m_nextFrame->getRGBBuffer();
|
||||||
|
m_image = QImage( rgb_buffer.data(),
|
||||||
m_nextFrame->getWidth(),
|
m_nextFrame->getWidth(),
|
||||||
m_nextFrame->getHeight(),
|
m_nextFrame->getHeight(),
|
||||||
QImage::Format_ARGB32 );
|
QImage::Format_ARGB32 );
|
||||||
@@ -109,7 +116,8 @@ void ViewArea::setFilteredChannel( std::size_t channel )
|
|||||||
if( m_nextFrame != nullptr )
|
if( m_nextFrame != nullptr )
|
||||||
{
|
{
|
||||||
m_nextFrame->fillRGBBuffer( m_filterSingleChannel );
|
m_nextFrame->fillRGBBuffer( m_filterSingleChannel );
|
||||||
m_image = QImage( m_nextFrame->getRGBBuffer(),
|
auto rgb_buffer = *m_nextFrame->getRGBBuffer();
|
||||||
|
m_image = QImage( rgb_buffer.data(),
|
||||||
m_nextFrame->getWidth(),
|
m_nextFrame->getWidth(),
|
||||||
m_nextFrame->getHeight(),
|
m_nextFrame->getHeight(),
|
||||||
QImage::Format_ARGB32 );
|
QImage::Format_ARGB32 );
|
||||||
@@ -123,7 +131,8 @@ void ViewArea::clearFilteredChannel()
|
|||||||
if( m_nextFrame != nullptr )
|
if( m_nextFrame != nullptr )
|
||||||
{
|
{
|
||||||
m_nextFrame->fillRGBBuffer( m_filterSingleChannel );
|
m_nextFrame->fillRGBBuffer( m_filterSingleChannel );
|
||||||
m_image = QImage( m_nextFrame->getRGBBuffer(),
|
auto rgb_buffer = *m_nextFrame->getRGBBuffer();
|
||||||
|
m_image = QImage( rgb_buffer.data(),
|
||||||
m_nextFrame->getWidth(),
|
m_nextFrame->getWidth(),
|
||||||
m_nextFrame->getHeight(),
|
m_nextFrame->getHeight(),
|
||||||
QImage::Format_ARGB32 );
|
QImage::Format_ARGB32 );
|
||||||
|
|||||||
+1
-3
@@ -22,7 +22,7 @@ SET(Calyp_Lib_Stream_SRCS
|
|||||||
|
|
||||||
SET(Calyp_Lib_OptionParser_SRCS CalypOptions.h CalypOptions.cpp)
|
SET(Calyp_Lib_OptionParser_SRCS CalypOptions.h CalypOptions.cpp)
|
||||||
|
|
||||||
SET(Calyp_Lib_Modules_SRCS CalypOptions.h CalypOptions.cpp)
|
SET(Calyp_Lib_Modules_SRCS CalypModuleIf.h CalypModuleIf.cpp)
|
||||||
|
|
||||||
SET(Calyp_Lib_SRCS CalypLib.h CalypDefs.h ${Calyp_Lib_Frame_SRCS} ${Calyp_Lib_Stream_SRCS} ${Calyp_Lib_OptionParser_SRCS} ${Calyp_Lib_Modules_SRCS})
|
SET(Calyp_Lib_SRCS CalypLib.h CalypDefs.h ${Calyp_Lib_Frame_SRCS} ${Calyp_Lib_Stream_SRCS} ${Calyp_Lib_OptionParser_SRCS} ${Calyp_Lib_Modules_SRCS})
|
||||||
|
|
||||||
@@ -44,8 +44,6 @@ IF(USE_OPENCV)
|
|||||||
LIST(APPEND Calyp_Lib_SRCS StreamHandlerOpenCV.h)
|
LIST(APPEND Calyp_Lib_SRCS StreamHandlerOpenCV.h)
|
||||||
LIST(APPEND Calyp_Lib_SRCS StreamHandlerOpenCV.cpp)
|
LIST(APPEND Calyp_Lib_SRCS StreamHandlerOpenCV.cpp)
|
||||||
|
|
||||||
LIST(APPEND Calyp_Lib_SRCS CalypOpenCVModuleIf.cpp)
|
|
||||||
|
|
||||||
LIST(APPEND CMAKE_CFG_LINKER_LIBSS ${OpenCV_LIBRARIES})
|
LIST(APPEND CMAKE_CFG_LINKER_LIBSS ${OpenCV_LIBRARIES})
|
||||||
LIST(APPEND CMAKE_CFG_INCLUDE_DIRS ${OpenCV_INCLUDE_DIRS})
|
LIST(APPEND CMAKE_CFG_INCLUDE_DIRS ${OpenCV_INCLUDE_DIRS})
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -20,7 +20,7 @@
|
|||||||
/**
|
/**
|
||||||
* \file CalypDefs.h
|
* \file CalypDefs.h
|
||||||
* \ingroup CalypLibGrp
|
* \ingroup CalypLibGrp
|
||||||
* \brief Define basic types, new types and enumerations
|
* \brief Define basic types, new types and enumerations (private use only)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __CALYPDEFS_H__
|
#ifndef __CALYPDEFS_H__
|
||||||
|
|||||||
+5
-5
@@ -97,7 +97,7 @@ auto CalypFrame::findPixelFormat( const std::string_view name ) -> std::optional
|
|||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
|
|
||||||
auto CalypFrame::pelformatColorSpace( ClpPixelFormats idx ) -> int
|
auto CalypFrame::pelFormatColorSpace( ClpPixelFormats idx ) -> int
|
||||||
{
|
{
|
||||||
return g_CalypPixFmtDescriptorsMap.at( idx ).colorSpace;
|
return g_CalypPixFmtDescriptorsMap.at( idx ).colorSpace;
|
||||||
}
|
}
|
||||||
@@ -536,13 +536,13 @@ ClpPel*** CalypFrame::getPelBufferYUV()
|
|||||||
return d->m_pppcInputPel;
|
return d->m_pppcInputPel;
|
||||||
}
|
}
|
||||||
|
|
||||||
auto CalypFrame::getRGBBuffer() const -> const unsigned char*
|
auto CalypFrame::getRGBBuffer() const -> std::optional<std::span<const std::uint8_t>>
|
||||||
{
|
{
|
||||||
if( d->m_bHasRGBPel )
|
if( !d->m_bHasRGBPel )
|
||||||
{
|
{
|
||||||
return d->m_pcARGB32.data();
|
return std::nullopt;
|
||||||
}
|
}
|
||||||
return NULL;
|
return std::span{ d->m_pcARGB32 };
|
||||||
}
|
}
|
||||||
|
|
||||||
ClpPel CalypFrame::operator()( unsigned int ch, unsigned int xPos, unsigned int yPos, bool absolute ) const
|
ClpPel CalypFrame::operator()( unsigned int ch, unsigned int xPos, unsigned int yPos, bool absolute ) const
|
||||||
|
|||||||
+3
-2
@@ -26,6 +26,7 @@
|
|||||||
#ifndef __CALYPFRAME_H__
|
#ifndef __CALYPFRAME_H__
|
||||||
#define __CALYPFRAME_H__
|
#define __CALYPFRAME_H__
|
||||||
|
|
||||||
|
#include <array>
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <optional>
|
#include <optional>
|
||||||
@@ -221,7 +222,7 @@ public:
|
|||||||
static constexpr auto numberOfFormats() -> std::size_t;
|
static constexpr auto numberOfFormats() -> std::size_t;
|
||||||
static auto findPixelFormat( const std::string& name ) -> std::optional<ClpPixelFormats>;
|
static auto findPixelFormat( const std::string& name ) -> std::optional<ClpPixelFormats>;
|
||||||
static auto findPixelFormat( const std::string_view name ) -> std::optional<ClpPixelFormats>;
|
static auto findPixelFormat( const std::string_view name ) -> std::optional<ClpPixelFormats>;
|
||||||
static auto pelformatColorSpace( ClpPixelFormats idx ) -> int;
|
static auto pelFormatColorSpace( ClpPixelFormats idx ) -> int;
|
||||||
static auto supportedPixelFormatListNames() -> std::map<ClpPixelFormats, std::string_view>;
|
static auto supportedPixelFormatListNames() -> std::map<ClpPixelFormats, std::string_view>;
|
||||||
static auto supportedPixelFormatListNames( int colorSpace ) -> std::map<ClpPixelFormats, std::string_view>;
|
static auto supportedPixelFormatListNames( int colorSpace ) -> std::map<ClpPixelFormats, std::string_view>;
|
||||||
static auto pixelFormatName( ClpPixelFormats idx ) -> const std::string_view;
|
static auto pixelFormatName( ClpPixelFormats idx ) -> const std::string_view;
|
||||||
@@ -415,7 +416,7 @@ public:
|
|||||||
ClpPel*** getPelBufferYUV() const;
|
ClpPel*** getPelBufferYUV() const;
|
||||||
ClpPel*** getPelBufferYUV();
|
ClpPel*** getPelBufferYUV();
|
||||||
|
|
||||||
auto getRGBBuffer() const -> const unsigned char*;
|
auto getRGBBuffer() const -> std::optional<std::span<const std::uint8_t>>;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get pixel value at coordinates
|
* Get pixel value at coordinates
|
||||||
|
|||||||
@@ -22,16 +22,19 @@
|
|||||||
* \brief Calyp modules interface for OpenCV
|
* \brief Calyp modules interface for OpenCV
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "CalypFrame.h"
|
|
||||||
#include "CalypModuleIf.h"
|
#include "CalypModuleIf.h"
|
||||||
|
|
||||||
// OpenCV
|
#include "CalypFrame.h"
|
||||||
#include <opencv2/opencv.hpp>
|
|
||||||
|
|
||||||
#include "PixelFormats.h"
|
#include "PixelFormats.h"
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
|
#ifdef USE_OPENCV
|
||||||
|
#include <opencv2/opencv.hpp>
|
||||||
|
#endif
|
||||||
|
|
||||||
bool CalypOpenCVModuleIf::create( std::vector<CalypFrame*> apcFrameList )
|
bool CalypOpenCVModuleIf::create( std::vector<CalypFrame*> apcFrameList )
|
||||||
{
|
{
|
||||||
|
#ifdef USE_OPENCV
|
||||||
_BASIC_MODULE_API_2_CHECK_
|
_BASIC_MODULE_API_2_CHECK_
|
||||||
bool bRet = false;
|
bool bRet = false;
|
||||||
std::vector<Mat> acMatList( apcFrameList.size() );
|
std::vector<Mat> acMatList( apcFrameList.size() );
|
||||||
@@ -51,10 +54,14 @@ bool CalypOpenCVModuleIf::create( std::vector<CalypFrame*> apcFrameList )
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return bRet;
|
return bRet;
|
||||||
|
#else
|
||||||
|
return false;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
CalypFrame* CalypOpenCVModuleIf::process( std::vector<CalypFrame*> apcFrameList )
|
CalypFrame* CalypOpenCVModuleIf::process( std::vector<CalypFrame*> apcFrameList )
|
||||||
{
|
{
|
||||||
|
#ifdef USE_OPENCV
|
||||||
m_pcOutputFrame->reset();
|
m_pcOutputFrame->reset();
|
||||||
std::vector<Mat> acMatList( apcFrameList.size() );
|
std::vector<Mat> acMatList( apcFrameList.size() );
|
||||||
for( unsigned i = 0; i < apcFrameList.size(); i++ )
|
for( unsigned i = 0; i < apcFrameList.size(); i++ )
|
||||||
@@ -64,8 +71,35 @@ CalypFrame* CalypOpenCVModuleIf::process( std::vector<CalypFrame*> apcFrameList
|
|||||||
Mat* cvOutput = process_using_opencv( acMatList );
|
Mat* cvOutput = process_using_opencv( acMatList );
|
||||||
m_pcOutputFrame->fromMat( *cvOutput );
|
m_pcOutputFrame->fromMat( *cvOutput );
|
||||||
return m_pcOutputFrame.get();
|
return m_pcOutputFrame.get();
|
||||||
|
#else
|
||||||
|
return nullptr;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void CalypOpenCVModuleIf::destroy()
|
void CalypOpenCVModuleIf::destroy()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ClpModuleFeature operator|( ClpModuleFeature lhs, ClpModuleFeature rhs )
|
||||||
|
{
|
||||||
|
return static_cast<ClpModuleFeature>(
|
||||||
|
static_cast<std::underlying_type_t<ClpModuleFeature>>( lhs ) |
|
||||||
|
static_cast<std::underlying_type_t<ClpModuleFeature>>( rhs ) );
|
||||||
|
}
|
||||||
|
|
||||||
|
ClpModuleFeature operator&( ClpModuleFeature lhs, ClpModuleFeature rhs )
|
||||||
|
{
|
||||||
|
return static_cast<ClpModuleFeature>(
|
||||||
|
static_cast<std::underlying_type_t<ClpModuleFeature>>( lhs ) &
|
||||||
|
static_cast<std::underlying_type_t<ClpModuleFeature>>( rhs ) );
|
||||||
|
}
|
||||||
|
|
||||||
|
auto CalypModuleIf::getModuleLongName() -> const char*
|
||||||
|
{
|
||||||
|
return m_pchModuleLongName ? m_pchModuleLongName : m_pchModuleName;
|
||||||
|
}
|
||||||
|
|
||||||
|
auto CalypModuleIf::has( ClpModuleFeature feature ) -> bool
|
||||||
|
{
|
||||||
|
return ( m_uiModuleRequirements & feature ) != ClpModuleFeature::None;
|
||||||
|
}
|
||||||
+16
-18
@@ -35,7 +35,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <type_safe/flag_set.hpp>
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "CalypFrame.h"
|
#include "CalypFrame.h"
|
||||||
@@ -95,19 +94,18 @@ enum class ClpModuleType : std::uint8_t
|
|||||||
* Features/Requirements of a module
|
* Features/Requirements of a module
|
||||||
* @see m_uiModuleRequirements
|
* @see m_uiModuleRequirements
|
||||||
*/
|
*/
|
||||||
enum class ClpModuleFeature
|
enum class ClpModuleFeature : std::uint64_t
|
||||||
{
|
{
|
||||||
None,
|
None = 0,
|
||||||
SkipWhilePlaying,
|
SkipWhilePlaying = 1,
|
||||||
Options,
|
Options = 2,
|
||||||
NewWindow,
|
NewWindow = 4,
|
||||||
KeysShortcuts,
|
KeysShortcuts = 8,
|
||||||
VariableNumOfFrames,
|
VariableNumOfFrames = 16,
|
||||||
HasInfo,
|
HasInfo = 32,
|
||||||
_flag_set_size
|
|
||||||
};
|
};
|
||||||
|
|
||||||
using ClpModuleFeatures = type_safe::flag_set<ClpModuleFeature>;
|
auto operator|( ClpModuleFeature lhs, ClpModuleFeature rhs ) -> ClpModuleFeature;
|
||||||
|
|
||||||
enum Module_Key_Supported
|
enum Module_Key_Supported
|
||||||
{
|
{
|
||||||
@@ -117,6 +115,8 @@ enum Module_Key_Supported
|
|||||||
MODULE_KEY_DOWN,
|
MODULE_KEY_DOWN,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
class CalypFrame;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \class CalypModuleIf
|
* \class CalypModuleIf
|
||||||
* \ingroup CalypLib Calyp_Modules
|
* \ingroup CalypLib Calyp_Modules
|
||||||
@@ -134,10 +134,8 @@ public:
|
|||||||
virtual ~CalypModuleIf() = default;
|
virtual ~CalypModuleIf() = default;
|
||||||
virtual void destroy(){};
|
virtual void destroy(){};
|
||||||
|
|
||||||
const char* getModuleLongName()
|
auto getModuleLongName() -> const char*;
|
||||||
{
|
auto has( ClpModuleFeature feature ) -> bool;
|
||||||
return m_pchModuleLongName ? m_pchModuleLongName : m_pchModuleName;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Module API version 1
|
* Module API version 1
|
||||||
@@ -175,7 +173,7 @@ public:
|
|||||||
//! Number of frames
|
//! Number of frames
|
||||||
unsigned int m_uiNumberOfFrames{ 1 };
|
unsigned int m_uiNumberOfFrames{ 1 };
|
||||||
//! Features/Requirements
|
//! Features/Requirements
|
||||||
ClpModuleFeatures m_uiModuleRequirements{ ClpModuleFeature::None };
|
ClpModuleFeature m_uiModuleRequirements{ ClpModuleFeature::None };
|
||||||
|
|
||||||
unsigned int m_iFrameBufferCount{ 0 };
|
unsigned int m_iFrameBufferCount{ 0 };
|
||||||
|
|
||||||
@@ -197,7 +195,7 @@ class CalypOpenCVModuleIf : public CalypModuleIf
|
|||||||
using Mat = cv::Mat;
|
using Mat = cv::Mat;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
CalypOpenCVModuleIf() { m_bConvertToGray = false; };
|
CalypOpenCVModuleIf() = default;
|
||||||
virtual ~CalypOpenCVModuleIf() {}
|
virtual ~CalypOpenCVModuleIf() {}
|
||||||
|
|
||||||
// Common API
|
// Common API
|
||||||
@@ -216,7 +214,7 @@ public:
|
|||||||
protected:
|
protected:
|
||||||
// const char* m_pchPythonFunctionName;
|
// const char* m_pchPythonFunctionName;
|
||||||
std::unique_ptr<CalypFrame> m_pcOutputFrame;
|
std::unique_ptr<CalypFrame> m_pcOutputFrame;
|
||||||
bool m_bConvertToGray;
|
bool m_bConvertToGray{ false };
|
||||||
};
|
};
|
||||||
|
|
||||||
using CalypModulePtr = std::unique_ptr<CalypModuleIf>;
|
using CalypModulePtr = std::unique_ptr<CalypModuleIf>;
|
||||||
|
|||||||
@@ -38,12 +38,13 @@
|
|||||||
|
|
||||||
#include "CalypOptions.h"
|
#include "CalypOptions.h"
|
||||||
|
|
||||||
#include <cstring>
|
#include <functional>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
#include "lib/CalypFrame.h"
|
||||||
#include "lib/CalypModuleIf.h"
|
#include "lib/CalypModuleIf.h"
|
||||||
|
|
||||||
struct ParseFailure : public std::exception
|
struct ParseFailure : public std::exception
|
||||||
|
|||||||
+2
-2
@@ -42,10 +42,10 @@
|
|||||||
|
|
||||||
#include <list>
|
#include <list>
|
||||||
#include <map>
|
#include <map>
|
||||||
|
#include <memory>
|
||||||
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "CalypDefs.h"
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \class CalypOptions
|
* \class CalypOptions
|
||||||
* \ingroup CalypLibGrp
|
* \ingroup CalypLibGrp
|
||||||
|
|||||||
@@ -149,6 +149,7 @@ auto CalypPixel::operator==( const CalypPixel& other ) const -> bool
|
|||||||
|
|
||||||
std::ostream& operator<<( std::ostream& os, const CalypPixel& p )
|
std::ostream& operator<<( std::ostream& os, const CalypPixel& p )
|
||||||
{
|
{
|
||||||
|
#ifdef CLP_DEBUG
|
||||||
if( p.colorSpace() == CLP_COLOR_RGB || p.colorSpace() == CLP_COLOR_YUV )
|
if( p.colorSpace() == CLP_COLOR_RGB || p.colorSpace() == CLP_COLOR_YUV )
|
||||||
{
|
{
|
||||||
os << "(" << p[0] << ", " << p[1] << ", " << p[2] << ")";
|
os << "(" << p[0] << ", " << p[1] << ", " << p[2] << ")";
|
||||||
@@ -157,6 +158,7 @@ std::ostream& operator<<( std::ostream& os, const CalypPixel& p )
|
|||||||
{
|
{
|
||||||
os << "(" << p[0] << ", " << p[1] << ", " << p[2] << ", " << p[3] << ")";
|
os << "(" << p[0] << ", " << p[1] << ", " << p[2] << ", " << p[3] << ")";
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
return os;
|
return os;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -84,7 +84,7 @@ bool StreamHandlerPortableMap::openHandler( std::string strFilename, bool bInput
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
int colorSpace = CalypFrame::pelformatColorSpace( m_iPixelFormat );
|
int colorSpace = CalypFrame::pelFormatColorSpace( m_iPixelFormat );
|
||||||
m_iMaxValue = ( 1 << m_uiBitsPerPixel ) - 1;
|
m_iMaxValue = ( 1 << m_uiBitsPerPixel ) - 1;
|
||||||
if( m_uiBitsPerPixel == 1 )
|
if( m_uiBitsPerPixel == 1 )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ bool StreamHandlerRaw::openHandler( std::string strFilename, bool bInput )
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
calculateFrameNumber();
|
calculateFrameNumber();
|
||||||
std::string fileExtension = std::filesystem::path{ strFilename }.extension();
|
std::string fileExtension = std::filesystem::path{ strFilename }.extension().string();
|
||||||
fileExtension.erase( fileExtension.begin() );
|
fileExtension.erase( fileExtension.begin() );
|
||||||
m_strFormatName = clpUppercase( fileExtension );
|
m_strFormatName = clpUppercase( fileExtension );
|
||||||
m_strCodecName = "Raw Video";
|
m_strCodecName = "Raw Video";
|
||||||
|
|||||||
@@ -2,6 +2,9 @@
|
|||||||
# CMakeLists for Calyp lis tests using catch2
|
# CMakeLists for Calyp lis tests using catch2
|
||||||
#
|
#
|
||||||
|
|
||||||
|
FETCHCONTENT_MAKEAVAILABLE(Catch2)
|
||||||
|
|
||||||
|
|
||||||
SET(Calyp_Lib_Catch2_Tests_SRCS
|
SET(Calyp_Lib_Catch2_Tests_SRCS
|
||||||
CalypLibTests.cpp
|
CalypLibTests.cpp
|
||||||
CalypStreamTests.cpp
|
CalypStreamTests.cpp
|
||||||
|
|||||||
@@ -24,9 +24,6 @@
|
|||||||
|
|
||||||
#include "CalypModulesFactory.h"
|
#include "CalypModulesFactory.h"
|
||||||
|
|
||||||
#include <cstring>
|
|
||||||
#include <functional>
|
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#ifdef USE_DYNLOAD
|
#ifdef USE_DYNLOAD
|
||||||
#include <dlfcn.h>
|
#include <dlfcn.h>
|
||||||
@@ -37,45 +34,50 @@
|
|||||||
// Generated by cmake
|
// Generated by cmake
|
||||||
#include "ModulesListHeader.h"
|
#include "ModulesListHeader.h"
|
||||||
|
|
||||||
CalypModulesFactory::CalypModulesFactory(){ REGISTER_ALL_MODULES }
|
CalypModulesFactory::CalypModulesFactory()
|
||||||
|
{
|
||||||
|
REGISTER_ALL_MODULES
|
||||||
|
}
|
||||||
|
|
||||||
|
void CalypModulesFactory::Register( const std::string& moduleName, std::function<CalypModulePtr( void )> pfnCreate )
|
||||||
void CalypModulesFactory::Register( const char* moduleName, CreateModuleFn pfnCreate )
|
|
||||||
{
|
{
|
||||||
m_FactoryMap[moduleName] = pfnCreate;
|
m_FactoryMap[moduleName] = pfnCreate;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CalypModulesFactory::RegisterDl( const char* dlName )
|
void CalypModulesFactory::Register( const char* moduleName, std::function<CalypModulePtr( void )> pfnCreate )
|
||||||
{
|
{
|
||||||
#ifdef USE_DYNLOAD
|
Register( std::string{ moduleName }, pfnCreate );
|
||||||
void* pHndl = dlopen( dlName, RTLD_NOW );
|
|
||||||
if( pHndl == NULL )
|
|
||||||
{
|
|
||||||
std::cerr << dlerror() << std::endl;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
CreateModuleFn pfnCreate = (CreateModuleFn)dlsym( pHndl, "Maker" );
|
|
||||||
if( pfnCreate == NULL )
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
Register( dlName, pfnCreate );
|
|
||||||
return true;
|
|
||||||
#else
|
|
||||||
return false;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
CalypModulePtr CalypModulesFactory::CreateModule( const char* moduleName )
|
bool CalypModulesFactory::RegisterDl( const char* dlName )
|
||||||
{
|
{
|
||||||
CalypModulesFactoryMap& moduleFactoryMap = CalypModulesFactory::Get()->getMap();
|
// #ifdef USE_DYNLOAD
|
||||||
CalypModulesFactoryMap::iterator it = moduleFactoryMap.begin();
|
// void* pHndl = dlopen( dlName, RTLD_NOW );
|
||||||
for( ; it != moduleFactoryMap.end(); ++it )
|
// if( pHndl == NULL )
|
||||||
|
// {
|
||||||
|
// std::cerr << dlerror() << std::endl;
|
||||||
|
// return false;
|
||||||
|
// }
|
||||||
|
// CreateModuleFn pfnCreate = (CreateModuleFn)dlsym( pHndl, "Maker" );
|
||||||
|
// if( pfnCreate == NULL )
|
||||||
|
// {
|
||||||
|
// return false;
|
||||||
|
// }
|
||||||
|
// Register( dlName, pfnCreate );
|
||||||
|
// return true;
|
||||||
|
// #else
|
||||||
|
return false;
|
||||||
|
// #endif
|
||||||
|
}
|
||||||
|
|
||||||
|
CalypModulePtr CalypModulesFactory::CreateModule( const std::string& moduleName ) const
|
||||||
|
{
|
||||||
|
const auto& moduleFactoryMap = CalypModulesFactory::Get()->getMap();
|
||||||
|
|
||||||
|
if( moduleFactoryMap.contains( moduleName ) )
|
||||||
{
|
{
|
||||||
if( !strcmp( it->first, moduleName ) )
|
auto createFct = moduleFactoryMap.at( moduleName );
|
||||||
{
|
return createFct();
|
||||||
return it->second();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
@@ -25,37 +25,33 @@
|
|||||||
#ifndef __CALYPMODULESFACTORY_H__
|
#ifndef __CALYPMODULESFACTORY_H__
|
||||||
#define __CALYPMODULESFACTORY_H__
|
#define __CALYPMODULESFACTORY_H__
|
||||||
|
|
||||||
|
#include <functional>
|
||||||
#include <map>
|
#include <map>
|
||||||
|
|
||||||
// CalypLib
|
// CalypLib
|
||||||
#include "lib/CalypModuleIf.h"
|
#include "lib/CalypModuleIf.h"
|
||||||
|
|
||||||
#define REGISTER_MODULE( X ) Register( "X", &( X::Create ) );
|
|
||||||
|
|
||||||
typedef CalypModulePtr ( *CreateModuleFn )( void );
|
|
||||||
typedef std::map<const char*, CreateModuleFn> CalypModulesFactoryMap;
|
|
||||||
|
|
||||||
// Factory for creating instances of CalypModuleIf
|
// Factory for creating instances of CalypModuleIf
|
||||||
class CalypModulesFactory
|
class CalypModulesFactory
|
||||||
{
|
{
|
||||||
|
using CalypModulesFactoryMap = std::map<std::string, std::function<CalypModulePtr( void )>>;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
CalypModulesFactory();
|
CalypModulesFactory();
|
||||||
CalypModulesFactory& operator=( const CalypModulesFactory& ) { return *this; }
|
|
||||||
CalypModulesFactoryMap m_FactoryMap;
|
CalypModulesFactoryMap m_FactoryMap;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
~CalypModulesFactory() = default;
|
|
||||||
|
|
||||||
static CalypModulesFactory* Get()
|
static CalypModulesFactory* Get()
|
||||||
{
|
{
|
||||||
static CalypModulesFactory instance;
|
static CalypModulesFactory instance;
|
||||||
return &instance;
|
return &instance;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Register( const char* moduleName, CreateModuleFn pfnCreate );
|
void Register( const std::string& moduleName, std::function<CalypModulePtr( void )> pfnCreate );
|
||||||
|
void Register( const char* moduleName, std::function<CalypModulePtr( void )> pfnCreate );
|
||||||
bool RegisterDl( const char* dlName );
|
bool RegisterDl( const char* dlName );
|
||||||
|
|
||||||
CalypModulePtr CreateModule( const char* moduleName );
|
CalypModulePtr CreateModule( const std::string& moduleName ) const;
|
||||||
CalypModulesFactoryMap& getMap() { return m_FactoryMap; }
|
CalypModulesFactoryMap& getMap() { return m_FactoryMap; }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -26,6 +26,7 @@
|
|||||||
#define __FILTERCOMPONENT_H__
|
#define __FILTERCOMPONENT_H__
|
||||||
|
|
||||||
// CalypLib
|
// CalypLib
|
||||||
|
#include "lib/CalypFrame.h"
|
||||||
#include "lib/CalypModuleIf.h"
|
#include "lib/CalypModuleIf.h"
|
||||||
|
|
||||||
class FilterComponentModule : public CalypModuleIf
|
class FilterComponentModule : public CalypModuleIf
|
||||||
|
|||||||
@@ -24,6 +24,8 @@
|
|||||||
|
|
||||||
#include "FrameDifference.h"
|
#include "FrameDifference.h"
|
||||||
|
|
||||||
|
#include "lib/CalypFrame.h"
|
||||||
|
|
||||||
FrameDifference::FrameDifference()
|
FrameDifference::FrameDifference()
|
||||||
{
|
{
|
||||||
/* Module Definition */
|
/* Module Definition */
|
||||||
|
|||||||
@@ -24,6 +24,8 @@
|
|||||||
|
|
||||||
#include "FrameMask.h"
|
#include "FrameMask.h"
|
||||||
|
|
||||||
|
#include "lib/CalypFrame.h"
|
||||||
|
|
||||||
FrameMask::FrameMask()
|
FrameMask::FrameMask()
|
||||||
{
|
{
|
||||||
/* Module Definition */
|
/* Module Definition */
|
||||||
|
|||||||
@@ -26,6 +26,7 @@
|
|||||||
#define __INTERFRAMEVARIANCE_H__
|
#define __INTERFRAMEVARIANCE_H__
|
||||||
|
|
||||||
// CalypLib
|
// CalypLib
|
||||||
|
#include "lib/CalypFrame.h"
|
||||||
#include "lib/CalypModuleIf.h"
|
#include "lib/CalypModuleIf.h"
|
||||||
|
|
||||||
class InterFrameVariance : public CalypModuleIf
|
class InterFrameVariance : public CalypModuleIf
|
||||||
|
|||||||
@@ -24,12 +24,10 @@
|
|||||||
#include "ShapeDetection.h"
|
#include "ShapeDetection.h"
|
||||||
|
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
|
#include <opencv2/imgproc.hpp>
|
||||||
//#include <opencv2/video/video.hpp>
|
|
||||||
|
|
||||||
using cv::Mat;
|
using cv::Mat;
|
||||||
using cv::Ptr;
|
using cv::Ptr;
|
||||||
using namespace cv::saliency;
|
|
||||||
|
|
||||||
ShapeDetection::ShapeDetection()
|
ShapeDetection::ShapeDetection()
|
||||||
: m_rng( 12345 )
|
: m_rng( 12345 )
|
||||||
|
|||||||
@@ -30,7 +30,6 @@
|
|||||||
|
|
||||||
// OpenCV
|
// OpenCV
|
||||||
#include <opencv2/core/core.hpp>
|
#include <opencv2/core/core.hpp>
|
||||||
#include <opencv2/saliency.hpp>
|
|
||||||
|
|
||||||
class ShapeDetection : public CalypOpenCVModuleIf,
|
class ShapeDetection : public CalypOpenCVModuleIf,
|
||||||
public CalypModuleInstace<ShapeDetection>
|
public CalypModuleInstace<ShapeDetection>
|
||||||
|
|||||||
@@ -3,6 +3,9 @@
|
|||||||
#
|
#
|
||||||
OPTION(BUILD_MODULES_TESTS "Build unit tests of modules" ON)
|
OPTION(BUILD_MODULES_TESTS "Build unit tests of modules" ON)
|
||||||
IF(BUILD_MODULES_TESTS)
|
IF(BUILD_MODULES_TESTS)
|
||||||
|
|
||||||
|
FETCHCONTENT_MAKEAVAILABLE(googletest Catch2)
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${GTEST_INCLUDE_DIRS})
|
INCLUDE_DIRECTORIES(${GTEST_INCLUDE_DIRS})
|
||||||
|
|
||||||
ADD_DEFINITIONS(-DCALYP_TEST_DATA_DIR=\"${CALYP_TEST_DATA_DIR}\")
|
ADD_DEFINITIONS(-DCALYP_TEST_DATA_DIR=\"${CALYP_TEST_DATA_DIR}\")
|
||||||
|
|||||||
@@ -55,17 +55,7 @@ protected:
|
|||||||
void SetUp()
|
void SetUp()
|
||||||
{
|
{
|
||||||
std::string moduleName = CALYP_TEST_MODULE_NAME;
|
std::string moduleName = CALYP_TEST_MODULE_NAME;
|
||||||
|
pcModule = CalypModulesFactory::Get()->CreateModule( moduleName );
|
||||||
CalypModulesFactoryMap& moduleFactoryMap = CalypModulesFactory::Get()->getMap();
|
|
||||||
CalypModulesFactoryMap::iterator it = moduleFactoryMap.begin();
|
|
||||||
for( unsigned int i = 0; it != moduleFactoryMap.end(); ++it, i++ )
|
|
||||||
{
|
|
||||||
if( strcmp( it->first, moduleName.c_str() ) == 0 )
|
|
||||||
{
|
|
||||||
pcModule = it->second();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Called after each test
|
// Called after each test
|
||||||
@@ -89,7 +79,7 @@ TEST_F( TestModuleCreate, FIND_MODULE )
|
|||||||
TEST_F( TestModuleCreate, CREATE_OK )
|
TEST_F( TestModuleCreate, CREATE_OK )
|
||||||
{
|
{
|
||||||
bool moduleRequireOptions = false;
|
bool moduleRequireOptions = false;
|
||||||
if( pcModule->m_uiModuleRequirements & ClpModuleFeature::Options )
|
if( pcModule->has( ClpModuleFeature::Options ) )
|
||||||
{
|
{
|
||||||
moduleRequireOptions = true;
|
moduleRequireOptions = true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -55,16 +55,7 @@ protected:
|
|||||||
pcStream->open( std::string( CALYP_TEST_DATA_DIR ) + std::string( "/BasketballDrill_F10_832x480_yuv420p.yuv" ), 832, 480, ClpPixelFormats::YUV420p, 8,
|
pcStream->open( std::string( CALYP_TEST_DATA_DIR ) + std::string( "/BasketballDrill_F10_832x480_yuv420p.yuv" ), 832, 480, ClpPixelFormats::YUV420p, 8,
|
||||||
CLP_BIG_ENDIAN, 1, CalypStream::Type::Input );
|
CLP_BIG_ENDIAN, 1, CalypStream::Type::Input );
|
||||||
|
|
||||||
CalypModulesFactoryMap& moduleFactoryMap = CalypModulesFactory::Get()->getMap();
|
pcModule = CalypModulesFactory::Get()->CreateModule( moduleName );
|
||||||
CalypModulesFactoryMap::iterator it = moduleFactoryMap.begin();
|
|
||||||
for( unsigned int i = 0; it != moduleFactoryMap.end(); ++it, i++ )
|
|
||||||
{
|
|
||||||
if( strcmp( it->first, moduleName.c_str() ) == 0 )
|
|
||||||
{
|
|
||||||
pcModule = it->second();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void TearDown()
|
void TearDown()
|
||||||
|
|||||||
+2
-11
@@ -303,23 +303,14 @@ int CalypTools::Open( int argc, char* argv[] )
|
|||||||
{
|
{
|
||||||
std::string moduleName = m_strModule;
|
std::string moduleName = m_strModule;
|
||||||
|
|
||||||
CalypModulesFactoryMap& moduleFactoryMap = CalypModulesFactory::Get()->getMap();
|
m_pcCurrModuleIf = CalypModulesFactory::Get()->CreateModule( moduleName );
|
||||||
CalypModulesFactoryMap::iterator it = moduleFactoryMap.begin();
|
|
||||||
for( unsigned int i = 0; it != moduleFactoryMap.end(); ++it, i++ )
|
|
||||||
{
|
|
||||||
if( strcmp( it->first, moduleName.c_str() ) == 0 )
|
|
||||||
{
|
|
||||||
m_pcCurrModuleIf = it->second();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if( !m_pcCurrModuleIf )
|
if( !m_pcCurrModuleIf )
|
||||||
{
|
{
|
||||||
log( CLP_LOG_ERROR, "Invalid module! " );
|
log( CLP_LOG_ERROR, "Invalid module! " );
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if( m_pcCurrModuleIf->m_uiModuleRequirements & ClpModuleFeature::VariableNumOfFrames )
|
if( m_pcCurrModuleIf->has( ClpModuleFeature::VariableNumOfFrames ) )
|
||||||
{
|
{
|
||||||
m_pcCurrModuleIf->m_uiNumberOfFrames = m_apcInputStreams.size();
|
m_pcCurrModuleIf->m_uiNumberOfFrames = m_apcInputStreams.size();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -118,20 +118,10 @@ int CalypToolsCmdParser::parseToolsArgs( int argc, char* argv[] )
|
|||||||
void CalypToolsCmdParser::listModuleHelp()
|
void CalypToolsCmdParser::listModuleHelp()
|
||||||
{
|
{
|
||||||
std::string moduleName = m_strModule;
|
std::string moduleName = m_strModule;
|
||||||
|
auto pcCurrModuleIf = CalypModulesFactory::Get()->CreateModule( moduleName );
|
||||||
CalypModulesFactoryMap& moduleFactoryMap = CalypModulesFactory::Get()->getMap();
|
|
||||||
CalypModulesFactoryMap::iterator it = moduleFactoryMap.begin();
|
|
||||||
for( unsigned int i = 0; it != moduleFactoryMap.end(); ++it, i++ )
|
|
||||||
{
|
|
||||||
if( strcmp( it->first, moduleName.c_str() ) == 0 )
|
|
||||||
{
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
auto pcCurrModuleIf = it->second();
|
|
||||||
if( pcCurrModuleIf )
|
if( pcCurrModuleIf )
|
||||||
{
|
{
|
||||||
printf( "Usage: calypTools --module=%s options:\n", it->first );
|
printf( "Usage: calypTools --module=%s options:\n", moduleName.c_str() );
|
||||||
pcCurrModuleIf->m_cModuleOptions.doHelp( std::cout );
|
pcCurrModuleIf->m_cModuleOptions.doHelp( std::cout );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -143,27 +133,26 @@ void CalypToolsCmdParser::listModules()
|
|||||||
if( m_cOptions.hasOpt( "module_list_full" ) )
|
if( m_cOptions.hasOpt( "module_list_full" ) )
|
||||||
bDetailed = true;
|
bDetailed = true;
|
||||||
|
|
||||||
CalypModulesFactoryMap& moduleFactoryMap = CalypModulesFactory::Get()->getMap();
|
const auto& moduleFactoryMap = CalypModulesFactory::Get()->getMap();
|
||||||
CalypModulesFactoryMap::iterator it = moduleFactoryMap.begin();
|
|
||||||
|
|
||||||
printf( "Calyp available modules: \n" );
|
std::cout << "Calyp available modules:" << std::endl;
|
||||||
printf( " [Internal Name] " );
|
std::cout << " [Internal Name] ";
|
||||||
if( bDetailed )
|
if( bDetailed )
|
||||||
{
|
{
|
||||||
printf( " [Full Name] " );
|
std::cout << " [Full Name] ";
|
||||||
printf( " [Type] " );
|
std::cout << " [Type] ";
|
||||||
printf( " [Description]" );
|
std::cout << " [Description]";
|
||||||
}
|
}
|
||||||
printf( " \n" );
|
std::cout << std::endl;
|
||||||
|
|
||||||
for( unsigned int i = 0; it != moduleFactoryMap.end(); ++it, i++ )
|
for( const auto& [name, moduleFct] : moduleFactoryMap )
|
||||||
{
|
{
|
||||||
printf( " " );
|
printf( " " );
|
||||||
printf( "%-33s", it->first );
|
printf( "%-33s", name.c_str() );
|
||||||
if( bDetailed )
|
if( bDetailed )
|
||||||
{
|
{
|
||||||
std::string ModuleNameString;
|
std::string ModuleNameString;
|
||||||
auto pcCurrModuleIf = it->second();
|
auto pcCurrModuleIf = moduleFct();
|
||||||
|
|
||||||
if( pcCurrModuleIf->m_pchModuleCategory )
|
if( pcCurrModuleIf->m_pchModuleCategory )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -28,6 +28,7 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
#include "lib/CalypDefs.h"
|
||||||
#include "lib/CalypOptions.h"
|
#include "lib/CalypOptions.h"
|
||||||
|
|
||||||
class CalypToolsCmdParser
|
class CalypToolsCmdParser
|
||||||
|
|||||||
Reference in new issue
Block a user