Change includes and minor fixes
This commit is contained in:
1 parent
2a1b0abb2f
commit
eaa9987314
16 files changed
+98
-146
No files matched your search
@@ -52,7 +52,6 @@ HEVCIntraPrediction::HEVCIntraPrediction()
|
||||
;
|
||||
|
||||
m_pcPredBlock = NULL;
|
||||
m_referenceMem = NULL;
|
||||
|
||||
m_uiMode = 26;
|
||||
m_iBlockSize = 4;
|
||||
@@ -66,7 +65,8 @@ bool HEVCIntraPrediction::create( std::vector<CalypFrame*> apcFrameList )
|
||||
m_pcPredBlock = NULL;
|
||||
m_pcPredBlock = new CalypFrame( m_iBlockSize * 2 + 1, m_iBlockSize * 2 + 1, CLP_GRAY, apcFrameList[0]->getBitsPel() );
|
||||
|
||||
getMem1D( &m_referenceMem, m_iBlockSize * 4 );
|
||||
m_referenceMem.resize( m_iBlockSize * 4 );
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -210,7 +210,5 @@ void HEVCIntraPrediction::destroy()
|
||||
{
|
||||
if( m_pcPredBlock )
|
||||
delete m_pcPredBlock;
|
||||
if( m_referenceMem )
|
||||
freeMem1D( m_referenceMem );
|
||||
m_pcPredBlock = NULL;
|
||||
}
|
||||
@@ -39,7 +39,7 @@ private:
|
||||
unsigned int m_uiYpel;
|
||||
bool m_bShowResidue;
|
||||
int m_iBlockSize;
|
||||
ClpPel* m_referenceMem;
|
||||
std::vector<ClpPel> m_referenceMem;
|
||||
|
||||
public:
|
||||
HEVCIntraPrediction();
|
||||
|
||||
@@ -62,11 +62,10 @@ bool OptimiseDisplay::create( std::vector<CalypFrame*> apcFrameList )
|
||||
CalypFrame* OptimiseDisplay::process( std::vector<CalypFrame*> apcFrameList )
|
||||
{
|
||||
unsigned numValues = 1u << apcFrameList[0]->getBitsPel();
|
||||
ClpPel* lookUpTable;
|
||||
std::vector<ClpPel> lookUpTable( numValues, 0 );
|
||||
const ClpPel* pInput1PelYUV = apcFrameList[0]->getPelBufferYUV()[0][0];
|
||||
ClpPel* pOutputPelYUV = m_pcOptimisedFrame->getPelBufferYUV()[0][0];
|
||||
|
||||
getMem1D( &lookUpTable, numValues );
|
||||
apcFrameList[0]->calcHistogram();
|
||||
m_pcOptimisedFrame->reset();
|
||||
|
||||
@@ -92,8 +91,6 @@ CalypFrame* OptimiseDisplay::process( std::vector<CalypFrame*> apcFrameList )
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
freeMem1D( lookUpTable );
|
||||
return m_pcOptimisedFrame;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user