Changeset 1251 in 3DVCSoftware

Timestamp:

4 Jun 2015, 11:47:20 (9 years ago)

Author:

rwth

Message:

• bug fix

Location:

branches/HTM-14.1-update-dev1-RWTH/source/Lib

Files:

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

branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibCommon/TComSlice.cpp

@@ -2855 +2855 @@
     m_bUseDLTFlag                 [i] = false;
     m_bInterViewDltPredEnableFlag [i] = false;
+    m_bDltBitMapRepFlag           [i] = false;
 
     // allocate some memory and initialize with default mapping
@@ -2860 +2861 @@
     m_iDepthValue2Idx[i]    = std::vector<Int>(m_iNumDepthmapValues[i]);
     m_iIdx2DepthValue[i]    = std::vector<Int>(m_iNumDepthmapValues[i]);
+    
+    m_iDepthIdxToLayerId[i] = i;
 
     //default mapping

branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibCommon/TComSlice.h

@@ -1367 +1367 @@
 
   Int               m_iNumDepthmapValues          [ MAX_NUM_LAYERS ];
-  std::vector<Int>  m_iDepthValue2Idx [ MAX_NUM_LAYERS ];
-  std::vector<Int>  m_iIdx2DepthValue [ MAX_NUM_LAYERS ];
+  std::vector<Int>  m_iDepthValue2Idx             [ MAX_NUM_LAYERS ];
+  std::vector<Int>  m_iIdx2DepthValue             [ MAX_NUM_LAYERS ];
 
   Int               m_iNumDepthViews;
@@ -1374 +1374 @@
   
   // mapping
-  Int     m_iDepthIdxToLayerId          [ MAX_NUM_LAYERS ];
-  
-  // these are only needed at the encoder to decide on coding
+  Int               m_iDepthIdxToLayerId          [ MAX_NUM_LAYERS ];
 
 public:

branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibDecoder/TDecTop.cpp

@@ -1330 +1330 @@
     Int layerId = m_parameterSetManager.getFirstVPS()->getLayerIdInNuh(i);
     if( m_parameterSetManager.getFirstVPS()->getDepthId(layerId) )
-      pps->getDLT()->setDepthIdxToLayerId(j++, i);
+      pps->getDLT()->setDepthIdxToLayerId(j++, layerId);
   }
 #endif

branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibEncoder/TEncTop.cpp

@@ -994 +994 @@
     Int layerId = getVPS()->getLayerIdInNuh(i);
     if( getVPS()->getDepthId(layerId) )
-      m_cDLT.setDepthIdxToLayerId(j++, i);
+      m_cDLT.setDepthIdxToLayerId(j++, layerId);
   }
   m_cPPS.setDLT( m_cDLT );