Commit aaad9077 authored by Adam Wieckowski's avatar Adam Wieckowski

speed-ups

parent 2f6f61b4
......@@ -628,8 +628,6 @@ void EncCu::xCompressCU( CodingStructure *&tempCS, CodingStructure *&bestCS, Par
const uint32_t uiLPelX = tempCS->area.Y().lumaPos().x;
const uint32_t uiTPelY = tempCS->area.Y().lumaPos().y;
const unsigned wIdx = gp_sizeIdxInfo->idxFrom( partitioner.currArea().lwidth() );
const UnitArea currCsArea = clipArea( CS::getArea( *bestCS, bestCS->area, partitioner.chType ), *tempCS->picture );
tempCS->chType = partitioner.chType;
......@@ -1969,7 +1967,6 @@ void EncCu::xCheckRDCostHashInter( CodingStructure *&tempCS, CodingStructure *&b
if (m_pcInterSearch->predInterHashSearch(cu, partitioner, isPerfectMatch))
{
const unsigned wIdx = gp_sizeIdxInfo->idxFrom(tempCS->area.lwidth());
double equGBiCost = MAX_DOUBLE;
#if JVET_M0428_ENC_DB_OPT
......@@ -4028,8 +4025,6 @@ void EncCu::xCheckRDCostInter( CodingStructure *&tempCS, CodingStructure *&bestC
m_pcInterSearch->predInterSearch( cu, partitioner );
const unsigned wIdx = gp_sizeIdxInfo->idxFrom( tempCS->area.lwidth () );
gbiIdx = CU::getValidGbiIdx(cu);
if( testGbi && gbiIdx == GBI_DEFAULT ) // Enabled GBi but the search results is uni.
{
......
......@@ -1078,7 +1078,6 @@ void BestEncInfoCache::copyState(const BestEncInfoCache &other, const UnitArea &
{
m_slice_bencinf = other.m_slice_bencinf;
m_currTemporalId = other.m_currTemporalId;
#if 0
if( m_slice_bencinf->isIntra() ) return;
......@@ -1107,8 +1106,14 @@ void BestEncInfoCache::copyState(const BestEncInfoCache &other, const UnitArea &
{
if( other.m_bestEncInfo[x][y][wIdx][hIdx]->temporalId > m_bestEncInfo[x][y][wIdx][hIdx]->temporalId )
{
memcpy( m_bestEncInfo[x][y][wIdx][hIdx], other.m_bestEncInfo[x][y][wIdx][hIdx], sizeof( BestEncodingInfo ) );
m_bestEncInfo[x][y][wIdx][hIdx]->temporalId = m_currTemporalId;
m_bestEncInfo[x][y][wIdx][hIdx]->cu = other.m_bestEncInfo[x][y][wIdx][hIdx]->cu;
m_bestEncInfo[x][y][wIdx][hIdx]->pu = other.m_bestEncInfo[x][y][wIdx][hIdx]->pu;
m_bestEncInfo[x][y][wIdx][hIdx]->numTus = other.m_bestEncInfo[x][y][wIdx][hIdx]->numTus;
m_bestEncInfo[x][y][wIdx][hIdx]->poc = other.m_bestEncInfo[x][y][wIdx][hIdx]->poc;
m_bestEncInfo[x][y][wIdx][hIdx]->testMode = other.m_bestEncInfo[x][y][wIdx][hIdx]->testMode;
for( int i = 0; i < m_bestEncInfo[x][y][wIdx][hIdx]->numTus; i++ )
m_bestEncInfo[x][y][wIdx][hIdx]->tus[i] = other.m_bestEncInfo[x][y][wIdx][hIdx]->tus[i];
}
}
else if( y + ( height >> MIN_CU_LOG2 ) > maxPosY + 1 )
......@@ -1124,7 +1129,6 @@ void BestEncInfoCache::copyState(const BestEncInfoCache &other, const UnitArea &
}
}
}
#endif
}
void BestEncInfoCache::touch(const UnitArea &area)
......@@ -2214,7 +2218,7 @@ int EncModeCtrlMTnoRQT::getNumParallelJobs( const CodingStructure &cs, Partition
{
numJobs = 4;
}
else if (partitioner.canSplit(CU_VERT_SPLIT, cs))
else if( partitioner.canSplit( CU_VERT_SPLIT, cs ) )
{
numJobs = 3;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment