Changeset 1309 in SHVCSoftware for branches/SHM-dev/source/Lib

Timestamp:

21 Jul 2015, 01:23:27 (9 years ago)

Author:

seregin

Message:

port rev 4380

File:

• branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp

@@ -368 +368 @@
   }
 
-  // Prepare delta's:
-  for(UInt sizeId = 0; sizeId < SCALING_LIST_SIZE_NUM; sizeId++)
-  {
-    const Int predListStep = (sizeId == SCALING_LIST_32x32? (SCALING_LIST_NUM/NUMBER_OF_PREDICTION_MODES) : 1); // if 32x32, skip over chroma entries.
-
-    for(UInt listId = 0; listId < SCALING_LIST_NUM; listId+=predListStep)
-    {
-      m_cSPS.getScalingList().checkPredMode( sizeId, listId );
-    }
-  }
-
+  if (getUseScalingListId() != SCALING_LIST_OFF)
+  {
+    // Prepare delta's:
+    for(UInt sizeId = 0; sizeId < SCALING_LIST_SIZE_NUM; sizeId++)
+    {
+      const Int predListStep = (sizeId == SCALING_LIST_32x32? (SCALING_LIST_NUM/NUMBER_OF_PREDICTION_MODES) : 1); // if 32x32, skip over chroma entries.
+
+      for(UInt listId = 0; listId < SCALING_LIST_NUM; listId+=predListStep)
+      {
+        m_cSPS.getScalingList().checkPredMode( sizeId, listId );
+      }
+    }
+  }
 }