Changeset 987 in SHVCSoftware for branches/SHM-upgrade/source/App/TAppEncoder

Timestamp:

16 Jan 2015, 00:16:16 (10 years ago)

Author:

seregin

Message:

port the fix for ticket #50 (rev 986)

Location:

branches/SHM-upgrade/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (2 diffs)
• TAppEncTop.cpp (modified) (3 diffs)

branches/SHM-upgrade/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -2664 +2664 @@
   {
     // Default output layer sets defined
-    startOlsCtr = m_numLayerSets + m_numAddLayerSets;
+    startOlsCtr = m_numLayerSets;
   }
   for( Int olsCtr = 1; olsCtr < m_numOutputLayerSets; olsCtr++ )
@@ -2680 +2680 @@
     }
 #if MULTIPLE_PTL_SUPPORT
-    Int olsToLsIndex = (olsCtr >= startOlsCtr) ? m_outputLayerSetIdx[olsCtr - m_numLayerSets] : olsCtr;
+    Int olsToLsIndex = (olsCtr >= (m_numLayerSets + m_numAddLayerSets)) ? m_outputLayerSetIdx[olsCtr - m_numLayerSets] : olsCtr;
     scanStringToArray( cfg_listOfLayerPTLOfOlss[olsCtr], m_numLayerInIdList[olsToLsIndex], "List of PTL for each layers in OLS", m_listOfLayerPTLofOlss[olsCtr] );
     //For conformance checking

branches/SHM-upgrade/source/App/TAppEncoder/TAppEncTop.cpp

@@ -1367 +1367 @@
       }
     }
+    //TODO: We need to populate the list of layers that belong to each of additional layer set.
   }
 #endif
@@ -1677 +1678 @@
 
     // Include the highest layer as output layer for each layer set
-    for(Int lsIdx = 1; lsIdx < vps->getNumLayerSets(); lsIdx++)
+    for(Int lsIdx = 1; lsIdx <= vps->getVpsNumLayerSetsMinus1(); lsIdx++)
     {
       for( UInt layer = 0; layer < vps->getNumLayersInIdList(lsIdx); layer++ )
@@ -1703 +1704 @@
     }
 #if OUTPUT_LAYER_SETS_CONFIG
-    for( Int olsIdx = vps->getNumLayerSets(); olsIdx < vps->getNumOutputLayerSets(); olsIdx++ )
+    for( Int olsIdx = vps->getVpsNumLayerSetsMinus1() + 1; olsIdx < vps->getNumOutputLayerSets(); olsIdx++ )
     {
       for( UInt layer = 0; layer < vps->getNumLayersInIdList(vps->getOutputLayerSetIdx(olsIdx)); layer++ )