Ticket #1301: tiles.patch

source/Lib/TLibCommon/TComPicSym.cpp

@@ -249 +249 @@
   }
 
 #if TILE_SIZE_CHECK
-  Int minWidth  = 1;
-  Int minHeight = 1;
-  const Int profileIdc = pps->getSPS()->getPTL()->getGeneralPTL()->getProfileIdc();
-  if (  profileIdc == Profile::MAIN || profileIdc == Profile::MAIN10)
+  if (pps->getTilesEnabledFlag())
   {
-    minHeight = 64  / g_uiMaxCUHeight;
-    minWidth  = 256 / g_uiMaxCUWidth;
-  }
-  for(Int row=0; row < numRows; row++)
-  {
-    for(Int col=0; col < numCols; col++)
+    Int minWidth  = 1;
+    Int minHeight = 1;
+    const Int profileIdc = pps->getSPS()->getPTL()->getGeneralPTL()->getProfileIdc();
+    if (  profileIdc == Profile::MAIN || profileIdc == Profile::MAIN10)
     {
-      const Int tileIdx = row * numCols + col;
-      assert (m_tileParameters[tileIdx].getTileWidth() >= minWidth);
-      assert (m_tileParameters[tileIdx].getTileHeight() >= minHeight);
+      minHeight = 64  / g_uiMaxCUHeight;
+      minWidth  = 256 / g_uiMaxCUWidth;
     }
+    for(Int row=0; row < numRows; row++)
+    {
+      for(Int col=0; col < numCols; col++)
+      {
+        const Int tileIdx = row * numCols + col;
+        assert (m_tileParameters[tileIdx].getTileWidth() >= minWidth);
+        assert (m_tileParameters[tileIdx].getTileHeight() >= minHeight);
+      }
+    }
   }
 #endif