Changeset 1146 in SHVCSoftware

Timestamp:

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

Author:

seregin

Message:

macro cleanup: O0096_DEFAULT_DEPENDENCY_TYPE

Location:

branches/SHM-dev/source

Files:

• App/TAppEncoder/TAppEncTop.cpp (modified) (3 diffs)
• Lib/TLibCommon/TComSlice.h (modified) (2 diffs)
• Lib/TLibCommon/TypeDef.h (modified) (1 diff)
• Lib/TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)
• Lib/TLibEncoder/TEncCavlc.cpp (modified) (2 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 ++;
       }

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.h

@@ -665 +665 @@
   UInt       m_refLayerId[MAX_VPS_LAYER_IDX_PLUS1][MAX_VPS_LAYER_IDX_PLUS1];
   UInt       m_directDepTypeLen;
-#if O0096_DEFAULT_DEPENDENCY_TYPE
   Bool       m_defaultDirectDependencyTypeFlag;
   UInt       m_defaultDirectDependencyType;
-#endif
   UInt       m_directDependencyType[MAX_VPS_LAYER_IDX_PLUS1][MAX_VPS_LAYER_IDX_PLUS1];
 #endif
@@ -1037 +1035 @@
   UInt   getDirectDepTypeLen()                                                  { return m_directDepTypeLen;                              }
   Void   setDirectDepTypeLen(UInt x)                                            { m_directDepTypeLen = x;                                 }
-#if O0096_DEFAULT_DEPENDENCY_TYPE
   Bool   getDefaultDirectDependencyTypeFlag()                                   { return m_defaultDirectDependencyTypeFlag;               }
   Void   setDefaultDirectDependecyTypeFlag(Bool x)                              { m_defaultDirectDependencyTypeFlag = x;                  }
   UInt   getDefaultDirectDependencyType()                                       { return m_defaultDirectDependencyType;                   }
   Void   setDefaultDirectDependecyType(UInt x)                                  { m_defaultDirectDependencyType = x;                      }
-#endif
   UInt   getDirectDependencyType(Int currLayerIdx, Int refLayerIdx)             { return m_directDependencyType[currLayerIdx][refLayerIdx]; }
   Void   setDirectDependencyType(Int currLayerIdx, Int refLayerIdx, UInt x)     { m_directDependencyType[currLayerIdx][refLayerIdx] = x;    }

branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

@@ -162 +162 @@
 #define MAX_REF_LAYERS                   7
 #endif
-#define O0096_DEFAULT_DEPENDENCY_TYPE    1      ///< JCTVC-O0096: specify default dependency type for all direct reference layers
 
 #define O0098_SCALED_REF_LAYER_ID        1      ///< JCTVC-O0098: signal scaled reference id

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
       }
     }

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