Add modules to perform 8 and 9 bits frame difference

This commit is contained in:
jfmcarreira committed 2015-10-21 17:25:52 +01:00
1 parent f805434592
commit d7e54c059c
5 files changed
+146 -2

No files matched your search

+1
View File
@@ -35,6 +35,7 @@ ADD_MODULE( FilterComponentLuma "FilterComponent" )
ADD_MODULE( FilterComponentChromaU "FilterComponent" )
ADD_MODULE( FilterComponentChromaV "FilterComponent" )
ADD_MODULE( FrameDifference "FrameDifference" )
ADD_MODULE( FrameDifference "FrameDifference9Bits" )
ADD_MODULE( AbsoluteFrameDifference "AbsoluteFrameDifference" )
ADD_MODULE( FrameBinarization "FrameBinarization" )
ADD_MODULE( FrameShift "FrameShift" )
+3 -2
View File
@@ -34,7 +34,7 @@ FrameDifference::FrameDifference()
m_iModuleAPI = MODULE_API_2;
m_iModuleType = FRAME_PROCESSING_MODULE;
m_pchModuleCategory = "Measurements";
m_pchModuleName = "FrameDifference";
m_pchModuleName = "FrameDifference8Bits";
m_pchModuleTooltip = "Measure the difference between two images (Y plane), Y1 - Y2, with max absolute diff of 128";
m_uiModuleRequirements = MODULE_REQUIRES_NEW_WINDOW;
m_uiNumberOfFrames = MODULE_REQUIRES_TWO_FRAMES;
@@ -45,7 +45,7 @@ FrameDifference::FrameDifference()
Bool FrameDifference::create( std::vector<PlaYUVerFrame*> apcFrameList )
{
_BASIC_MODULE_API_2_CHECK_
UInt bitsPixel = ( apcFrameList[0]->getBitsPel() + 1 ) & 0x0F;
UInt bitsPixel = ( apcFrameList[0]->getBitsPel() ) & 0x0F;
m_iMaxDiffValue = ( 1 << ( bitsPixel - 1 ) );
m_pcFrameDifference = new PlaYUVerFrame( apcFrameList[0]->getWidth(), apcFrameList[0]->getHeight(), PlaYUVerFrame::GRAY, bitsPixel );
return true;
@@ -65,6 +65,7 @@ PlaYUVerFrame* FrameDifference::process( std::vector<PlaYUVerFrame*> apcFrameLis
aux_pel_1 = *pInput1PelYUV++;
aux_pel_2 = *pInput2PelYUV++;
diff = aux_pel_1 - aux_pel_2;
diff = diff / 2;
diff = std::min( diff, m_iMaxDiffValue );
diff = std::max( diff, -m_iMaxDiffValue );
diff += m_iMaxDiffValue + 1;
+84
View File
@@ -0,0 +1,84 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014-2015 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@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 FrameDifference9Bits.cpp
* \brief Frame Difference module
*/
#include "FrameDifference9Bits.h"
#include <algorithm>
namespace plaYUVer
{
FrameDifference9Bits::FrameDifference9Bits()
{
/* Module Definition */
m_iModuleAPI = MODULE_API_2;
m_iModuleType = FRAME_PROCESSING_MODULE;
m_pchModuleCategory = "Measurements";
m_pchModuleName = "FrameDifference9Bits";
m_pchModuleTooltip = "Measure the difference between two images (Y plane), Y1 - Y2, with max absolute diff of 128";
m_uiModuleRequirements = MODULE_REQUIRES_NEW_WINDOW;
m_uiNumberOfFrames = MODULE_REQUIRES_TWO_FRAMES;
m_pcFrameDifference9Bits = NULL;
}
Bool FrameDifference9Bits::create( std::vector<PlaYUVerFrame*> apcFrameList )
{
_BASIC_MODULE_API_2_CHECK_
UInt bitsPixel = ( apcFrameList[0]->getBitsPel() + 1 ) & 0x0F;
m_iMaxDiffValue = ( 1 << ( bitsPixel - 1 ) );
m_pcFrameDifference9Bits = new PlaYUVerFrame( apcFrameList[0]->getWidth(), apcFrameList[0]->getHeight(), PlaYUVerFrame::GRAY, bitsPixel );
return true;
}
PlaYUVerFrame* FrameDifference9Bits::process( std::vector<PlaYUVerFrame*> apcFrameList )
{
Pel* pInput1PelYUV = apcFrameList[0]->getPelBufferYUV()[0][0];
Pel* pInput2PelYUV = apcFrameList[1]->getPelBufferYUV()[0][0];
Pel* pOutputPelYUV = m_pcFrameDifference9Bits->getPelBufferYUV()[0][0];
Int aux_pel_1, aux_pel_2;
Int diff = 0;
for( UInt y = 0; y < m_pcFrameDifference9Bits->getHeight(); y++ )
for( UInt x = 0; x < m_pcFrameDifference9Bits->getWidth(); x++ )
{
aux_pel_1 = *pInput1PelYUV++;
aux_pel_2 = *pInput2PelYUV++;
diff = aux_pel_1 - aux_pel_2;
diff = std::min( diff, m_iMaxDiffValue );
diff = std::max( diff, -m_iMaxDiffValue );
diff += m_iMaxDiffValue + 1;
*pOutputPelYUV++ = diff;
}
return m_pcFrameDifference9Bits;
}
Void FrameDifference9Bits::destroy()
{
if( m_pcFrameDifference9Bits )
delete m_pcFrameDifference9Bits;
m_pcFrameDifference9Bits = NULL;
}
} // NAMESPACE
+57
View File
@@ -0,0 +1,57 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014-2015 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@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 FrameDifference9Bits.h
* \brief Frame Difference module
*/
#ifndef __FRAMEDIFFERENCE9BITS_H__
#define __FRAMEDIFFERENCE9BITS_H__
#include "lib/PlaYUVerModuleIf.h"
#include <cassert>
namespace plaYUVer
{
class FrameDifference9Bits: public PlaYUVerModuleIf
{
REGISTER_CLASS_FACTORY( FrameDifference9Bits )
private:
Int m_iMaxDiffValue;
PlaYUVerFrame* m_pcFrameDifference9Bits;
public:
FrameDifference9Bits();
virtual ~FrameDifference9Bits()
{
}
Bool create( std::vector<PlaYUVerFrame*> apcFrameList );
PlaYUVerFrame* process( std::vector<PlaYUVerFrame*> apcFrameList );
Void destroy();
};
} // NAMESPACE
#endif // __FRAMEDIFFERENCE9BITS_H__
+1
View File
@@ -41,6 +41,7 @@ PlaYUVerModuleFactory::PlaYUVerModuleFactory()
Register( "FilterComponentChromaV", &FilterComponentChromaV::Create );
Register( "AbsoluteFrameDifference", &AbsoluteFrameDifference::Create );
Register( "FrameDifference", &FrameDifference::Create );
Register( "FrameDifference9Bits", &FrameDifference9Bits::Create );
Register( "SetChromaHalfScale", &SetChromaHalfScale::Create );
Register( "FrameCrop", &FrameCrop::Create );
Register( "FrameBinarization", &FrameBinarization::Create );