diff --git a/cmake/CMakeMacros.cmake b/cmake/CMakeMacros.cmake index a78b4c0..df9dc09 100644 --- a/cmake/CMakeMacros.cmake +++ b/cmake/CMakeMacros.cmake @@ -105,6 +105,7 @@ macro(ADD_MODULE name file ) set(MODULES_LIBS ${MODULES_LIBS} ${__modulename}) add_definitions( -DUSE_${name} ) LIST(APPEND MODULES_LIST ${name} ) + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/moduleslist.cpp "REGISTER_MODULE( ${name} );") endif() unset(__modulename) endmacro() diff --git a/cmake/ModuleDefault.cmake b/cmake/ModuleDefault.cmake index 3278bb7..999e42c 100644 --- a/cmake/ModuleDefault.cmake +++ b/cmake/ModuleDefault.cmake @@ -3,5 +3,6 @@ ###################################################################################### ADD_MODULE( FilterFrame "FilterFrame.cpp" ) -ADD_MODULE( MeasurePSNR "MeasurePSNR.cpp" ) +ADD_MODULE( FrameDifference "FrameDifference.cpp" ) +#ADD_MODULE( MeasurePSNR "MeasurePSNR.cpp" ) diff --git a/source/app/ModulesHandle.cpp b/source/app/ModulesHandle.cpp index 900a044..1739eff 100644 --- a/source/app/ModulesHandle.cpp +++ b/source/app/ModulesHandle.cpp @@ -29,6 +29,7 @@ // List of modules includes #include "FilterFrame.h" +#include "FrameDifference.h" namespace plaYUVer { @@ -38,6 +39,7 @@ Void ModulesHandle::ModulesList( Bool bCreate ) // Register Modules REGISTER_MODULE( FilterFrame ); + REGISTER_MODULE( FrameDifference ); } diff --git a/source/modules/MeasurePSNR.cpp b/source/modules/MeasurePSNR.cpp index 39779e9..3843fba 100644 --- a/source/modules/MeasurePSNR.cpp +++ b/source/modules/MeasurePSNR.cpp @@ -30,13 +30,13 @@ namespace plaYUVer { -static PlaYUVerModuleDefinition MeasurePSNRDef = { +static PlaYUVerModuleDefinition MeasurePSNRDef = +{ FRAME_LEVEL_MODULE, - "Filters", - "Y_Filter", - "Filter Y matrix of YUV frame", - false, -}; + "Measurements", + "PSNR", + "MEasure the PSNR between two images", + true, }; MeasurePSNR::MeasurePSNR() { @@ -52,9 +52,6 @@ Void MeasurePSNR::create( PlaYUVerFrame* InputFrame ) PlaYUVerFrame* MeasurePSNR::process( PlaYUVerFrame* InputFrame ) { - Pel*** pppOutputPelYUV = m_pcFilteredFrame->getPelBufferYUV(); - Pel*** pppInputPelYUV = InputFrame->getPelBufferYUV(); - memcpy( pppOutputPelYUV[LUMA][0], pppInputPelYUV[LUMA][0], m_pcFilteredFrame->getWidth() * m_pcFilteredFrame->getHeight() * sizeof(Pel) ); return m_pcFilteredFrame; }