Commit 29f0c99b authored by Frank Bossen's avatar Frank Bossen

Fix formatting: braces, spaces, indentation

parent deeb649e
This diff is collapsed.
......@@ -194,13 +194,31 @@ void DeriveCtx::CtxSplit( const CodingStructure& cs, Partitioner& partitioner, u
}
unsigned numSplit = 0;
if( canSplit[1] ) numSplit += 2;
if( canSplit[2] ) numSplit += 1;
if( canSplit[3] ) numSplit += 1;
if( canSplit[4] ) numSplit += 1;
if( canSplit[5] ) numSplit += 1;
if (canSplit[1])
{
numSplit += 2;
}
if (canSplit[2])
{
numSplit += 1;
}
if (canSplit[3])
{
numSplit += 1;
}
if (canSplit[4])
{
numSplit += 1;
}
if (canSplit[5])
{
numSplit += 1;
}
if( numSplit > 0 ) numSplit--;
if (numSplit > 0)
{
numSplit--;
}
ctxSpl += 3 * ( numSplit >> 1 );
......@@ -229,9 +247,18 @@ void DeriveCtx::CtxSplit( const CodingStructure& cs, Partitioner& partitioner, u
const unsigned depAbove = area.width / wAbove;
const unsigned depLeft = area.height / hLeft;
if( depAbove == depLeft || !cuLeft || !cuAbove ) ctxHv = 0;
else if( depAbove < depLeft ) ctxHv = 1;
else ctxHv = 2;
if (depAbove == depLeft || !cuLeft || !cuAbove)
{
ctxHv = 0;
}
else if (depAbove < depLeft)
{
ctxHv = 1;
}
else
{
ctxHv = 2;
}
}
else if( numVer < numHor )
{
......
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