Changeset 1146 in SHVCSoftware for branches/SHM-dev/source/App/TAppEncoder

Timestamp:

7 Jul 2015, 23:47:08 (10 years ago)

Author:

seregin

Message:

macro cleanup: O0096_DEFAULT_DEPENDENCY_TYPE

File:

• branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp (modified) (3 diffs)

branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -1476 +1476 @@
   // Direct reference layers
   UInt maxDirectRefLayers = 0;
-#if O0096_DEFAULT_DEPENDENCY_TYPE
   Bool isDefaultDirectDependencyTypeSet = false;
-#endif
   for (UInt layerCtr = 1; layerCtr < vps->getMaxLayers(); layerCtr++)
   {
@@ -1510 +1508 @@
         vps->setDirectDependencyType(layerCtr, refLayerCtr, ((m_acTEncTop[layerCtr].getSamplePredEnabledFlag(numDirectRefLayers) ? 1 : 0) |
           (m_acTEncTop[layerCtr].getMotionPredEnabledFlag(numDirectRefLayers) ? 2 : 0)) - 1);
-#if O0096_DEFAULT_DEPENDENCY_TYPE
+
         if (!isDefaultDirectDependencyTypeSet)
         {
@@ -1521 +1519 @@
           vps->setDefaultDirectDependecyTypeFlag(0);
         }
-#endif
+
         numDirectRefLayers ++;
       }