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

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/TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)

branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -3246 +3246 @@
 #if VPS_EXTN_DIRECT_REF_LAYERS
   READ_UVLC( uiCode,           "direct_dep_type_len_minus2"); vps->setDirectDepTypeLen(uiCode+2);
-#if O0096_DEFAULT_DEPENDENCY_TYPE
+
   READ_FLAG(uiCode, "default_direct_dependency_type_flag"); 
   vps->setDefaultDirectDependecyTypeFlag(uiCode == 1? true : false);
-  if (vps->getDefaultDirectDependencyTypeFlag())
+
+  if( vps->getDefaultDirectDependencyTypeFlag() )
   {
     READ_CODE( vps->getDirectDepTypeLen(), uiCode, "default_direct_dependency_type" ); 
     vps->setDefaultDirectDependecyType(uiCode);
   }
-#endif
 
   for( i = vps->getBaseLayerInternalFlag() ? 1 : 2; i < vps->getMaxLayers(); i++ )
@@ -3260 +3260 @@
     for( j = vps->getBaseLayerInternalFlag() ? 0 : 1; j < i; j++ )
     {
-      if (vps->getDirectDependencyFlag(i, j))
-      {
-#if O0096_DEFAULT_DEPENDENCY_TYPE
+      if( vps->getDirectDependencyFlag(i, j) )
+      {
         if (vps->getDefaultDirectDependencyTypeFlag())
         {
@@ -3272 +3271 @@
           vps->setDirectDependencyType(i, j, uiCode);
         }
-#else
-        READ_CODE( vps->getDirectDepTypeLen(), uiCode, "direct_dependency_type[i][j]" ); 
-        vps->setDirectDependencyType(i, j, uiCode);
-#endif
       }
     }