Commit a15e8f3c authored by Yin Zhao's avatar Yin Zhao
Browse files

use camelCase for some variables

parent ff2257b3
......@@ -818,24 +818,24 @@ void EncCu::xCompressCU( CodingStructure *&tempCS, CodingStructure *&bestCS, Par
#if JVET_O0050_LOCAL_DUAL_TREE
assert( partitioner.modeType == tempCS->modeType );
int signalModeConsVal = tempCS->signalModeCons( getPartSplit( currTestMode ), partitioner, modeTypeParent );
int num_round_rdo = signalModeConsVal == LDT_MODE_TYPE_SIGNAL ? 2 : 1;
int numRoundRdo = signalModeConsVal == LDT_MODE_TYPE_SIGNAL ? 2 : 1;
bool skipInterPass = false;
for( int i = 0; i < num_round_rdo; i++ )
for( int i = 0; i < numRoundRdo; i++ )
{
//change cons modes
if( signalModeConsVal == LDT_MODE_TYPE_SIGNAL )
{
CHECK( num_round_rdo != 2, "num_round_rdo shall be 2 - [2]" );
CHECK( numRoundRdo != 2, "numRoundRdo shall be 2 - [LDT_MODE_TYPE_SIGNAL]" );
tempCS->modeType = partitioner.modeType = (i == 0) ? MODE_TYPE_INTER : MODE_TYPE_INTRA;
}
else if( signalModeConsVal == LDT_MODE_TYPE_INFER )
{
CHECK( num_round_rdo != 1, "num_round_rdo shall be 1 - [1]" );
CHECK( numRoundRdo != 1, "numRoundRdo shall be 1 - [LDT_MODE_TYPE_INFER]" );
tempCS->modeType = partitioner.modeType = MODE_TYPE_INTRA;
}
else if( signalModeConsVal == LDT_MODE_TYPE_INHERIT )
{
CHECK( num_round_rdo != 1, "num_round_rdo shall be 1 - [0]" );
CHECK( numRoundRdo != 1, "numRoundRdo shall be 1 - [LDT_MODE_TYPE_INHERIT]" );
tempCS->modeType = partitioner.modeType = modeTypeParent;
}
......@@ -866,7 +866,7 @@ void EncCu::xCompressCU( CodingStructure *&tempCS, CodingStructure *&bestCS, Par
if( modeTypeParent == MODE_TYPE_ALL )
{
m_pcIntraSearch->setSaveCuCostInSCIPU( false );
if( num_round_rdo == 2 && tempCS->modeType == MODE_TYPE_INTRA )
if( numRoundRdo == 2 && tempCS->modeType == MODE_TYPE_INTRA )
{
m_pcIntraSearch->initCuAreaCostInSCIPU();
}
......
......@@ -1313,18 +1313,18 @@ void EncModeCtrlMTnoRQT::initCULevel( Partitioner &partitioner, const CodingStru
//////////////////////////////////////////////////////////////////////////
// Add unit coding modes: Intra, InterME, InterMerge ...
#if JVET_O0050_LOCAL_DUAL_TREE
bool try_intra_rdo = true;
bool try_inter_rdo = true;
bool try_ibc_rdo = true;
bool tryIntraRdo = true;
bool tryInterRdo = true;
bool tryIBCRdo = true;
if( partitioner.isConsIntra() )
{
try_inter_rdo = false;
tryInterRdo = false;
}
else if( partitioner.isConsInter() )
{
try_intra_rdo = try_ibc_rdo = false;
tryIntraRdo = tryIBCRdo = false;
}
checkIbc &= try_ibc_rdo;
checkIbc &= tryIBCRdo;
#endif
for( int qpLoop = maxQP; qpLoop >= minQP; qpLoop-- )
......@@ -1341,7 +1341,7 @@ void EncModeCtrlMTnoRQT::initCULevel( Partitioner &partitioner, const CodingStru
#endif
// add intra modes
#if JVET_O0050_LOCAL_DUAL_TREE
if( try_intra_rdo )
if( tryIntraRdo )
{
#endif
m_ComprCUCtxList.back().testModes.push_back( { ETM_IPCM, ETO_STANDARD, qp, lossless } );
......@@ -1362,7 +1362,7 @@ void EncModeCtrlMTnoRQT::initCULevel( Partitioner &partitioner, const CodingStru
// add first pass modes
#if JVET_O0050_LOCAL_DUAL_TREE
if ( !m_slice->isIRAP() && !( cs.area.lwidth() == 4 && cs.area.lheight() == 4 ) && try_inter_rdo )
if ( !m_slice->isIRAP() && !( cs.area.lwidth() == 4 && cs.area.lheight() == 4 ) && tryInterRdo )
#else
if ( !m_slice->isIRAP() && !( cs.area.lwidth() == 4 && cs.area.lheight() == 4 ) )
#endif
......
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