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

Timestamp:

8 Nov 2013, 08:06:10 (11 years ago)

Author:

seregin

Message:

remove VPS_MOVE_DIR_DEPENDENCY_FLAG macro

File:

• branches/SHM-4.0-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)

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

@@ -1066 +1066 @@
   }
 #endif
-#if VPS_MOVE_DIR_DEPENDENCY_FLAG
 #if VPS_EXTN_DIRECT_REF_LAYERS
   // For layer 0
@@ -1085 +1084 @@
     vps->setNumDirectRefLayers(layerCtr, numDirectRefLayers);
   }
-#endif
 #endif
 #if JCTVC_M0203_INTERLAYER_PRED_IDC
@@ -1259 +1257 @@
 #endif 
 
-#if !VPS_MOVE_DIR_DEPENDENCY_FLAG
-#if VPS_EXTN_DIRECT_REF_LAYERS
-  // For layer 0
-  vps->setNumDirectRefLayers(0, 0);
-  // For other layers
-  for( Int layerCtr = 1; layerCtr <= vps->getMaxLayers() - 1; layerCtr++)
-  {
-    UInt numDirectRefLayers = 0;
-    for( Int refLayerCtr = 0; refLayerCtr < layerCtr; refLayerCtr++)
-    {
-      READ_FLAG(uiCode, "direct_dependency_flag[i][j]" ); vps->setDirectDependencyFlag(layerCtr, refLayerCtr, uiCode? true : false);
-      if(uiCode)
-      {
-        vps->setRefLayerId(layerCtr, numDirectRefLayers, refLayerCtr);
-        numDirectRefLayers++;
-      }
-    }
-    vps->setNumDirectRefLayers(layerCtr, numDirectRefLayers);
-  }
-#endif
-#endif
 #if VPS_EXTN_DIRECT_REF_LAYERS && M0457_PREDICTION_INDICATIONS
   READ_UVLC( uiCode,           "direct_dep_type_len_minus2"); vps->setDirectDepTypeLen(uiCode+2);