Skip to content
Snippets Groups Projects
Commit dff95190 authored by Karsten Suehring's avatar Karsten Suehring
Browse files

Merge branch 'Fix#526_RemoveUnnecessaryCheckForRectSlice' into 'master'

Fix#526: Max tiles in rectangular slice

See merge request !937
parents e63a4a67 96539554
No related branches found
No related tags found
1 merge request!937Fix#526: Max tiles in rectangular slice
Pipeline #2728 passed
......@@ -75,7 +75,7 @@ SliceMode : 3 # 0: Disable all slice options.
# 1: Enforce maximum number of LCU in an slice,
# 2: Enforce maximum number of bytes in an 'slice'
# 3: Enforce maximum number of tiles in a slice
SliceArgument : 4 # Argument for 'SliceMode'.
SliceArgument : 2 # Argument for 'SliceMode'.
# If SliceMode==1 it represents max. SliceGranularity-sized blocks per slice.
# If SliceMode==2 it represents max. bytes per slice.
# If SliceMode==3 it represents max. tiles per slice.
......
......@@ -1871,14 +1871,6 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
{
EXIT("Error: One or more slices contain more tiles than the defined number of tiles per slice");
}
if ((sliceEndRow - sliceStartRow + 1) * (sliceEndCol - sliceStartCol + 1) < m_sliceArgument)
{
//Allow less number of tiles only when the rectangular slice is at the right most or bottom most of the picture
if (sliceEndRow != m_numTileRowsMinus1 || sliceEndCol != m_numTileColumnsMinus1)
{
EXIT("Error: One or more slices that is not at the picture boundary contain less tiles than the defined number of tiles per slice");
}
}
}
}
//Check gap case
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment