Changeset 1524 in SHVCSoftware for branches/SHM-dev/source/Lib

Timestamp:

3 Feb 2016, 23:00:44 (9 years ago)

Author:

seregin

Message:

fix target layer Id assignment, ticket #97

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TComSlice.cpp (modified) (1 diff)
• TLibDecoder/TDecTop.cpp (modified) (4 diffs)
• TLibDecoder/TDecTop.h (modified) (2 diffs)

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

@@ -1879 +1879 @@
   ::memset(m_outputLayerFlag, 0, sizeof(m_outputLayerFlag));
 
-  ::memset(m_directDependencyFlag, 0, sizeof(m_directDependencyFlag));
+  ::memset(m_directDependencyFlag, false, sizeof(m_directDependencyFlag));
   ::memset(m_numDirectRefLayers,   0, sizeof(m_numDirectRefLayers  ));
   ::memset(m_refLayerId,           0, sizeof(m_refLayerId          ));

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

@@ -2294 +2294 @@
 Void TDecTop::setRefLayerParams( const TComVPS* vps )
 {
-  for(UInt layerIdx = 0; layerIdx < m_numLayer; layerIdx++)
-  {
-    TDecTop *decTop = (TDecTop *)getLayerDec(vps->getLayerIdInNuh(layerIdx));
+#if CONFORMANCE_BITSTREAM_MODE
+  for(UInt layerIdx = 0; layerIdx < MAX_VPS_LAYER_IDX_PLUS1; layerIdx++)
+#else
+  for(UInt layerIdx = 0; layerIdx <= m_commonDecoderParams->getTargetLayerId(); layerIdx++)
+#endif
+  {
+    UInt layerId = vps->getLayerIdInNuh(layerIdx);
+    TDecTop *decTop = m_ppcTDecTop[layerId];
     decTop->setNumSamplePredRefLayers(0);
     decTop->setNumMotionPredRefLayers(0);
@@ -2305 +2310 @@
       if (vps->getDirectDependencyFlag(layerIdx, j))
       {
-        decTop->setRefLayerId(decTop->getNumDirectRefLayers(), vps->getLayerIdInNuh(layerIdx));
+        decTop->setRefLayerId(decTop->getNumDirectRefLayers(), layerId);
         decTop->setNumDirectRefLayers(decTop->getNumDirectRefLayers() + 1);
 
@@ -2320 +2325 @@
 Void TDecTop::checkValueOfTargetOutputLayerSetIdx(TComVPS *vps)
 {
-  CommonDecoderParams* params = this->getCommonDecoderParams();
+  CommonDecoderParams* params = m_commonDecoderParams;
 
   if( params->getValueCheckedFlag() )
@@ -2390 +2395 @@
 #endif
     Int layerSetIdx = vps->getOutputLayerSetIdx( params->getTargetOutputLayerSetIdx() );  // Index to the layer set
-#if !CONFORMANCE_BITSTREAM_MODE
-    assert( params->getTargetLayerId() == vps->getNumLayersInIdList( layerSetIdx ) - 1);
-#endif
     
     // Check if the targetdeclayerIdlist matches the output layer set

branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.h

@@ -133 +133 @@
   static Bool             m_bFirstSliceInSequence;
   UInt                    m_layerId;      
-  UInt                    m_numLayer;
   TDecTop**               m_ppcTDecTop;
   UInt                    m_smallestLayerId;
@@ -226 +225 @@
   UInt      getLayerId                      ()                              { return m_layerId;                }
   Void      setLayerId                      (UInt layer)                    { m_layerId = layer;               }
-  UInt      getNumLayer                     ()                              { return m_numLayer;               }
-  Void      setNumLayer                     (UInt uiNum)                    { m_numLayer = uiNum;              }
   TComList<TComPic*>*  getListPic           ()                              { return &m_cListPic;              }
   Void      setLayerDec                     (TDecTop **p)                   { m_ppcTDecTop = p;                }