Refactor Playuver into Calyp
commit 1fd9cf34f06ba2a156919b5c9b73c31d4c6c6257 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Mon Mar 12 18:06:39 2018 +0000 Remove code style commit 165588840126a7ab35b32e5be47f00c613829ef3 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Mon Mar 12 18:06:25 2018 +0000 Update Mainpage.dox commit 5b1a2773c48697346c7b0b64519b81a5aecc0150 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Mon Feb 19 03:46:24 2018 +0000 Re-add CalypPixel.cpp but keep include with frame class commit 2343be49ff4906c3171d2df7791e3cf34494eb21 Author: Joao Santos <joaompssantos@gmail.com> Date: Sun Feb 18 21:06:57 2018 +0000 Fixed several things: - Removed unused define - Added: #include <cassert> to MainWindow.cpp - Fixed compilation issue when USE_FFMPEG is OFF on CalypStream.cpp commit 8d1d64bac828a6bcdfa6af977a5d17d0792acb69 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Thu Feb 15 02:14:13 2018 +0000 Fix several things: - Fix examples - Improve code formatting script - Change generated cmake config file commit ea1d0265f1e9300f76fd3f0c8ca03d110ec13eaa Author: Joao Carreira <jfmcarreira@gmail.com> Date: Thu Feb 15 01:28:50 2018 +0000 Fix dump of the module list: remove the use of char arrays commit b4d19dda169715113a74713ca62d05f5a18fd0b5 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Wed Feb 14 23:20:56 2018 +0000 Increase linesize of tools help commit 8b3eab54e376863276b0d7e032f9e1de8aaf90e5 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Wed Feb 14 23:20:35 2018 +0000 Fix CalypPixel commit 1c6ba03c379518acf5fc6f1fdf328ca740a8851d Author: Joao Carreira <jfmcarreira@gmail.com> Date: Wed Feb 14 22:24:10 2018 +0000 Enums CalypPixelFormats and CalypColorSpace are now class independent commit 5dcc35e1716a70095e1720b01823c2e3a3980576 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Wed Feb 14 02:04:31 2018 +0000 Change functions input and return types commit 5514e3e24f9b428d5db71156561b2d8b6f61dd23 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Wed Feb 14 02:04:31 2018 +0000 Change functions input and return types commit fae7a9a91e1899e7a2833c634221f970d44b8fb6 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Wed Feb 14 01:39:14 2018 +0000 Replace custom types with std ones commit 0c3b62b8ea01903e213d9e8dd73a5b49c7c8c36e Author: Joao Carreira <jfmcarreira@gmail.com> Date: Wed Feb 14 00:37:18 2018 +0000 Refactoring entries with Playuver name with Calyp Replace number of frames and add CLP tag into public definitions commit e8cd8d7a219446513a5dda2c183dd892ec25a6f1 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Sat Feb 10 14:42:15 2018 +0000 Fix min opencv version and missing ffmpeg module commit 1233598af8ac15c88fa84569942cc6f865325452 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Sat Feb 10 03:10:12 2018 +0000 Change version to 0.999.0 untill finishing refactoring commit 1fe0cac8f0e70f352bf6c63b8cb2e06ab43fb633 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Sat Feb 10 00:21:47 2018 +0000 Change project library commit 44e9d330bc63b8b8a1687a14ff0be05af0bf2eb5 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Fri Feb 9 01:42:58 2018 +0000 Change doxygen files and upload new ico commit 0d6f3408a2682cfac1533a57a2f1b4e2cc1f0f29 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Thu Feb 8 21:25:31 2018 +0000 Fix logos - different when it is icon or the full logo commit 9f3561acd4b51c7de5f21d63d7e8f2b43c253148 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Thu Feb 8 01:25:39 2018 +0000 fix install files commit 832154e3e40f17a863898a77c929a6c6850ffded Author: Joao Carreira <jfmcarreira@gmail.com> Date: Thu Feb 8 01:21:23 2018 +0000 rename calip to calyp commit 341b32bfcc0133fdbceea9b8390d59190e495b79 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Thu Feb 8 00:58:29 2018 +0000 Refactor lib, modules and tools commit b4b988cf80052fdcfe0e1f9099d5435ef7945584 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Thu Feb 8 00:02:33 2018 +0000 Refactor classes and filename in app commit 6b4ab728202531ad00db1e6299ee69a01f3594ba Author: Joao Carreira <jfmcarreira@gmail.com> Date: Wed Feb 7 17:49:53 2018 +0000 Refactor about dialog and background logo commit d5c954d39fb89d735c4feddf62f529077840ab6c Author: João Santos <joaompssantos@gmail.com> Date: Wed Feb 7 15:05:19 2018 +0000 Added the misteriously missing new logo. commit f40d81f765bfdd2dc89c0647cf5f4a80eef845c7 Author: João Santos <joaompssantos@gmail.com> Date: Wed Feb 7 14:45:08 2018 +0000 Added new logo to resource folder. commit 52dc6d60d6590995d32de33f8199e954e0a6e120 Author: João Santos <joaompssantos@gmail.com> Date: Wed Feb 7 14:41:13 2018 +0000 Added new logo where it was previously forgotten. commit 6d8e064c3154e5202f01b1b10ba6ab3637383ecd Author: João Santos <joaompssantos@gmail.com> Date: Tue Feb 6 17:44:11 2018 +0000 About window no longer resizable. Added new logo.
This commit is contained in:
157 files changed
+16532
-17759
No files matched your search
@@ -1,5 +1,5 @@
|
||||
###
|
||||
### CMakeLists for playuver app component
|
||||
### CMakeLists for calyp tools component
|
||||
###
|
||||
|
||||
# This is hard way - please fix
|
||||
@@ -8,15 +8,15 @@ INCLUDE_DIRECTORIES(
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../ )
|
||||
|
||||
set(plaYUver_Tools_SRCS
|
||||
set(Calyp_Tools_SRCS
|
||||
main.cpp
|
||||
PlaYUVerTools.cpp
|
||||
PlaYUVerToolsCmdParser.cpp
|
||||
CalypTools.cpp
|
||||
CalypToolsCmdParser.cpp
|
||||
)
|
||||
|
||||
ADD_EXECUTABLE( ${PROJECT_NAME}Tools ${plaYUver_Tools_SRCS} )
|
||||
ADD_EXECUTABLE( ${PROJECT_NAME}Tools ${Calyp_Tools_SRCS} )
|
||||
|
||||
TARGET_LINK_LIBRARIES( ${PROJECT_NAME}Tools PlaYUVerLib PlaYUVerModules )
|
||||
TARGET_LINK_LIBRARIES( ${PROJECT_NAME}Tools ${PROJECT_LIBRARY} CalypModules )
|
||||
|
||||
INSTALL(TARGETS ${PROJECT_NAME}Tools DESTINATION bin )
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* This file is a part of PlaYUVer project
|
||||
/* This file is a part of Calyp project
|
||||
* Copyright (C) 2014-2018 by Joao Carreira (jfmcarreira@gmail.com)
|
||||
* Luis Lucas (luisfrlucas@gmail.com)
|
||||
*
|
||||
@@ -18,22 +18,22 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file PlaYUVerTools.cpp
|
||||
* \brief Main definition of the PlaYUVerTools APp
|
||||
* \file CalypTools.cpp
|
||||
* \brief Main definition of the CalypTools APp
|
||||
*/
|
||||
|
||||
#include "PlaYUVerTools.h"
|
||||
#include "CalypTools.h"
|
||||
#include "config.h"
|
||||
|
||||
#include <climits>
|
||||
#include <cstring>
|
||||
|
||||
#include "lib/PlaYUVerFrame.h"
|
||||
#include "lib/PlaYUVerModuleIf.h"
|
||||
#include "lib/PlaYUVerStream.h"
|
||||
#include "modules/PlaYUVerModuleFactory.h"
|
||||
#include "lib/CalypFrame.h"
|
||||
#include "lib/CalypModuleIf.h"
|
||||
#include "lib/CalypStream.h"
|
||||
#include "modules/CalypModulesFactory.h"
|
||||
|
||||
PlaYUVerTools::PlaYUVerTools()
|
||||
CalypTools::CalypTools()
|
||||
{
|
||||
m_bVerbose = true;
|
||||
m_uiOperation = INVALID_OPERATION;
|
||||
@@ -44,13 +44,13 @@ PlaYUVerTools::PlaYUVerTools()
|
||||
m_pcCurrModuleIf = NULL;
|
||||
}
|
||||
|
||||
PlaYUVerTools::~PlaYUVerTools()
|
||||
CalypTools::~CalypTools()
|
||||
{
|
||||
for( UInt i = 0; i < m_apcInputStreams.size(); i++ )
|
||||
for( unsigned int i = 0; i < m_apcInputStreams.size(); i++ )
|
||||
{
|
||||
m_apcInputStreams[i]->close();
|
||||
}
|
||||
for( UInt i = 0; i < m_apcOutputStreams.size(); i++ )
|
||||
for( unsigned int i = 0; i < m_apcOutputStreams.size(); i++ )
|
||||
{
|
||||
m_apcOutputStreams[i]->close();
|
||||
}
|
||||
@@ -58,22 +58,22 @@ PlaYUVerTools::~PlaYUVerTools()
|
||||
|
||||
#define GET_PARAM( X, i ) X[X.size() > i ? i : X.size() - 1]
|
||||
|
||||
Int PlaYUVerTools::openInputs()
|
||||
int CalypTools::openInputs()
|
||||
{
|
||||
/**
|
||||
* Create input streams
|
||||
*/
|
||||
if( Opts().hasOpt( "input" ) )
|
||||
{
|
||||
std::vector<String> inputFileNames = m_apcInputs;
|
||||
std::vector<ClpString> inputFileNames = m_apcInputs;
|
||||
|
||||
String resolutionString( "" );
|
||||
String fmtString( "yuv420p" );
|
||||
UInt uiBitPerPixel = 8;
|
||||
UInt uiEndianness = 0;
|
||||
ClpString resolutionString( "" );
|
||||
ClpString fmtString( "yuv420p" );
|
||||
unsigned int uiBitPerPixel = 8;
|
||||
unsigned int uiEndianness = 0;
|
||||
|
||||
PlaYUVerStream* pcStream;
|
||||
for( UInt i = 0; i < inputFileNames.size() && i < MAX_NUMBER_INPUTS; i++ )
|
||||
CalypStream* pcStream;
|
||||
for( unsigned int i = 0; i < inputFileNames.size() && i < MAX_NUMBER_INPUTS; i++ )
|
||||
{
|
||||
if( Opts().hasOpt( "size" ) )
|
||||
{
|
||||
@@ -98,19 +98,19 @@ Int PlaYUVerTools::openInputs()
|
||||
uiEndianness = 1;
|
||||
}
|
||||
}
|
||||
pcStream = new PlaYUVerStream;
|
||||
pcStream = new CalypStream;
|
||||
try
|
||||
{
|
||||
if( !pcStream->open( inputFileNames[i], resolutionString, fmtString, uiBitPerPixel, uiEndianness, 1, true ) )
|
||||
{
|
||||
log( LOG_ERROR, "Cannot open input stream %s! ", inputFileNames[i].c_str() );
|
||||
log( CLP_LOG_ERROR, "Cannot open input stream %s! ", inputFileNames[i].c_str() );
|
||||
return 2;
|
||||
}
|
||||
m_apcInputStreams.push_back( pcStream );
|
||||
}
|
||||
catch( const char* msg )
|
||||
{
|
||||
log( LOG_ERROR, "Cannot open input stream %s with the following error: \n%s\n", inputFileNames[i].c_str(),
|
||||
log( CLP_LOG_ERROR, "Cannot open input stream %s with the following error: \n%s\n", inputFileNames[i].c_str(),
|
||||
msg );
|
||||
return 2;
|
||||
}
|
||||
@@ -124,7 +124,7 @@ Int PlaYUVerTools::openInputs()
|
||||
}
|
||||
|
||||
m_uiNumberOfComponents = UINT_MAX;
|
||||
for( UInt i = 0; i < m_apcInputStreams.size(); i++ )
|
||||
for( unsigned int i = 0; i < m_apcInputStreams.size(); i++ )
|
||||
{
|
||||
m_uiNumberOfFrames = std::min( m_uiNumberOfFrames, m_apcInputStreams[i]->getFrameNum() );
|
||||
m_uiNumberOfComponents =
|
||||
@@ -134,9 +134,9 @@ Int PlaYUVerTools::openInputs()
|
||||
return 0;
|
||||
}
|
||||
|
||||
Int PlaYUVerTools::Open( Int argc, Char* argv[] )
|
||||
int CalypTools::Open( int argc, char* argv[] )
|
||||
{
|
||||
Int iRet = 0;
|
||||
int iRet = 0;
|
||||
|
||||
if( ( iRet = parseToolsArgs( argc, argv ) ) > 0 )
|
||||
{
|
||||
@@ -152,12 +152,12 @@ Int PlaYUVerTools::Open( Int argc, Char* argv[] )
|
||||
{
|
||||
if( m_apcInputStreams.size() == 0 )
|
||||
{
|
||||
log( LOG_ERROR, "Invalid number of input streams! " );
|
||||
log( CLP_LOG_ERROR, "Invalid number of input streams! " );
|
||||
return 2;
|
||||
}
|
||||
Int64 currFrames = 0;
|
||||
Int64 numberOfFrames = LONG_MAX;
|
||||
for( UInt i = 0; i < m_apcInputStreams.size(); i++ )
|
||||
long long int currFrames = 0;
|
||||
long long int numberOfFrames = LONG_MAX;
|
||||
for( unsigned int i = 0; i < m_apcInputStreams.size(); i++ )
|
||||
{
|
||||
currFrames = m_apcInputStreams[i]->getFrameNum();
|
||||
if( currFrames < numberOfFrames )
|
||||
@@ -166,33 +166,33 @@ Int PlaYUVerTools::Open( Int argc, Char* argv[] )
|
||||
m_iFrameNum = m_iFrames;
|
||||
if( !( m_iFrameNum >= 0 && m_iFrameNum < numberOfFrames ) )
|
||||
{
|
||||
log( LOG_ERROR, "Invalid frame number! Use --frame option " );
|
||||
log( CLP_LOG_ERROR, "Invalid frame number! Use --frame option " );
|
||||
return 2;
|
||||
}
|
||||
if( Opts().hasOpt( "output" ) )
|
||||
m_pcOutputFileNames.push_back( m_strOutput );
|
||||
if( m_pcOutputFileNames.size() != m_apcInputStreams.size() )
|
||||
{
|
||||
log( LOG_ERROR, "Invalid number of outputs! Each input must have an "
|
||||
"output filename. " );
|
||||
log( CLP_LOG_ERROR, "Invalid number of outputs! Each input must have an "
|
||||
"output filename. " );
|
||||
return 2;
|
||||
}
|
||||
|
||||
m_uiOperation = SAVE_OPERATION;
|
||||
m_fpProcess = &PlaYUVerTools::SaveOperation;
|
||||
log( LOG_INFO, "PlaYUVer Save Frame\n" );
|
||||
m_fpProcess = &CalypTools::SaveOperation;
|
||||
log( CLP_LOG_INFO, "Calyp Save Frame\n" );
|
||||
}
|
||||
|
||||
if( Opts().hasOpt( "rate-reduction" ) )
|
||||
{
|
||||
if( m_apcInputStreams.size() == 0 )
|
||||
{
|
||||
log( LOG_ERROR, "Invalid number of input streams! " );
|
||||
log( CLP_LOG_ERROR, "Invalid number of input streams! " );
|
||||
return 2;
|
||||
}
|
||||
Int64 currFrames = 0;
|
||||
Int64 numberOfFrames = LONG_MAX;
|
||||
for( UInt i = 0; i < m_apcInputStreams.size(); i++ )
|
||||
long long int currFrames = 0;
|
||||
long long int numberOfFrames = LONG_MAX;
|
||||
for( unsigned int i = 0; i < m_apcInputStreams.size(); i++ )
|
||||
{
|
||||
currFrames = m_apcInputStreams[i]->getFrameNum();
|
||||
if( currFrames < numberOfFrames )
|
||||
@@ -200,24 +200,24 @@ Int PlaYUVerTools::Open( Int argc, Char* argv[] )
|
||||
}
|
||||
if( m_iRateReductionFactor <= 0 )
|
||||
{
|
||||
log( LOG_ERROR, "Invalid frame rate reduction value!" );
|
||||
log( CLP_LOG_ERROR, "Invalid frame rate reduction value!" );
|
||||
return 2;
|
||||
}
|
||||
|
||||
if( Opts().hasOpt( "output" ) )
|
||||
m_pcOutputFileNames.push_back( m_strOutput );
|
||||
|
||||
PlaYUVerFrame* pcInputFrame = m_apcInputStreams[0]->getCurrFrame();
|
||||
PlaYUVerStream* pcOutputStream = new PlaYUVerStream;
|
||||
CalypFrame* pcInputFrame = m_apcInputStreams[0]->getCurrFrame();
|
||||
CalypStream* pcOutputStream = new CalypStream;
|
||||
try
|
||||
{
|
||||
pcOutputStream->open( m_pcOutputFileNames[0], pcInputFrame->getWidth(), pcInputFrame->getHeight(),
|
||||
pcInputFrame->getPelFormat(), pcInputFrame->getBitsPel(), PLAYUVER_LITTLE_ENDIAN, 1,
|
||||
pcInputFrame->getPelFormat(), pcInputFrame->getBitsPel(), CLP_LITTLE_ENDIAN, 1,
|
||||
false );
|
||||
}
|
||||
catch( const char* msg )
|
||||
{
|
||||
log( LOG_ERROR, "Cannot open input stream %s with the following error %s!\n", m_pcOutputFileNames[0].c_str(),
|
||||
log( CLP_LOG_ERROR, "Cannot open input stream %s with the following error %s!\n", m_pcOutputFileNames[0].c_str(),
|
||||
msg );
|
||||
delete pcOutputStream;
|
||||
pcOutputStream = NULL;
|
||||
@@ -227,14 +227,14 @@ Int PlaYUVerTools::Open( Int argc, Char* argv[] )
|
||||
|
||||
if( m_apcOutputStreams.size() != m_apcInputStreams.size() )
|
||||
{
|
||||
log( LOG_ERROR, "Invalid number of outputs! Each input must have an "
|
||||
"output filename. " );
|
||||
log( CLP_LOG_ERROR, "Invalid number of outputs! Each input must have an "
|
||||
"output filename. " );
|
||||
return 2;
|
||||
}
|
||||
|
||||
m_uiOperation = RATE_REDUCTION_OPERATION;
|
||||
m_fpProcess = &PlaYUVerTools::RateReductionOperation;
|
||||
log( LOG_INFO, "PlaYUVer Frame Rate Reduction\n" );
|
||||
m_fpProcess = &CalypTools::RateReductionOperation;
|
||||
log( CLP_LOG_INFO, "Calyp Frame Rate Reduction\n" );
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -242,27 +242,27 @@ Int PlaYUVerTools::Open( Int argc, Char* argv[] )
|
||||
*/
|
||||
if( Opts().hasOpt( "quality" ) )
|
||||
{
|
||||
String qualityMetric = m_strQualityMetric;
|
||||
ClpString qualityMetric = m_strQualityMetric;
|
||||
if( m_apcInputStreams.size() < 2 )
|
||||
{
|
||||
log( LOG_ERROR, "Invalid number of inputs! " );
|
||||
log( CLP_LOG_ERROR, "Invalid number of inputs! " );
|
||||
return 2;
|
||||
}
|
||||
for( UInt i = 0; i < PlaYUVerFrame::supportedQualityMetricsList().size(); i++ )
|
||||
for( unsigned int i = 0; i < CalypFrame::supportedQualityMetricsList().size(); i++ )
|
||||
{
|
||||
if( lowercase( PlaYUVerFrame::supportedQualityMetricsList()[i] ) == lowercase( qualityMetric ) )
|
||||
if( clpLowercase( CalypFrame::supportedQualityMetricsList()[i] ) == clpLowercase( qualityMetric ) )
|
||||
{
|
||||
m_uiQualityMetric = i;
|
||||
}
|
||||
}
|
||||
if( m_uiQualityMetric == -1 )
|
||||
{
|
||||
log( LOG_ERROR, "Invalid quality metric! " );
|
||||
log( CLP_LOG_ERROR, "Invalid quality metric! " );
|
||||
return 2;
|
||||
}
|
||||
m_uiOperation = QUALITY_OPERATION;
|
||||
m_fpProcess = &PlaYUVerTools::QualityOperation;
|
||||
log( LOG_INFO, "PlaYUVer Quality\n" );
|
||||
m_fpProcess = &CalypTools::QualityOperation;
|
||||
log( CLP_LOG_INFO, "Calyp Quality\n" );
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -270,11 +270,11 @@ Int PlaYUVerTools::Open( Int argc, Char* argv[] )
|
||||
*/
|
||||
if( Opts().hasOpt( "module" ) )
|
||||
{
|
||||
String moduleName = m_strModule;
|
||||
ClpString moduleName = m_strModule;
|
||||
|
||||
PlaYUVerModuleFactoryMap& PlaYUVerModuleFactoryMap = PlaYUVerModuleFactory::Get()->getMap();
|
||||
PlaYUVerModuleFactoryMap::iterator it = PlaYUVerModuleFactoryMap.begin();
|
||||
for( UInt i = 0; it != PlaYUVerModuleFactoryMap.end(); ++it, i++ )
|
||||
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 )
|
||||
{
|
||||
@@ -284,51 +284,51 @@ Int PlaYUVerTools::Open( Int argc, Char* argv[] )
|
||||
}
|
||||
if( !m_pcCurrModuleIf )
|
||||
{
|
||||
log( LOG_ERROR, "Invalid module! " );
|
||||
log( CLP_LOG_ERROR, "Invalid module! " );
|
||||
return 2;
|
||||
}
|
||||
|
||||
if( m_apcInputStreams.size() != m_pcCurrModuleIf->m_uiNumberOfFrames )
|
||||
{
|
||||
log( LOG_ERROR, "Invalid number of inputs! " );
|
||||
log( CLP_LOG_ERROR, "Invalid number of inputs! " );
|
||||
return 2;
|
||||
}
|
||||
|
||||
m_pcCurrModuleIf->m_cModuleOptions.parse( argc, argv );
|
||||
|
||||
// Create Module
|
||||
Bool moduleCreated = false;
|
||||
std::vector<PlaYUVerFrame*> apcFrameList;
|
||||
for( UInt i = 0; i < m_pcCurrModuleIf->m_uiNumberOfFrames; i++ )
|
||||
bool moduleCreated = false;
|
||||
std::vector<CalypFrame*> apcFrameList;
|
||||
for( unsigned int i = 0; i < m_pcCurrModuleIf->m_uiNumberOfFrames; i++ )
|
||||
{
|
||||
apcFrameList.push_back( m_apcInputStreams[i]->getCurrFrame() );
|
||||
}
|
||||
if( m_pcCurrModuleIf->m_iModuleAPI == MODULE_API_2 )
|
||||
if( m_pcCurrModuleIf->m_iModuleAPI == CLP_MODULE_API_2 )
|
||||
{
|
||||
moduleCreated = m_pcCurrModuleIf->create( apcFrameList );
|
||||
}
|
||||
else if( m_pcCurrModuleIf->m_iModuleAPI == MODULE_API_1 )
|
||||
else if( m_pcCurrModuleIf->m_iModuleAPI == CLP_MODULE_API_1 )
|
||||
{
|
||||
m_pcCurrModuleIf->create( m_apcInputStreams[0]->getCurrFrame() );
|
||||
moduleCreated = true;
|
||||
}
|
||||
if( !moduleCreated )
|
||||
{
|
||||
log( LOG_ERROR, "Module is not supported with the selected inputs! " );
|
||||
log( CLP_LOG_ERROR, "Module is not supported with the selected inputs! " );
|
||||
return 2;
|
||||
}
|
||||
|
||||
if( m_pcCurrModuleIf->m_iModuleType == FRAME_PROCESSING_MODULE )
|
||||
if( m_pcCurrModuleIf->m_iModuleType == CLP_FRAME_PROCESSING_MODULE )
|
||||
{
|
||||
// Check outputs
|
||||
std::vector<String> outputFileNames;
|
||||
std::vector<ClpString> outputFileNames;
|
||||
if( Opts().hasOpt( "output" ) )
|
||||
outputFileNames.push_back( m_strOutput );
|
||||
|
||||
if( outputFileNames.size() == 1 )
|
||||
{
|
||||
PlaYUVerFrame* pcModFrame;
|
||||
if( m_pcCurrModuleIf->m_iModuleAPI == MODULE_API_2 )
|
||||
CalypFrame* pcModFrame;
|
||||
if( m_pcCurrModuleIf->m_iModuleAPI == CLP_MODULE_API_2 )
|
||||
{
|
||||
pcModFrame = m_pcCurrModuleIf->process( apcFrameList );
|
||||
}
|
||||
@@ -336,15 +336,15 @@ Int PlaYUVerTools::Open( Int argc, Char* argv[] )
|
||||
{
|
||||
pcModFrame = applyFrameModule();
|
||||
}
|
||||
PlaYUVerStream* pcModStream = new PlaYUVerStream;
|
||||
CalypStream* pcModStream = new CalypStream;
|
||||
try
|
||||
{
|
||||
pcModStream->open( outputFileNames[0], pcModFrame->getWidth(), pcModFrame->getHeight(),
|
||||
pcModFrame->getPelFormat(), pcModFrame->getBitsPel(), PLAYUVER_LITTLE_ENDIAN, 1, false );
|
||||
pcModFrame->getPelFormat(), pcModFrame->getBitsPel(), CLP_LITTLE_ENDIAN, 1, false );
|
||||
}
|
||||
catch( const char* msg )
|
||||
{
|
||||
log( LOG_ERROR, "Cannot open input stream %s with the following error %s!\n", outputFileNames[0].c_str(),
|
||||
log( CLP_LOG_ERROR, "Cannot open input stream %s with the following error %s!\n", outputFileNames[0].c_str(),
|
||||
msg );
|
||||
delete pcModStream;
|
||||
pcModStream = NULL;
|
||||
@@ -354,39 +354,39 @@ Int PlaYUVerTools::Open( Int argc, Char* argv[] )
|
||||
}
|
||||
else
|
||||
{
|
||||
log( LOG_ERROR, "One output is required! " );
|
||||
log( CLP_LOG_ERROR, "One output is required! " );
|
||||
return 2;
|
||||
}
|
||||
}
|
||||
|
||||
m_uiOperation = MODULE_OPERATION;
|
||||
m_fpProcess = &PlaYUVerTools::ModuleOperation;
|
||||
log( LOG_INFO, "PlaYUVer Module\n" );
|
||||
m_fpProcess = &CalypTools::ModuleOperation;
|
||||
log( CLP_LOG_INFO, "Calyp Module\n" );
|
||||
}
|
||||
|
||||
if( m_uiOperation == INVALID_OPERATION )
|
||||
{
|
||||
log( LOG_ERROR, "No operation was selected! " );
|
||||
log( CLP_LOG_ERROR, "No operation was selected! " );
|
||||
return 2;
|
||||
}
|
||||
return iRet;
|
||||
}
|
||||
|
||||
Int PlaYUVerTools::Process()
|
||||
int CalypTools::Process()
|
||||
{
|
||||
return ( this->*m_fpProcess )();
|
||||
}
|
||||
|
||||
Int PlaYUVerTools::Close()
|
||||
int CalypTools::Close()
|
||||
{
|
||||
// Finish
|
||||
return 0;
|
||||
}
|
||||
|
||||
Int PlaYUVerTools::SaveOperation()
|
||||
int CalypTools::SaveOperation()
|
||||
{
|
||||
Bool bRet = true;
|
||||
for( UInt s = 0; s < m_apcInputStreams.size(); s++ )
|
||||
bool bRet = true;
|
||||
for( unsigned int s = 0; s < m_apcInputStreams.size(); s++ )
|
||||
{
|
||||
bRet = m_apcInputStreams[s]->seekInput( m_iFrameNum );
|
||||
if( bRet == false )
|
||||
@@ -398,16 +398,16 @@ Int PlaYUVerTools::SaveOperation()
|
||||
return 0;
|
||||
}
|
||||
|
||||
Int PlaYUVerTools::RateReductionOperation()
|
||||
int CalypTools::RateReductionOperation()
|
||||
{
|
||||
Bool abEOF;
|
||||
log( LOG_INFO, "\n Reducing frame rate by a factor of %d ... ", m_iRateReductionFactor );
|
||||
for( UInt frame = 0; frame < m_uiNumberOfFrames; frame++ )
|
||||
bool abEOF;
|
||||
log( CLP_LOG_INFO, "\n Reducing frame rate by a factor of %d ... ", m_iRateReductionFactor );
|
||||
for( unsigned int frame = 0; frame < m_uiNumberOfFrames; frame++ )
|
||||
{
|
||||
log( LOG_INFO, "\n Reading frame %d ... ", frame );
|
||||
log( CLP_LOG_INFO, "\n Reading frame %d ... ", frame );
|
||||
if( ( frame % m_iRateReductionFactor ) == 0 )
|
||||
{
|
||||
log( LOG_INFO, "Writing", frame );
|
||||
log( CLP_LOG_INFO, "Writing", frame );
|
||||
m_apcOutputStreams[0]->writeFrame( m_apcInputStreams[0]->getCurrFrame() );
|
||||
}
|
||||
abEOF = m_apcInputStreams[0]->setNextFrame();
|
||||
@@ -419,26 +419,26 @@ Int PlaYUVerTools::RateReductionOperation()
|
||||
return 0;
|
||||
}
|
||||
|
||||
Int PlaYUVerTools::QualityOperation()
|
||||
int CalypTools::QualityOperation()
|
||||
{
|
||||
const char* pchQualityMetricName = PlaYUVerFrame::supportedQualityMetricsList()[m_uiQualityMetric].c_str();
|
||||
PlaYUVerFrame* apcCurrFrame[MAX_NUMBER_INPUTS];
|
||||
Bool abEOF[MAX_NUMBER_INPUTS];
|
||||
Double adAverageQuality[MAX_NUMBER_INPUTS - 1][PlaYUVerPixel::getMaxNumberOfComponents()];
|
||||
Double dQuality;
|
||||
const char* pchQualityMetricName = CalypFrame::supportedQualityMetricsList()[m_uiQualityMetric].c_str();
|
||||
CalypFrame* apcCurrFrame[MAX_NUMBER_INPUTS];
|
||||
bool abEOF[MAX_NUMBER_INPUTS];
|
||||
double adAverageQuality[MAX_NUMBER_INPUTS - 1][CalypPixel::getMaxNumberOfComponents()];
|
||||
double dQuality;
|
||||
|
||||
String metric_fmt = " ";
|
||||
ClpString metric_fmt = " ";
|
||||
switch( m_uiQualityMetric )
|
||||
{
|
||||
case PlaYUVerFrame::PSNR_METRIC:
|
||||
case CalypFrame::PSNR_METRIC:
|
||||
//"PSNR_0_0"
|
||||
metric_fmt += " %6.3f ";
|
||||
break;
|
||||
case PlaYUVerFrame::SSIM_METRIC:
|
||||
case CalypFrame::SSIM_METRIC:
|
||||
//"SSIM_0_0"
|
||||
metric_fmt += " %6.4f ";
|
||||
break;
|
||||
case PlaYUVerFrame::MSE_METRIC:
|
||||
case CalypFrame::MSE_METRIC:
|
||||
//"MSE_0_0"
|
||||
metric_fmt += "%7.2f";
|
||||
break;
|
||||
@@ -447,47 +447,47 @@ Int PlaYUVerTools::QualityOperation()
|
||||
}
|
||||
metric_fmt += " ";
|
||||
|
||||
log( LOG_INFO, " Measuring Quality using %s ... \n", pchQualityMetricName );
|
||||
log( LOG_INFO, "# Frame ", pchQualityMetricName );
|
||||
log( CLP_LOG_INFO, " Measuring Quality using %s ... \n", pchQualityMetricName );
|
||||
log( CLP_LOG_INFO, "# Frame ", pchQualityMetricName );
|
||||
|
||||
for( UInt s = 1; s < m_apcInputStreams.size(); s++ )
|
||||
for( unsigned int s = 1; s < m_apcInputStreams.size(); s++ )
|
||||
{
|
||||
for( UInt c = 0; c < m_uiNumberOfComponents; c++ )
|
||||
for( unsigned int c = 0; c < m_uiNumberOfComponents; c++ )
|
||||
{
|
||||
log( LOG_INFO, "%s_%d_%d ", pchQualityMetricName, s, c );
|
||||
log( CLP_LOG_INFO, "%s_%d_%d ", pchQualityMetricName, s, c );
|
||||
}
|
||||
log( LOG_INFO, " " );
|
||||
log( CLP_LOG_INFO, " " );
|
||||
}
|
||||
|
||||
log( LOG_INFO, "\n" );
|
||||
log( CLP_LOG_INFO, "\n" );
|
||||
|
||||
for( UInt s = 0; s < m_apcInputStreams.size(); s++ )
|
||||
for( unsigned int s = 0; s < m_apcInputStreams.size(); s++ )
|
||||
{
|
||||
abEOF[s] = false;
|
||||
for( UInt c = 0; c < m_uiNumberOfComponents; c++ )
|
||||
for( unsigned int c = 0; c < m_uiNumberOfComponents; c++ )
|
||||
{
|
||||
adAverageQuality[s][c] = 0;
|
||||
}
|
||||
}
|
||||
for( UInt frame = 0; frame < m_uiNumberOfFrames; frame++ )
|
||||
for( unsigned int frame = 0; frame < m_uiNumberOfFrames; frame++ )
|
||||
{
|
||||
log( LOG_INFO, " %3d ", frame );
|
||||
for( UInt s = 0; s < m_apcInputStreams.size(); s++ )
|
||||
log( CLP_LOG_INFO, " %3d ", frame );
|
||||
for( unsigned int s = 0; s < m_apcInputStreams.size(); s++ )
|
||||
apcCurrFrame[s] = m_apcInputStreams[s]->getCurrFrame();
|
||||
|
||||
for( UInt s = 1; s < m_apcInputStreams.size(); s++ )
|
||||
for( unsigned int s = 1; s < m_apcInputStreams.size(); s++ )
|
||||
{
|
||||
log( LOG_RESULT, " " );
|
||||
for( UInt c = 0; c < m_uiNumberOfComponents; c++ )
|
||||
log( CLP_LOG_RESULT, " " );
|
||||
for( unsigned int c = 0; c < m_uiNumberOfComponents; c++ )
|
||||
{
|
||||
dQuality = apcCurrFrame[s]->getQuality( m_uiQualityMetric, apcCurrFrame[0], c );
|
||||
adAverageQuality[s - 1][c] = ( adAverageQuality[s - 1][c] * Double( frame ) + dQuality ) / Double( frame + 1 );
|
||||
log( LOG_RESULT, metric_fmt.c_str(), dQuality );
|
||||
adAverageQuality[s - 1][c] = ( adAverageQuality[s - 1][c] * double( frame ) + dQuality ) / double( frame + 1 );
|
||||
log( CLP_LOG_RESULT, metric_fmt.c_str(), dQuality );
|
||||
}
|
||||
log( LOG_RESULT, " " );
|
||||
log( CLP_LOG_RESULT, " " );
|
||||
}
|
||||
log( LOG_RESULT, "\n" );
|
||||
for( UInt s = 0; s < m_apcInputStreams.size(); s++ )
|
||||
log( CLP_LOG_RESULT, "\n" );
|
||||
for( unsigned int s = 0; s < m_apcInputStreams.size(); s++ )
|
||||
{
|
||||
abEOF[s] = m_apcInputStreams[s]->setNextFrame();
|
||||
if( !abEOF[s] )
|
||||
@@ -496,55 +496,55 @@ Int PlaYUVerTools::QualityOperation()
|
||||
}
|
||||
}
|
||||
}
|
||||
log( LOG_INFO, "\n Mean Values: \n " );
|
||||
for( UInt s = 0; s < m_apcInputStreams.size() - 1; s++ )
|
||||
log( CLP_LOG_INFO, "\n Mean Values: \n " );
|
||||
for( unsigned int s = 0; s < m_apcInputStreams.size() - 1; s++ )
|
||||
{
|
||||
for( UInt c = 0; c < m_uiNumberOfComponents; c++ )
|
||||
for( unsigned int c = 0; c < m_uiNumberOfComponents; c++ )
|
||||
{
|
||||
log( LOG_INFO, metric_fmt.c_str(), adAverageQuality[s][c] );
|
||||
log( CLP_LOG_INFO, metric_fmt.c_str(), adAverageQuality[s][c] );
|
||||
}
|
||||
log( LOG_RESULT, " " );
|
||||
log( CLP_LOG_RESULT, " " );
|
||||
}
|
||||
log( LOG_INFO, "\n" );
|
||||
log( CLP_LOG_INFO, "\n" );
|
||||
return 0;
|
||||
}
|
||||
|
||||
PlaYUVerFrame* PlaYUVerTools::applyFrameModule()
|
||||
CalypFrame* CalypTools::applyFrameModule()
|
||||
{
|
||||
PlaYUVerFrame* pcProcessedFrame = NULL;
|
||||
if( m_pcCurrModuleIf->m_iModuleType == FRAME_PROCESSING_MODULE )
|
||||
CalypFrame* pcProcessedFrame = NULL;
|
||||
if( m_pcCurrModuleIf->m_iModuleType == CLP_FRAME_PROCESSING_MODULE )
|
||||
{
|
||||
pcProcessedFrame = m_pcCurrModuleIf->process( m_apcInputStreams[0]->getCurrFrame() );
|
||||
}
|
||||
return pcProcessedFrame;
|
||||
}
|
||||
|
||||
Int PlaYUVerTools::ModuleOperation()
|
||||
int CalypTools::ModuleOperation()
|
||||
{
|
||||
std::vector<PlaYUVerFrame*> apcFrameList;
|
||||
log( LOG_INFO, " Applying Module %s/%s ...\n", m_pcCurrModuleIf->m_pchModuleCategory,
|
||||
std::vector<CalypFrame*> apcFrameList;
|
||||
log( CLP_LOG_INFO, " Applying Module %s/%s ...\n", m_pcCurrModuleIf->m_pchModuleCategory,
|
||||
m_pcCurrModuleIf->m_pchModuleName );
|
||||
|
||||
PlaYUVerFrame* pcProcessedFrame = NULL;
|
||||
Double dMeasurementResult = 0.0;
|
||||
Double dAveragedMeasurementResult = 0;
|
||||
Bool abEOF[MAX_NUMBER_INPUTS];
|
||||
CalypFrame* pcProcessedFrame = NULL;
|
||||
double dMeasurementResult = 0.0;
|
||||
double dAveragedMeasurementResult = 0;
|
||||
bool abEOF[MAX_NUMBER_INPUTS];
|
||||
|
||||
for( UInt s = 0; s < m_apcInputStreams.size(); s++ )
|
||||
for( unsigned int s = 0; s < m_apcInputStreams.size(); s++ )
|
||||
{
|
||||
abEOF[s] = false;
|
||||
}
|
||||
|
||||
for( UInt frame = 0; frame < m_uiNumberOfFrames; frame++ )
|
||||
for( unsigned int frame = 0; frame < m_uiNumberOfFrames; frame++ )
|
||||
{
|
||||
apcFrameList.clear();
|
||||
for( UInt i = 0; i < m_pcCurrModuleIf->m_uiNumberOfFrames; i++ )
|
||||
for( unsigned int i = 0; i < m_pcCurrModuleIf->m_uiNumberOfFrames; i++ )
|
||||
{
|
||||
apcFrameList.push_back( m_apcInputStreams[i]->getCurrFrame() );
|
||||
}
|
||||
if( m_pcCurrModuleIf->m_iModuleType == FRAME_PROCESSING_MODULE )
|
||||
if( m_pcCurrModuleIf->m_iModuleType == CLP_FRAME_PROCESSING_MODULE )
|
||||
{
|
||||
if( m_pcCurrModuleIf->m_iModuleAPI == MODULE_API_2 )
|
||||
if( m_pcCurrModuleIf->m_iModuleAPI == CLP_MODULE_API_2 )
|
||||
{
|
||||
pcProcessedFrame = m_pcCurrModuleIf->process( apcFrameList );
|
||||
}
|
||||
@@ -554,9 +554,9 @@ Int PlaYUVerTools::ModuleOperation()
|
||||
}
|
||||
m_apcOutputStreams[0]->writeFrame( pcProcessedFrame );
|
||||
}
|
||||
else if( m_pcCurrModuleIf->m_iModuleType == FRAME_MEASUREMENT_MODULE )
|
||||
else if( m_pcCurrModuleIf->m_iModuleType == CLP_FRAME_MEASUREMENT_MODULE )
|
||||
{
|
||||
if( m_pcCurrModuleIf->m_iModuleAPI == MODULE_API_2 )
|
||||
if( m_pcCurrModuleIf->m_iModuleAPI == CLP_MODULE_API_2 )
|
||||
{
|
||||
dMeasurementResult = m_pcCurrModuleIf->measure( apcFrameList );
|
||||
}
|
||||
@@ -564,13 +564,13 @@ Int PlaYUVerTools::ModuleOperation()
|
||||
{
|
||||
dMeasurementResult = m_pcCurrModuleIf->measure( m_apcInputStreams[0]->getCurrFrame() );
|
||||
}
|
||||
log( LOG_INFO, " %3d", frame );
|
||||
log( LOG_RESULT, " %8.3f \n", dMeasurementResult );
|
||||
log( CLP_LOG_INFO, " %3d", frame );
|
||||
log( CLP_LOG_RESULT, " %8.3f \n", dMeasurementResult );
|
||||
dAveragedMeasurementResult =
|
||||
( dAveragedMeasurementResult * Double( frame ) + dMeasurementResult ) / Double( frame + 1 );
|
||||
( dAveragedMeasurementResult * double( frame ) + dMeasurementResult ) / double( frame + 1 );
|
||||
}
|
||||
|
||||
for( UInt s = 0; s < m_apcInputStreams.size(); s++ )
|
||||
for( unsigned int s = 0; s < m_apcInputStreams.size(); s++ )
|
||||
{
|
||||
abEOF[s] = m_apcInputStreams[s]->setNextFrame();
|
||||
if( !abEOF[s] )
|
||||
@@ -580,9 +580,9 @@ Int PlaYUVerTools::ModuleOperation()
|
||||
}
|
||||
}
|
||||
|
||||
if( m_pcCurrModuleIf->m_iModuleType == FRAME_MEASUREMENT_MODULE )
|
||||
if( m_pcCurrModuleIf->m_iModuleType == CLP_FRAME_MEASUREMENT_MODULE )
|
||||
{
|
||||
log( LOG_INFO, "\n Mean Value: \n %8.3f\n", dAveragedMeasurementResult );
|
||||
log( CLP_LOG_INFO, "\n Mean Value: \n %8.3f\n", dAveragedMeasurementResult );
|
||||
}
|
||||
|
||||
return 0;
|
||||
@@ -0,0 +1,104 @@
|
||||
/* This file is a part of Calyp project
|
||||
* Copyright (C) 2014-2018 by Joao Carreira (jfmcarreira@gmail.com)
|
||||
* Luis Lucas (luisfrlucas@gmail.com)
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file CalypTools.h
|
||||
* \brief Main definition of the CalypTools app
|
||||
*
|
||||
* @defgroup CalypTools Calyp Tools
|
||||
* @{
|
||||
*
|
||||
* CalypTools is a command line interface
|
||||
* for the modules and quality metrics
|
||||
* included in Calyp
|
||||
*
|
||||
* @}
|
||||
*/
|
||||
|
||||
#ifndef __CALYPTOOLS_H__
|
||||
#define __CALYPTOOLS_H__
|
||||
|
||||
/**
|
||||
* @defgroup CalypTools Calyp Tools
|
||||
* @{
|
||||
* CalypTools is a command line interface
|
||||
* for the modules and quality metrics
|
||||
* included in Calyp
|
||||
* @}
|
||||
*
|
||||
*/
|
||||
|
||||
#include "lib/CalypFrame.h"
|
||||
|
||||
#include "CalypToolsCmdParser.h"
|
||||
|
||||
class CalypFrame;
|
||||
class CalypStream;
|
||||
class CalypModuleIf;
|
||||
|
||||
#define MAX_NUMBER_INPUTS 10
|
||||
|
||||
class CalypTools : public CalypToolsCmdParser
|
||||
{
|
||||
public:
|
||||
CalypTools();
|
||||
~CalypTools();
|
||||
|
||||
int Open( int argc, char* argv[] );
|
||||
int Process();
|
||||
int Close();
|
||||
|
||||
private:
|
||||
bool m_bVerbose;
|
||||
|
||||
unsigned int m_uiOperation;
|
||||
enum TOOLS_OPERATIONS_LIST
|
||||
{
|
||||
INVALID_OPERATION,
|
||||
SAVE_OPERATION,
|
||||
RATE_REDUCTION_OPERATION,
|
||||
QUALITY_OPERATION,
|
||||
MODULE_OPERATION,
|
||||
};
|
||||
|
||||
unsigned int m_uiNumberOfFrames;
|
||||
unsigned int m_uiNumberOfComponents;
|
||||
std::vector<CalypStream*> m_apcInputStreams;
|
||||
std::vector<CalypStream*> m_apcOutputStreams;
|
||||
|
||||
int openInputs();
|
||||
|
||||
typedef int ( CalypTools::*FpProcess )();
|
||||
FpProcess m_fpProcess;
|
||||
|
||||
long long int m_iFrameNum;
|
||||
std::vector<ClpString> m_pcOutputFileNames;
|
||||
int SaveOperation();
|
||||
|
||||
int RateReductionOperation();
|
||||
|
||||
int m_uiQualityMetric;
|
||||
int QualityOperation();
|
||||
|
||||
CalypModuleIf* m_pcCurrModuleIf;
|
||||
CalypFrame* applyFrameModule();
|
||||
int ModuleOperation();
|
||||
};
|
||||
|
||||
#endif // __CALYPTOOLS_H__
|
||||
@@ -1,4 +1,4 @@
|
||||
/* This file is a part of PlaYUVer project
|
||||
/* This file is a part of Calyp project
|
||||
* Copyright (C) 2014-2018 by Joao Carreira (jfmcarreira@gmail.com)
|
||||
* Luis Lucas (luisfrlucas@gmail.com)
|
||||
*
|
||||
@@ -18,22 +18,22 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file PlaYUVerToolsCmdParser.cpp
|
||||
* \file CalypToolsCmdParser.cpp
|
||||
* \brief Handle for command line
|
||||
*/
|
||||
|
||||
#include "PlaYUVerToolsCmdParser.h"
|
||||
#include "CalypToolsCmdParser.h"
|
||||
|
||||
#include "lib/PlaYUVerFrame.h"
|
||||
#include "lib/PlaYUVerModuleIf.h"
|
||||
#include "lib/PlaYUVerStream.h"
|
||||
#include "modules/PlaYUVerModuleFactory.h"
|
||||
#include "lib/CalypFrame.h"
|
||||
#include "lib/CalypModuleIf.h"
|
||||
#include "lib/CalypStream.h"
|
||||
#include "modules/CalypModulesFactory.h"
|
||||
|
||||
#include <cstdarg>
|
||||
#include <cstring>
|
||||
#include <iostream>
|
||||
|
||||
PlaYUVerToolsCmdParser::PlaYUVerToolsCmdParser()
|
||||
CalypToolsCmdParser::CalypToolsCmdParser()
|
||||
{
|
||||
m_uiLogLevel = 0;
|
||||
m_bQuiet = false;
|
||||
@@ -42,9 +42,9 @@ PlaYUVerToolsCmdParser::PlaYUVerToolsCmdParser()
|
||||
m_cOptions.addDefaultOptions();
|
||||
}
|
||||
|
||||
PlaYUVerToolsCmdParser::~PlaYUVerToolsCmdParser() {}
|
||||
CalypToolsCmdParser::~CalypToolsCmdParser() {}
|
||||
|
||||
Void PlaYUVerToolsCmdParser::log( UInt level, const char* fmt, ... )
|
||||
void CalypToolsCmdParser::log( unsigned int level, const char* fmt, ... )
|
||||
{
|
||||
if( level >= m_uiLogLevel )
|
||||
{
|
||||
@@ -55,9 +55,9 @@ Void PlaYUVerToolsCmdParser::log( UInt level, const char* fmt, ... )
|
||||
}
|
||||
}
|
||||
|
||||
Int PlaYUVerToolsCmdParser::parseToolsArgs( Int argc, Char* argv[] )
|
||||
int CalypToolsCmdParser::parseToolsArgs( int argc, char* argv[] )
|
||||
{
|
||||
Int iRet = 0;
|
||||
int iRet = 0;
|
||||
|
||||
m_cOptions.addOptions() /**/
|
||||
( "quiet,q", m_bQuiet, "disable verbose" )( "input,i", m_apcInputs, "input file" ) /**/
|
||||
@@ -79,7 +79,7 @@ Int PlaYUVerToolsCmdParser::parseToolsArgs( Int argc, Char* argv[] )
|
||||
|
||||
if( m_bQuiet )
|
||||
{
|
||||
m_uiLogLevel = LOG_RESULT;
|
||||
m_uiLogLevel = CLP_LOG_RESULT;
|
||||
}
|
||||
|
||||
if( m_cOptions.hasOpt( "module_list" ) || m_cOptions.hasOpt( "module_list_full" ) )
|
||||
@@ -104,14 +104,14 @@ Int PlaYUVerToolsCmdParser::parseToolsArgs( Int argc, Char* argv[] )
|
||||
return iRet;
|
||||
}
|
||||
|
||||
Void PlaYUVerToolsCmdParser::listModuleHelp()
|
||||
void CalypToolsCmdParser::listModuleHelp()
|
||||
{
|
||||
String moduleName = m_strModule;
|
||||
PlaYUVerModuleIf* pcCurrModuleIf = NULL;
|
||||
ClpString moduleName = m_strModule;
|
||||
CalypModuleIf* pcCurrModuleIf = NULL;
|
||||
|
||||
PlaYUVerModuleFactoryMap& PlaYUVerModuleFactoryMap = PlaYUVerModuleFactory::Get()->getMap();
|
||||
PlaYUVerModuleFactoryMap::iterator it = PlaYUVerModuleFactoryMap.begin();
|
||||
for( UInt i = 0; it != PlaYUVerModuleFactoryMap.end(); ++it, i++ )
|
||||
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 )
|
||||
{
|
||||
@@ -121,56 +121,54 @@ Void PlaYUVerToolsCmdParser::listModuleHelp()
|
||||
}
|
||||
if( pcCurrModuleIf )
|
||||
{
|
||||
printf( "Usage: playuverTools --module=%s options:\n", it->first );
|
||||
printf( "Usage: calypTools --module=%s options:\n", it->first );
|
||||
pcCurrModuleIf->m_cModuleOptions.doHelp( std::cout );
|
||||
}
|
||||
}
|
||||
|
||||
Void PlaYUVerToolsCmdParser::listModules()
|
||||
void CalypToolsCmdParser::listModules()
|
||||
{
|
||||
Bool bDetailed = false;
|
||||
bool bDetailed = false;
|
||||
|
||||
if( m_cOptions.hasOpt( "module_list_full" ) )
|
||||
bDetailed = true;
|
||||
|
||||
PlaYUVerModuleIf* pcCurrModuleIf;
|
||||
PlaYUVerModuleFactoryMap& PlaYUVerModuleFactoryMap = PlaYUVerModuleFactory::Get()->getMap();
|
||||
PlaYUVerModuleFactoryMap::iterator it = PlaYUVerModuleFactoryMap.begin();
|
||||
CalypModuleIf* pcCurrModuleIf;
|
||||
CalypModulesFactoryMap& moduleFactoryMap = CalypModulesFactory::Get()->getMap();
|
||||
CalypModulesFactoryMap::iterator it = moduleFactoryMap.begin();
|
||||
|
||||
printf( "PlaYUVer available modules: \n" );
|
||||
printf( " [Internal Name] " );
|
||||
printf( "Calyp available modules: \n" );
|
||||
printf( " [Internal Name] " );
|
||||
if( bDetailed )
|
||||
{
|
||||
printf( " [Full Name] " );
|
||||
printf( " [Full Name] " );
|
||||
printf( " [Type] " );
|
||||
printf( " [Description]" );
|
||||
}
|
||||
printf( " \n" );
|
||||
|
||||
Char ModuleNameString[40];
|
||||
|
||||
for( UInt i = 0; it != PlaYUVerModuleFactoryMap.end(); ++it, i++ )
|
||||
for( unsigned int i = 0; it != moduleFactoryMap.end(); ++it, i++ )
|
||||
{
|
||||
printf( " " );
|
||||
printf( "%-30s", it->first );
|
||||
printf( "%-33s", it->first );
|
||||
if( bDetailed )
|
||||
{
|
||||
ModuleNameString[0] = '\0';
|
||||
ClpString ModuleNameString;
|
||||
pcCurrModuleIf = it->second();
|
||||
|
||||
if( pcCurrModuleIf->m_pchModuleCategory )
|
||||
{
|
||||
strcat( ModuleNameString, pcCurrModuleIf->m_pchModuleCategory );
|
||||
strcat( ModuleNameString, "/" );
|
||||
ModuleNameString += pcCurrModuleIf->m_pchModuleCategory;
|
||||
ModuleNameString += "/";
|
||||
}
|
||||
strcat( ModuleNameString, pcCurrModuleIf->m_pchModuleName );
|
||||
printf( " %-40s", ModuleNameString );
|
||||
ModuleNameString += pcCurrModuleIf->m_pchModuleName;
|
||||
printf( " %-43s", ModuleNameString.c_str() );
|
||||
switch( pcCurrModuleIf->m_iModuleType )
|
||||
{
|
||||
case FRAME_PROCESSING_MODULE:
|
||||
case CLP_FRAME_PROCESSING_MODULE:
|
||||
printf( " Processing " );
|
||||
break;
|
||||
case FRAME_MEASUREMENT_MODULE:
|
||||
case CLP_FRAME_MEASUREMENT_MODULE:
|
||||
printf( " Measurement " );
|
||||
break;
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
/* This file is a part of PlaYUVer project
|
||||
/* This file is a part of Calyp project
|
||||
* Copyright (C) 2014-2018 by Joao Carreira (jfmcarreira@gmail.com)
|
||||
* Luis Lucas (luisfrlucas@gmail.com)
|
||||
*
|
||||
@@ -18,24 +18,23 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file PlaYUVerToolsCmdParser.h
|
||||
* \file CalypToolsCmdParser.h
|
||||
* \brief Handle for command line
|
||||
*/
|
||||
|
||||
#ifndef __PLAYUVERTOOLSCMDPARSER_H__
|
||||
#define __PLAYUVERTOOLSCMDPARSER_H__
|
||||
#ifndef __CALYPTOOLSCMDPARSER_H__
|
||||
#define __CALYPTOOLSCMDPARSER_H__
|
||||
|
||||
#include "config.h"
|
||||
#include "lib/PlaYUVerDefs.h"
|
||||
#include "lib/PlaYUVerOptions.h"
|
||||
#include "lib/CalypOptions.h"
|
||||
|
||||
class PlaYUVerToolsCmdParser
|
||||
class CalypToolsCmdParser
|
||||
{
|
||||
public:
|
||||
PlaYUVerToolsCmdParser();
|
||||
~PlaYUVerToolsCmdParser();
|
||||
CalypToolsCmdParser();
|
||||
~CalypToolsCmdParser();
|
||||
|
||||
Void setLogLevel( enum LOG_LEVEL level ) { m_uiLogLevel = level; }
|
||||
void setLogLevel( enum CLP_LOG_LEVEL level ) { m_uiLogLevel = level; }
|
||||
/**
|
||||
* Send the specified message to the log if the level is higher than or equal
|
||||
* to the current LogLevel. By default, all logging messages are sent to
|
||||
@@ -48,41 +47,41 @@ public:
|
||||
*
|
||||
* @note this function might not be safe in C++ (try to upgrade it)
|
||||
*/
|
||||
Void log( UInt level, const char* fmt, ... );
|
||||
void log( unsigned int level, const char* fmt, ... );
|
||||
|
||||
Int parseToolsArgs( Int argc, Char* argv[] );
|
||||
int parseToolsArgs( int argc, char* argv[] );
|
||||
|
||||
PlaYUVerOptions& Opts() { return m_cOptions; }
|
||||
CalypOptions& Opts() { return m_cOptions; }
|
||||
|
||||
protected:
|
||||
PlaYUVerOptions m_cOptions;
|
||||
UInt m_uiLogLevel;
|
||||
CalypOptions m_cOptions;
|
||||
unsigned int m_uiLogLevel;
|
||||
|
||||
/**
|
||||
* Command line opts for PlaYUVerTools
|
||||
* Command line opts for CalypTools
|
||||
*/
|
||||
Bool m_bShowHelp;
|
||||
Bool m_bShowVersion;
|
||||
Bool m_bQuiet;
|
||||
bool m_bShowHelp;
|
||||
bool m_bShowVersion;
|
||||
bool m_bQuiet;
|
||||
|
||||
std::vector<String> m_apcInputs;
|
||||
std::vector<String> m_strResolution;
|
||||
std::vector<String> m_strPelFmt;
|
||||
std::vector<UInt> m_uiBitsPerPixel;
|
||||
std::vector<String> m_strEndianness;
|
||||
String m_strOutput;
|
||||
Int64 m_iFrames;
|
||||
std::vector<ClpString> m_apcInputs;
|
||||
std::vector<ClpString> m_strResolution;
|
||||
std::vector<ClpString> m_strPelFmt;
|
||||
std::vector<unsigned int> m_uiBitsPerPixel;
|
||||
std::vector<ClpString> m_strEndianness;
|
||||
ClpString m_strOutput;
|
||||
long m_iFrames;
|
||||
|
||||
Int m_iRateReductionFactor;
|
||||
String m_strQualityMetric;
|
||||
String m_strModule;
|
||||
int m_iRateReductionFactor;
|
||||
ClpString m_strQualityMetric;
|
||||
ClpString m_strModule;
|
||||
|
||||
Bool m_bListPelFmts;
|
||||
Bool m_bListQuality;
|
||||
Bool m_bListModules;
|
||||
bool m_bListPelFmts;
|
||||
bool m_bListQuality;
|
||||
bool m_bListModules;
|
||||
|
||||
Void listModules();
|
||||
Void listModuleHelp();
|
||||
void listModules();
|
||||
void listModuleHelp();
|
||||
};
|
||||
|
||||
#endif // __PLAYUVERTOOLSCMDPARSER_H__
|
||||
#endif // __CALYPTOOLSCMDPARSER_H__
|
||||
@@ -1,105 +0,0 @@
|
||||
/* This file is a part of PlaYUVer project
|
||||
* Copyright (C) 2014-2018 by Joao Carreira (jfmcarreira@gmail.com)
|
||||
* Luis Lucas (luisfrlucas@gmail.com)
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file PlaYUVerTools.h
|
||||
* \brief Main definition of the PlaYUVerTools app
|
||||
*
|
||||
* @defgroup PlaYUVerTools PlaYUVer Tools
|
||||
* @{
|
||||
*
|
||||
* PlaYUVerTools is a command line interface
|
||||
* for the modules and quality metrics
|
||||
* included in PlaYUVer
|
||||
*
|
||||
* @}
|
||||
*/
|
||||
|
||||
#ifndef __PLAYUVERTOOLS_H__
|
||||
#define __PLAYUVERTOOLS_H__
|
||||
|
||||
/**
|
||||
* @defgroup PlaYUVerTools PlaYUVer Tools
|
||||
* @{
|
||||
* PlaYUVerTools is a command line interface
|
||||
* for the modules and quality metrics
|
||||
* included in PlaYUVer
|
||||
* @}
|
||||
*
|
||||
*/
|
||||
|
||||
#include "lib/PlaYUVerDefs.h"
|
||||
#include "lib/PlaYUVerFrame.h"
|
||||
|
||||
#include "PlaYUVerToolsCmdParser.h"
|
||||
|
||||
class PlaYUVerFrame;
|
||||
class PlaYUVerStream;
|
||||
class PlaYUVerModuleIf;
|
||||
|
||||
#define MAX_NUMBER_INPUTS 10
|
||||
|
||||
class PlaYUVerTools : public PlaYUVerToolsCmdParser
|
||||
{
|
||||
public:
|
||||
PlaYUVerTools();
|
||||
~PlaYUVerTools();
|
||||
|
||||
Int Open( Int argc, Char* argv[] );
|
||||
Int Process();
|
||||
Int Close();
|
||||
|
||||
private:
|
||||
Bool m_bVerbose;
|
||||
|
||||
UInt m_uiOperation;
|
||||
enum TOOLS_OPERATIONS_LIST
|
||||
{
|
||||
INVALID_OPERATION,
|
||||
SAVE_OPERATION,
|
||||
RATE_REDUCTION_OPERATION,
|
||||
QUALITY_OPERATION,
|
||||
MODULE_OPERATION,
|
||||
};
|
||||
|
||||
UInt m_uiNumberOfFrames;
|
||||
UInt m_uiNumberOfComponents;
|
||||
std::vector<PlaYUVerStream*> m_apcInputStreams;
|
||||
std::vector<PlaYUVerStream*> m_apcOutputStreams;
|
||||
|
||||
Int openInputs();
|
||||
|
||||
typedef Int ( PlaYUVerTools::*FpProcess )();
|
||||
FpProcess m_fpProcess;
|
||||
|
||||
Int64 m_iFrameNum;
|
||||
std::vector<String> m_pcOutputFileNames;
|
||||
Int SaveOperation();
|
||||
|
||||
Int RateReductionOperation();
|
||||
|
||||
Int m_uiQualityMetric;
|
||||
Int QualityOperation();
|
||||
|
||||
PlaYUVerModuleIf* m_pcCurrModuleIf;
|
||||
PlaYUVerFrame* applyFrameModule();
|
||||
Int ModuleOperation();
|
||||
};
|
||||
|
||||
#endif // __PLAYUVERTOOLS_H__
|
||||
+8
-8
@@ -1,4 +1,4 @@
|
||||
/* This file is a part of PlaYUVer project
|
||||
/* This file is a part of Calyp project
|
||||
* Copyright (C) 2014-2018 by Joao Carreira (jfmcarreira@gmail.com)
|
||||
*
|
||||
* Luis Lucas (luisfrlucas@gmail.com)
|
||||
@@ -23,14 +23,14 @@
|
||||
* \brief main file
|
||||
*/
|
||||
|
||||
#include "PlaYUVerTools.h"
|
||||
#include "CalypTools.h"
|
||||
|
||||
int main( int argc, Char* argv[] )
|
||||
int main( int argc, char* argv[] )
|
||||
{
|
||||
Int iRet = 0;
|
||||
PlaYUVerTools PlaYUVerToolsApp;
|
||||
int iRet = 0;
|
||||
CalypTools CalypToolsApp;
|
||||
|
||||
iRet = PlaYUVerToolsApp.Open( argc, argv );
|
||||
iRet = CalypToolsApp.Open( argc, argv );
|
||||
if( iRet == 1 )
|
||||
{
|
||||
return 0;
|
||||
@@ -41,13 +41,13 @@ int main( int argc, Char* argv[] )
|
||||
return 1;
|
||||
}
|
||||
|
||||
if( PlaYUVerToolsApp.Process() > 1 )
|
||||
if( CalypToolsApp.Process() > 1 )
|
||||
{
|
||||
printf( "Exiting with error \n" );
|
||||
return 1;
|
||||
}
|
||||
|
||||
if( PlaYUVerToolsApp.Close() > 1 )
|
||||
if( CalypToolsApp.Close() > 1 )
|
||||
{
|
||||
printf( "Exiting with error \n" );
|
||||
return 1;
|
||||
|
||||
Reference in new issue
Block a user