Changeset 1146 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder

Timestamp:

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

Author:

seregin

Message:

macro cleanup: O0096_DEFAULT_DEPENDENCY_TYPE

File:

• branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp (modified) (2 diffs)

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

@@ -2313 +2313 @@
 #if VPS_EXTN_DIRECT_REF_LAYERS
   WRITE_UVLC( vps->getDirectDepTypeLen()-2,                           "direct_dep_type_len_minus2");
-#if O0096_DEFAULT_DEPENDENCY_TYPE
+
   WRITE_FLAG(vps->getDefaultDirectDependencyTypeFlag(), "default_direct_dependency_flag");
-  if (vps->getDefaultDirectDependencyTypeFlag())
+
+  if( vps->getDefaultDirectDependencyTypeFlag() )
   {
     WRITE_CODE( vps->getDefaultDirectDependencyType(), vps->getDirectDepTypeLen(), "default_direct_dependency_type" );
@@ -2332 +2333 @@
     }
   }
-#else
-  for(i = 1; i < vps->getMaxLayers(); i++)
-  {
-    for(j = 0; j < i; j++)
-    {
-      if (vps->getDirectDependencyFlag(i, j))
-      {
-        WRITE_CODE( vps->getDirectDependencyType(i, j), vps->getDirectDepTypeLen(), "direct_dependency_type[i][j]" );
-      }
-    }
-  }
-#endif
 #endif