Commit 03a990f2 authored by Johannes Sauer's avatar Johannes Sauer

FIXED IBC/MV vectors conflict

added check for ibc before writing MV statistics
parent 6b7776ce
......@@ -387,9 +387,16 @@ void writeAllData(const CodingStructure& cs, const UnitArea& ctuArea)
#if JEM_TOOLS || JVET_K0346 || JVET_K_AFFINE
mv.setLowPrec();
mvd.setLowPrec();
#endif
#if JVET_K0076_CPR
if(!cu.ibc)
{
#endif
DTRACE_BLOCK_VECTOR(g_trace_ctx, D_BLOCK_STATISTICS_ALL, pu, GetBlockStatisticName(BlockStatistic::MVDL0), mvd.hor, mvd.ver);
DTRACE_BLOCK_VECTOR(g_trace_ctx, D_BLOCK_STATISTICS_ALL, pu, GetBlockStatisticName(BlockStatistic::MVL0), mv.hor, mv.ver);
#if JVET_K0076_CPR
}
#endif
}
if (pu.interDir != 1 /* PRED_L1 */)
{
......@@ -398,9 +405,16 @@ void writeAllData(const CodingStructure& cs, const UnitArea& ctuArea)
#if JEM_TOOLS || JVET_K0346 || JVET_K_AFFINE
mv.setLowPrec();
mvd.setLowPrec();
#endif
#if JVET_K0076_CPR
if(!cu.ibc)
{
#endif
DTRACE_BLOCK_VECTOR(g_trace_ctx, D_BLOCK_STATISTICS_ALL, pu, GetBlockStatisticName(BlockStatistic::MVDL1), mvd.hor, mvd.ver);
DTRACE_BLOCK_VECTOR(g_trace_ctx, D_BLOCK_STATISTICS_ALL, pu, GetBlockStatisticName(BlockStatistic::MVL1), mv.hor, mv.ver);
#if JVET_K0076_CPR
}
#endif
}
#if JEM_TOOLS || JVET_K_AFFINE
}
......@@ -756,9 +770,16 @@ void writeAllCodedData(const CodingStructure & cs, const UnitArea & ctuArea)
#if JEM_TOOLS || JVET_K0346 || JVET_K_AFFINE
mv.setLowPrec();
mvd.setLowPrec();
#endif
#if JVET_K0076_CPR
if(!cu.ibc)
{
#endif
DTRACE_BLOCK_VECTOR(g_trace_ctx, D_BLOCK_STATISTICS_CODED, pu, GetBlockStatisticName(BlockStatistic::MVDL0), mvd.hor, mvd.ver);
DTRACE_BLOCK_VECTOR(g_trace_ctx, D_BLOCK_STATISTICS_CODED, pu, GetBlockStatisticName(BlockStatistic::MVL0), mv.hor, mv.ver);
#if JVET_K0076_CPR
}
#endif
}
if (pu.interDir != 1 /* PRED_L1 */)
{
......@@ -767,9 +788,16 @@ void writeAllCodedData(const CodingStructure & cs, const UnitArea & ctuArea)
#if JEM_TOOLS || JVET_K0346 || JVET_K_AFFINE
mv.setLowPrec();
mvd.setLowPrec();
#endif
#if JVET_K0076_CPR
if(!cu.ibc)
{
#endif
DTRACE_BLOCK_VECTOR(g_trace_ctx, D_BLOCK_STATISTICS_CODED, pu, GetBlockStatisticName(BlockStatistic::MVDL1), mvd.hor, mvd.ver);
DTRACE_BLOCK_VECTOR(g_trace_ctx, D_BLOCK_STATISTICS_CODED, pu, GetBlockStatisticName(BlockStatistic::MVL1), mv.hor, mv.ver);
#if JVET_K0076_CPR
}
#endif
}
#if JEM_TOOLS || JVET_K_AFFINE
}
......
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