Changeset 1086 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon

Timestamp:

26 Mar 2015, 05:06:01 (10 years ago)

Author:

seregin

Message:

fix layerIdc derivation for OLS index

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• TComSlice.cpp (modified) (1 diff)
• TComSlice.h (modified) (1 diff)

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

@@ -3564 +3564 @@
 #endif
 #if VPS_DPB_SIZE_TABLE
-Int TComVPS::getLayerIdcInOls( Int olsIdx, Int layerId )
+Int TComVPS::getLayerIdcForOls( Int olsIdx, Int layerId )
 {
   Int layerIdc = -1;
-
-  std::vector<Int>::iterator it = std::find( m_layerSetLayerIdList[olsIdx].begin(), m_layerSetLayerIdList[olsIdx].end(), layerId );
-
-  if( it != m_layerSetLayerIdList[olsIdx].end() )
-  {
-    layerIdc = (Int)std::distance( m_layerSetLayerIdList[olsIdx].begin(), it );
+  UInt lsIdx = m_outputLayerSetIdx[olsIdx];
+
+  std::vector<Int>::iterator it = std::find( m_layerSetLayerIdList[lsIdx].begin(), m_layerSetLayerIdList[lsIdx].end(), layerId );
+
+  if( it != m_layerSetLayerIdList[lsIdx].end() )
+  {
+    layerIdc = (Int)std::distance( m_layerSetLayerIdList[lsIdx].begin(), it );
   }
 

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

@@ -1412 +1412 @@
   Int    getMaxVpsDecPicBufferingMinus1(Int olsIdx, Int subDpbIdx, Int subLayerIdx)        { assert(olsIdx != 0); return m_maxVpsDecPicBufferingMinus1[olsIdx][subDpbIdx][subLayerIdx]; }
   Void   setMaxVpsDecPicBufferingMinus1(Int olsIdx, Int subDpbIdx, Int subLayerIdx, Int x) { m_maxVpsDecPicBufferingMinus1[olsIdx][subDpbIdx][subLayerIdx] = x;    }
-  Int    getLayerIdcInOls( Int olsIdx, Int layerId );
+  Int    getLayerIdcForOls( Int olsIdx, Int layerId );
 
 #if RESOLUTION_BASED_DPB