From 16ba68910153810997b2abc7c1375277fe168cbb Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sun, 5 Apr 2015 12:53:13 +0100 Subject: [PATCH] Update modules --- modules/FilterComponent.cpp | 12 ++++++------ modules/FilterComponent.h | 2 +- modules/FrameBinarization.cpp | 2 +- modules/FrameCrop.cpp | 2 +- modules/FrameDifference.cpp | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/FilterComponent.cpp b/modules/FilterComponent.cpp index 17258fb..2fb6a58 100644 --- a/modules/FilterComponent.cpp +++ b/modules/FilterComponent.cpp @@ -34,10 +34,10 @@ FilterComponentModule::FilterComponentModule() m_pcFilteredFrame = NULL; } -Void FilterComponentModule::createFilter( UInt uiWidth, UInt uiHeight ) +Void FilterComponentModule::createFilter( UInt uiWidth, UInt uiHeight, UInt bitsPixel ) { m_pcFilteredFrame = NULL; - m_pcFilteredFrame = new PlaYUVerFrame( uiWidth, uiHeight, PlaYUVerFrame::GRAY ); + m_pcFilteredFrame = new PlaYUVerFrame( uiWidth, uiHeight, PlaYUVerFrame::GRAY, bitsPixel ); } PlaYUVerFrame* FilterComponentModule::filterComponent( PlaYUVerFrame* InputFrame, Int Component ) @@ -60,7 +60,7 @@ FilterComponentLuma::FilterComponentLuma() /* Module Definition */ m_iModuleType = FRAME_PROCESSING_MODULE; // Apply module to the frames or to the whole sequence. // Currently only support for frame - m_pchModuleCategory = "FilterComponent"; // Category (sub-menu) + m_pchModuleCategory = "FilterComponent"; // Category (sub-menu) m_pchModuleName = "Luma"; // Name m_pchModuleTooltip = "Filter Y matrix of YUV frame"; // Description m_uiNumberOfFrames = MODULE_REQUIRES_ONE_FRAME; // Number of Frames required (ONE_FRAME, TWO_FRAMES, THREE_FRAMES) @@ -70,7 +70,7 @@ FilterComponentLuma::FilterComponentLuma() Void FilterComponentLuma::create( PlaYUVerFrame* InputFrame ) { - createFilter( InputFrame->getWidth(), InputFrame->getHeight() ); + createFilter( InputFrame->getWidth(), InputFrame->getHeight(), InputFrame->getBitsPel() ); } PlaYUVerFrame* FilterComponentLuma::process( PlaYUVerFrame* InputFrame ) @@ -91,7 +91,7 @@ FilterComponentChromaU::FilterComponentChromaU() Void FilterComponentChromaU::create( PlaYUVerFrame* InputFrame ) { - createFilter( InputFrame->getChromaWidth(), InputFrame->getChromaHeight() ); + createFilter( InputFrame->getChromaWidth(), InputFrame->getChromaHeight(), InputFrame->getBitsPel() ); } PlaYUVerFrame* FilterComponentChromaU::process( PlaYUVerFrame* InputFrame ) @@ -112,7 +112,7 @@ FilterComponentChromaV::FilterComponentChromaV() Void FilterComponentChromaV::create( PlaYUVerFrame* InputFrame ) { - createFilter( InputFrame->getChromaWidth(), InputFrame->getChromaHeight() ); + createFilter( InputFrame->getChromaWidth(), InputFrame->getChromaHeight(), InputFrame->getBitsPel() ); } PlaYUVerFrame* FilterComponentChromaV::process( PlaYUVerFrame* InputFrame ) diff --git a/modules/FilterComponent.h b/modules/FilterComponent.h index 70e0352..9bc0a89 100644 --- a/modules/FilterComponent.h +++ b/modules/FilterComponent.h @@ -43,7 +43,7 @@ public: PlaYUVerFrame* process( PlaYUVerFrame* ) = 0; Void destroy(); - Void createFilter( UInt uiWidth, UInt uiHeight ); + Void createFilter( UInt uiWidth, UInt uiHeight, UInt bitsPixel ); PlaYUVerFrame* filterComponent( PlaYUVerFrame* InputFrame, Int Component ); }; diff --git a/modules/FrameBinarization.cpp b/modules/FrameBinarization.cpp index fc0a366..ed8662b 100644 --- a/modules/FrameBinarization.cpp +++ b/modules/FrameBinarization.cpp @@ -47,7 +47,7 @@ FrameBinarization::FrameBinarization() Void FrameBinarization::create( PlaYUVerFrame* frame ) { m_pcBinFrame = NULL; - m_pcBinFrame = new PlaYUVerFrame( frame->getWidth(), frame->getHeight(), PlaYUVerFrame::GRAY ); + m_pcBinFrame = new PlaYUVerFrame( frame->getWidth(), frame->getHeight(), PlaYUVerFrame::GRAY, 8 ); } PlaYUVerFrame* FrameBinarization::process( PlaYUVerFrame* frame ) diff --git a/modules/FrameCrop.cpp b/modules/FrameCrop.cpp index d4718cd..23c210f 100644 --- a/modules/FrameCrop.cpp +++ b/modules/FrameCrop.cpp @@ -61,7 +61,7 @@ Void FrameCrop::create( PlaYUVerFrame* frame ) { m_iYSize = frame->getHeight() - m_uiYPosition; } - m_pcCropedFrame = new PlaYUVerFrame( m_iXSize, m_iYSize, frame->getPelFormat() ); + m_pcCropedFrame = new PlaYUVerFrame( m_iXSize, m_iYSize, frame->getPelFormat(), frame->getBitsPel() ); } PlaYUVerFrame* FrameCrop::process( PlaYUVerFrame* frame ) diff --git a/modules/FrameDifference.cpp b/modules/FrameDifference.cpp index 2c47ce5..719b173 100644 --- a/modules/FrameDifference.cpp +++ b/modules/FrameDifference.cpp @@ -43,7 +43,7 @@ FrameDifference::FrameDifference() Void FrameDifference::create( PlaYUVerFrame* Input ) { - m_pcFrameDifference = new PlaYUVerFrame( Input->getWidth(), Input->getHeight(), PlaYUVerFrame::GRAY ); + m_pcFrameDifference = new PlaYUVerFrame( Input->getWidth(), Input->getHeight(), PlaYUVerFrame::GRAY, Input->getBitsPel() ); } PlaYUVerFrame* FrameDifference::process( PlaYUVerFrame* Input1, PlaYUVerFrame* Input2 )