From 7c608e9d38299a4a0253b88af107805e81fd31eb Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Mon, 23 Feb 2015 21:38:12 +0000 Subject: [PATCH] Reorganize functions --- lib/PlaYUVerCmdParser.cpp | 12 +++++-- lib/PlaYUVerCmdParser.h | 3 +- tools/PlaYUVerTools.cpp | 74 +++++++++++++++++++++------------------ tools/PlaYUVerTools.h | 10 +++++- tools/main.cpp | 8 ++++- 5 files changed, 67 insertions(+), 40 deletions(-) diff --git a/lib/PlaYUVerCmdParser.cpp b/lib/PlaYUVerCmdParser.cpp index 3701c20..7a9ef94 100644 --- a/lib/PlaYUVerCmdParser.cpp +++ b/lib/PlaYUVerCmdParser.cpp @@ -33,10 +33,10 @@ namespace plaYUVer { -PlaYUVerCmdParser::PlaYUVerCmdParser( Int argc, Char *argv[] ) +PlaYUVerCmdParser::PlaYUVerCmdParser() { - m_iArgc = argc; - m_apcArgv = argv; + m_iArgc = 0; + m_apcArgv = NULL; m_ParserOptions.add( GetCommandOpts() ); } @@ -45,6 +45,12 @@ PlaYUVerCmdParser::~PlaYUVerCmdParser() } +Void PlaYUVerCmdParser::Config( Int argc, Char *argv[] ) +{ + m_iArgc = argc; + m_apcArgv = argv; +} + po::options_description PlaYUVerCmdParser::GetCommandOpts() { po::options_description inputOpts( "Input" ); diff --git a/lib/PlaYUVerCmdParser.h b/lib/PlaYUVerCmdParser.h index 6831788..6dbee30 100644 --- a/lib/PlaYUVerCmdParser.h +++ b/lib/PlaYUVerCmdParser.h @@ -32,9 +32,10 @@ namespace plaYUVer class PlaYUVerCmdParser { public: - PlaYUVerCmdParser( Int argc, Char *argv[] ); + PlaYUVerCmdParser(); ~PlaYUVerCmdParser(); + Void Config( Int argc, Char *argv[] ); Void addOptions( po::options_description ); Bool parse(); diff --git a/tools/PlaYUVerTools.cpp b/tools/PlaYUVerTools.cpp index 39d87a9..116c47e 100644 --- a/tools/PlaYUVerTools.cpp +++ b/tools/PlaYUVerTools.cpp @@ -45,33 +45,25 @@ PlaYUVerTools::~PlaYUVerTools() } } -Int PlaYUVerTools::Open( Int argc, Char *argv[] ) +Int PlaYUVerTools::openInputs() { - - PlaYUVerCmdParser cCommandLineParser( argc, argv ); - - if( !cCommandLineParser.parse() ) - { - return 1; - } - /** * Create input streams */ - if( cCommandLineParser.getOptionsMap().count( "input" ) ) + if( m_cCommandLineParser.getOptionsMap().count( "input" ) ) { std::string resolutionString; - if( cCommandLineParser.getOptionsMap().count( "size" ) ) + if( m_cCommandLineParser.getOptionsMap().count( "size" ) ) { - resolutionString = cCommandLineParser.getOptionsMap()["size"].as(); + resolutionString = m_cCommandLineParser.getOptionsMap()["size"].as(); } std::string fmtString( "yuv420p" ); - if( cCommandLineParser.getOptionsMap().count( "pel_fmt" ) ) + if( m_cCommandLineParser.getOptionsMap().count( "pel_fmt" ) ) { - fmtString = cCommandLineParser.getOptionsMap()["pel_fmt"].as(); + fmtString = m_cCommandLineParser.getOptionsMap()["pel_fmt"].as(); } - std::vector inputFileNames = cCommandLineParser.getOptionsMap()["input"].as >(); + std::vector inputFileNames = m_cCommandLineParser.getOptionsMap()["input"].as >(); PlaYUVerStream* pcStream; for( UInt i = 0; i < inputFileNames.size(); i++ ) @@ -85,9 +77,9 @@ Int PlaYUVerTools::Open( Int argc, Char *argv[] ) m_apcInputStreams.push_back( pcStream ); } m_uiNumberOfFrames = MAX_UINT; - if( cCommandLineParser.getOptionsMap().count( "frames" ) ) + if( m_cCommandLineParser.getOptionsMap().count( "frames" ) ) { - m_uiNumberOfFrames = cCommandLineParser.getOptionsMap()["frames"].as(); + m_uiNumberOfFrames = m_cCommandLineParser.getOptionsMap()["frames"].as(); } m_uiNumberOfComponents = MAX_UINT; @@ -99,21 +91,38 @@ Int PlaYUVerTools::Open( Int argc, Char *argv[] ) m_uiNumberOfComponents = m_apcInputStreams[i]->getCurrFrame()->getNumberChannels(); } } + return 0; +} - /** - * Create output streams - */ - if( cCommandLineParser.getOptionsMap().count( "output" ) ) +Int PlaYUVerTools::openOutputs() +{ + if( m_cCommandLineParser.getOptionsMap().count( "output" ) ) { } + return 0; +} + +Int PlaYUVerTools::Open( Int argc, Char *argv[] ) +{ + m_cCommandLineParser.Config( argc, argv ); + if( !m_cCommandLineParser.parse() ) + { + return 1; + } + + if( openInputs() > 0 || openOutputs() > 0 ) + { + return 2; + } + /** * Check Quality operation */ - if( cCommandLineParser.getOptionsMap().count( "quality" ) ) + if( m_cCommandLineParser.getOptionsMap().count( "quality" ) ) { m_uiOperationIndex = -1; - std::string qualityMetric = cCommandLineParser.getOptionsMap()["quality"].as(); + std::string qualityMetric = m_cCommandLineParser.getOptionsMap()["quality"].as(); if( m_apcInputStreams.size() != 2 ) { printf( "Invalid number of inputs! " ); @@ -132,12 +141,13 @@ Int PlaYUVerTools::Open( Int argc, Char *argv[] ) return 2; } m_uiOperation = QUALITY_OPERATION; + m_fpProcess = &PlaYUVerTools::QualityOperation; } /** * Check Module operation */ - if( cCommandLineParser.getOptionsMap().count( "module" ) ) + if( m_cCommandLineParser.getOptionsMap().count( "module" ) ) { } @@ -152,14 +162,7 @@ Int PlaYUVerTools::Open( Int argc, Char *argv[] ) Int PlaYUVerTools::Process() { - switch( m_uiOperation ) - { - case QUALITY_OPERATION: - printf( " Measuring Quality using %s ... \n", PlaYUVerFrame::supportedQualityMetricsList()[m_uiOperationIndex].c_str() ); - qualityOperation(); - break; - } - return 0; + return (this->*m_fpProcess)(); } Int PlaYUVerTools::Close() @@ -168,13 +171,15 @@ Int PlaYUVerTools::Close() return 0; } -Void PlaYUVerTools::qualityOperation() +Int PlaYUVerTools::QualityOperation() { PlaYUVerFrame* apcCurrFrame[m_apcInputStreams.size()]; Bool abEOF[m_apcInputStreams.size()]; Double adAverageQuality[m_apcInputStreams.size() - 1][m_uiNumberOfComponents]; Double dQuality; + printf( " Measuring Quality using %s ... \n", PlaYUVerFrame::supportedQualityMetricsList()[m_uiOperationIndex].c_str() ); + for( UInt s = 0; s < m_apcInputStreams.size(); s++ ) { abEOF[s] = false; @@ -218,7 +223,8 @@ Void PlaYUVerTools::qualityOperation() printf( " %5.3f", adAverageQuality[s][c] ); } } - printf( "\n"); + printf( "\n" ); + return 0; } } // NAMESPACE diff --git a/tools/PlaYUVerTools.h b/tools/PlaYUVerTools.h index 5e6f4a3..75314f1 100644 --- a/tools/PlaYUVerTools.h +++ b/tools/PlaYUVerTools.h @@ -45,6 +45,8 @@ public: Int Close(); private: + PlaYUVerCmdParser m_cCommandLineParser; + UInt m_uiOperation; Int m_uiOperationIndex; enum TOOLS_OPERATIONS_LIST @@ -59,7 +61,13 @@ private: std::vector m_apcInputStreams; std::vector m_apcOutputStreams; - Void qualityOperation(); + Int openInputs(); + Int openOutputs(); + + typedef Int (PlaYUVerTools::*FpProcess) (); + FpProcess m_fpProcess; + + Int QualityOperation(); }; } // NAMESPACE diff --git a/tools/main.cpp b/tools/main.cpp index 910ddc6..4c31c20 100644 --- a/tools/main.cpp +++ b/tools/main.cpp @@ -29,9 +29,15 @@ using namespace plaYUVer; int main( int argc, char *argv[] ) { + Int iRet = 0; PlaYUVerTools PlaYUVerToolsApp; - if( PlaYUVerToolsApp.Open( argc, argv ) > 1 ) + iRet = PlaYUVerToolsApp.Open( argc, argv ); + if( iRet == 1 ) + { + return 0; + } + if( iRet > 1 ) { printf( "Exiting\n" ); return 1;