From 63442d58b960fc2ceb63771c927e955d30880497 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Tue, 28 May 2019 19:05:16 +0100 Subject: [PATCH] Complete last commig --- tools/CalypTools.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/CalypTools.cpp b/tools/CalypTools.cpp index b1bc721..16f5557 100644 --- a/tools/CalypTools.cpp +++ b/tools/CalypTools.cpp @@ -324,11 +324,17 @@ int CalypTools::Open( int argc, char* argv[] ) return -1; } - if( !(m_pcCurrModuleIf->m_uiModuleRequirements & CLP_MODULES_VARIABLE_NUM_FRAMES) && - m_apcInputStreams.size() != m_pcCurrModuleIf->m_uiNumberOfFrames ) + if( m_pcCurrModuleIf->m_uiModuleRequirements & CLP_MODULES_VARIABLE_NUM_FRAMES ) { - log( CLP_LOG_ERROR, "Invalid number of inputs! " ); - return -1; + m_pcCurrModuleIf->m_uiNumberOfFrames = m_apcInputStreams.size(); + } + else + { + if( m_apcInputStreams.size() != m_pcCurrModuleIf->m_uiNumberOfFrames ) + { + log( CLP_LOG_ERROR, "Invalid number of inputs! " ); + return -1; + } } m_pcCurrModuleIf->m_cModuleOptions.parse( argc, argv );