Commit 716764ea authored by Karsten Suehring's avatar Karsten Suehring

remove macro JVET_L0362_QG_FIX

parent 40d607d9
......@@ -89,7 +89,6 @@
#define JVET_L0362_QG_FIX 1 // QG is the node of qtDepth + mttDepth <= maxDqpDepth
#define JVET_L0362_QG_FIX_CU_REUSE 1 // fix bug on encoder cu coding info reusing fast algorithm (i.e., reuse cu info when having the same neighbor and the same qp)
#define JVET_L0449 1 // code POC value for IDRs
......
......@@ -176,13 +176,8 @@ int CU::predictQP( const CodingUnit& cu, const int prevQP )
return ( a + b + 1 ) >> 1;
}
#if JVET_L0362_QG_FIX
bool CU::isQGStart( const CodingUnit& cu, Partitioner& partitioner )
#else
bool CU::isQGStart( const CodingUnit& cu )
#endif
{
#if JVET_L0362_QG_FIX
int maxDqpDepth = cu.slice->getPPS()->getMaxCuDQPDepth();
if( partitioner.currDepth >= maxDqpDepth )
{
......@@ -195,13 +190,6 @@ bool CU::isQGStart( const CodingUnit& cu )
}
else
return true;
#else
const SPS &sps = *cu.cs->sps;
const PPS &pps = *cu.cs->pps;
return ( cu.blocks[cu.chType].x % ( ( 1 << ( g_aucLog2[sps.getMaxCUWidth()] - pps.getMaxCuDQPDepth() ) ) >> getChannelTypeScaleX( cu.chType, cu.chromaFormat ) ) ) == 0 &&
( cu.blocks[cu.chType].y % ( ( 1 << ( g_aucLog2[sps.getMaxCUHeight()] - pps.getMaxCuDQPDepth() ) ) >> getChannelTypeScaleY( cu.chType, cu.chromaFormat ) ) ) == 0;
#endif
}
uint32_t CU::getNumPUs( const CodingUnit& cu )
......
......@@ -71,11 +71,7 @@ namespace CU
uint32_t getCtuAddr (const CodingUnit &cu);
int predictQP (const CodingUnit& cu, const int prevQP );
#if JVET_L0362_QG_FIX
bool isQGStart (const CodingUnit& cu, Partitioner& partitioner ); // check if start of a Quantization Group
#else
bool isQGStart (const CodingUnit& cu); // check if start of a Quantization Group
#endif
uint32_t getNumPUs (const CodingUnit& cu);
void addPUs ( CodingUnit& cu);
......
......@@ -570,11 +570,7 @@ bool CABACReader::coding_tree( CodingStructure& cs, Partitioner& partitioner, CU
#endif
// Predict QP on start of quantization group
#if JVET_L0362_QG_FIX
if( pps.getUseDQP() && !cuCtx.isDQPCoded && CU::isQGStart( cu, partitioner ) )
#else
if( pps.getUseDQP() && !cuCtx.isDQPCoded && CU::isQGStart( cu ) )
#endif
{
cuCtx.qp = CU::predictQP( cu, cuCtx.qp );
}
......
......@@ -502,11 +502,7 @@ void CABACWriter::coding_tree(const CodingStructure& cs, Partitioner& partitione
}
// Predict QP on start of quantization group
#if JVET_L0362_QG_FIX
if( pps.getUseDQP() && !cuCtx.isDQPCoded && CU::isQGStart( cu, partitioner ) )
#else
if( pps.getUseDQP() && !cuCtx.isDQPCoded && CU::isQGStart( cu ) )
#endif
{
cuCtx.qp = CU::predictQP( cu, cuCtx.qp );
}
......
......@@ -408,11 +408,7 @@ protected:
void init ( const Slice &slice );
bool setFromCs( const CodingStructure& cs, const Partitioner& partitioner );
#if JVET_L0362_QG_FIX
bool isValid ( const CodingStructure& cs, const Partitioner& partitioner, int qp );
#else
bool isValid ( const CodingStructure& cs, const Partitioner& partitioner );
#endif
// TODO: implement copyState
......
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