Commit 016e68f1 authored by Frank Bossen's avatar Frank Bossen

Merge branch 'fix_compError2Nx2N' into 'master'

Fix compiling error with PCM after SIZE_2Nx2N is cleaned

See merge request jvet/VVCSoftware_VTM!116
parents 2733d446 e105957d
Pipeline #419 passed with stage
......@@ -561,7 +561,7 @@ void writeAllCodedData(const CodingStructure & cs, const UnitArea & ctuArea)
// prediction mode and partitioning data
DTRACE_BLOCK_SCALAR(g_trace_ctx, D_BLOCK_STATISTICS_CODED, cu, GetBlockStatisticName(BlockStatistic::PredMode), cu.predMode);
if (CU::isIntra(cu) && cu.partSize == SIZE_2Nx2N)
if (CU::isIntra(cu))
{
if (!(!sps.getUsePCM() || cu.lumaSize().width > (1 << sps.getPCMLog2MaxSize()) || cu.lumaSize().width < (1 << sps.getPCMLog2MinSize())))
{
......@@ -585,7 +585,7 @@ void writeAllCodedData(const CodingStructure & cs, const UnitArea & ctuArea)
DTRACE_BLOCK_SCALAR_CHROMA(g_trace_ctx, D_BLOCK_STATISTICS_CODED, cu, GetBlockStatisticName(BlockStatistic::TransQuantBypassFlag_Chroma), cu.transQuantBypass);
}
if (CU::isIntra(cu) && cu.partSize == SIZE_2Nx2N)
if (CU::isIntra(cu))
{
if (!(!sps.getUsePCM() || cu.lumaSize().width > (1 << sps.getPCMLog2MaxSize()) || cu.lumaSize().width < (1 << sps.getPCMLog2MinSize())))
{
......@@ -651,7 +651,7 @@ void writeAllCodedData(const CodingStructure & cs, const UnitArea & ctuArea)
#if JVET_L0632_AFFINE_MERGE
if (!cu.cs->slice->isIntra() && cu.cs->sps->getSpsNext().getUseAffine() && cu.lumaSize().width > 8 && cu.lumaSize().height > 8)
#else
if (!(cu.cs->slice->isIntra() || !cu.cs->sps->getSpsNext().getUseAffine() || cu.partSize != SIZE_2Nx2N)
if (!(cu.cs->slice->isIntra() || !cu.cs->sps->getSpsNext().getUseAffine())
&& !(!cu.firstPU->mergeFlag && !(cu.lumaSize().width > 8 && cu.lumaSize().height > 8))
&& !(cu.firstPU->mergeFlag && !PU::isAffineMrgFlagCoded(*cu.firstPU)))
#endif
......
......@@ -707,7 +707,7 @@ bool CABACReader::coding_unit( CodingUnit &cu, Partitioner &partitioner, CUCtx&
#if JVET_L0209_PCM
// pcm samples
if( CU::isIntra(cu) && cu.partSize == SIZE_2Nx2N )
if( CU::isIntra(cu) )
{
pcm_flag( cu, partitioner );
if( cu.ipcm )
......@@ -1417,7 +1417,7 @@ void CABACReader::affine_flag( CodingUnit& cu )
}
}
#else
if( cu.cs->slice->isIntra() || !cu.cs->sps->getSpsNext().getUseAffine() || cu.partSize != SIZE_2Nx2N )
if( cu.cs->slice->isIntra() || !cu.cs->sps->getSpsNext().getUseAffine() )
{
return;
}
......
......@@ -631,7 +631,7 @@ void CABACWriter::coding_unit( const CodingUnit& cu, Partitioner& partitioner, C
#if JVET_L0209_PCM
// pcm samples
if( CU::isIntra(cu) && cu.partSize == SIZE_2Nx2N )
if( CU::isIntra(cu) )
{
pcm_data( cu, partitioner );
if( cu.ipcm )
......@@ -1419,7 +1419,7 @@ void CABACWriter::affine_flag( const CodingUnit& cu )
}
}
#else
if( cu.cs->slice->isIntra() || !cu.cs->sps->getSpsNext().getUseAffine() || cu.partSize != SIZE_2Nx2N )
if( cu.cs->slice->isIntra() || !cu.cs->sps->getSpsNext().getUseAffine() )
{
return;
}
......
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