Commit 3f2b49e9 authored by Karsten Suehring's avatar Karsten Suehring

Merge branch 'master' into 'master'

clean-up ( removing the redundant macro )

See merge request !509
parents 2a709903 e1f72df8
Pipeline #1446 passed with stage
......@@ -172,8 +172,6 @@
#define JCTVC_Y0038_PARAMS 1
#define JVET_MMVD_OFF_MACRO 0
#define FIX_DB_MAX_TRANSFORM_SIZE 1
#define MRG_SHARELIST_SHARSIZE 32
......
......@@ -851,9 +851,6 @@ void CABACReader::cu_skip_flag( CodingUnit& cu )
#endif
}
#else
#if JVET_MMVD_OFF_MACRO
cu.mmvdSkip = false;
#else
#if JVET_N0127_MMVD_SPS_FLAG
if (cu.cs->slice->getSPS()->getUseMMVD())
{
......@@ -868,7 +865,6 @@ void CABACReader::cu_skip_flag( CodingUnit& cu )
cu.mmvdSkip = false;
}
#endif
#endif
#endif
cu.skip = true;
cu.rootCbf = false;
......@@ -1786,9 +1782,6 @@ void CABACReader::merge_flag( PredictionUnit& pu )
}
}
#else
#if JVET_MMVD_OFF_MACRO
pu.mmvdMergeFlag = false;
#else
#if JVET_N0127_MMVD_SPS_FLAG
if (pu.mergeFlag && pu.cs->sps->getUseMMVD())
#else
......@@ -1805,7 +1798,6 @@ void CABACReader::merge_flag( PredictionUnit& pu )
}
#endif
#endif
#endif
}
......
......@@ -706,7 +706,6 @@ void CABACWriter::cu_skip_flag( const CodingUnit& cu )
#endif
}
#else
#if !JVET_MMVD_OFF_MACRO
#if JVET_N0127_MMVD_SPS_FLAG
if (CU::isInter(cu) && cu.cs->slice->getSPS()->getUseMMVD())
#else
......@@ -716,7 +715,6 @@ void CABACWriter::cu_skip_flag( const CodingUnit& cu )
m_BinEncoder.encodeBin(cu.mmvdSkip, Ctx::MmvdFlag(0));
DTRACE(g_trace_ctx, D_SYNTAX, "mmvd_cu_skip_flag() ctx=%d mmvd_skip=%d\n", 0, cu.mmvdSkip ? 1 : 0);
}
#endif
#endif
}
#if JVET_N0324_REGULAR_MRG_FLAG
......@@ -747,7 +745,6 @@ void CABACWriter::cu_skip_flag( const CodingUnit& cu )
#endif
}
#else
#if !JVET_MMVD_OFF_MACRO
#if JVET_N0127_MMVD_SPS_FLAG
if (cu.skip && !cu.cs->slice->getSPS()->getIBCFlag() && cu.cs->slice->getSPS()->getUseMMVD())
#else
......@@ -758,7 +755,6 @@ void CABACWriter::cu_skip_flag( const CodingUnit& cu )
DTRACE(g_trace_ctx, D_SYNTAX, "mmvd_cu_skip_flag() ctx=%d mmvd_skip=%d\n", 0, cu.mmvdSkip ? 1 : 0);
}
#endif
#endif
}
......@@ -1686,7 +1682,6 @@ void CABACWriter::merge_flag( const PredictionUnit& pu )
#endif
}
#else
#if !JVET_MMVD_OFF_MACRO
#if JVET_N0127_MMVD_SPS_FLAG
if (pu.mergeFlag && pu.cs->sps->getUseMMVD())
#else
......@@ -1697,7 +1692,6 @@ void CABACWriter::merge_flag( const PredictionUnit& pu )
DTRACE(g_trace_ctx, D_SYNTAX, "mmvd_merge_flag() mmvd_merge=%d pos=(%d,%d) size=%dx%d\n", pu.mmvdMergeFlag ? 1 : 0, pu.lumaPos().x, pu.lumaPos().y, pu.lumaSize().width, pu.lumaSize().height);
}
#endif
#endif
}
void CABACWriter::imv_mode( const CodingUnit& cu )
......
......@@ -1922,13 +1922,11 @@ void EncCu::xCheckRDCostMerge2Nx2N( CodingStructure *&tempCS, CodingStructure *&
{
uiBitsCand--;
}
#if !JVET_MMVD_OFF_MACRO
#if JVET_N0127_MMVD_SPS_FLAG
if ( pu.cs->sps->getUseMMVD() )
uiBitsCand++; // for mmvd_flag
#else
uiBitsCand++; // for mmvd_flag
#endif
#endif
double cost = (double)uiSad + (double)uiBitsCand * sqrtLambdaForFirstPass;
#endif
......@@ -2123,7 +2121,6 @@ void EncCu::xCheckRDCostMerge2Nx2N( CodingStructure *&tempCS, CodingStructure *&
m_CABACEstimator->getCtx() = ctxStart;
#endif
}
#if !JVET_MMVD_OFF_MACRO
#if JVET_N0127_MMVD_SPS_FLAG
if ( pu.cs->sps->getUseMMVD() )
{
......@@ -2207,7 +2204,6 @@ void EncCu::xCheckRDCostMerge2Nx2N( CodingStructure *&tempCS, CodingStructure *&
}
#if JVET_N0127_MMVD_SPS_FLAG
}
#endif
#endif
// Try to limit number of candidates using SATD-costs
for( uint32_t i = 1; i < uiNumMrgSATDCand; i++ )
......
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