Commit 836424d0 authored by Frank Bossen's avatar Frank Bossen

Merge branch 'fix-361' into 'master'

Fix #361: MergeTriangleFlag derivation

See merge request jvet/VVCSoftware_VTM!642
parents 9552d027 755caa8a
Pipeline #1811 passed with stage
......@@ -1492,7 +1492,7 @@ void CABACReader::prediction_unit( PredictionUnit& pu, MergeCtx& mrgCtx )
}
else
{
pu.cu->triangle = pu.cu->cs->slice->getSPS()->getUseTriangle() && pu.cu->cs->slice->isInterB() && !pu.cu->affine && !pu.mmvdMergeFlag && !pu.cu->mmvdSkip;
pu.cu->triangle = pu.cu->cs->slice->getSPS()->getUseTriangle() && pu.cu->cs->slice->isInterB() && !pu.cu->affine && !pu.mmvdMergeFlag && !pu.cu->mmvdSkip && pu.cs->slice->getMaxNumTriangleCand() >= 2;
}
if (pu.mmvdMergeFlag)
{
......
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