Changeset 998 in SHVCSoftware for branches/SHM-upgrade

Timestamp:

22 Jan 2015, 01:08:20 (10 years ago)

Author:

seregin

Message:

port setting for output layer sets (rev 997)

Location:

branches/SHM-upgrade

Files:

• build/vc10/TAppEncoder_vc10.vcxproj.user (modified) (1 diff)
• source/App/TAppEncoder/TAppEncCfg.cpp (modified) (1 diff)
• source/App/TAppEncoder/TAppEncTop.cpp (modified) (3 diffs)

branches/SHM-upgrade/build/vc10/TAppEncoder_vc10.vcxproj.user

@@ -2 +2 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerCommandArguments>-c cfg/per-sequence-svc/Bus-2x.cfg -c cfg/encoder_lowdelay_scalable.cfg -c cfg/layers.cfg -q0 30 -q1 30 -g 4 -f 5 -b str/Bus.bin -c option.cfg </LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>-c cfg/per-sequence-svc/Bus-2x.cfg -c cfg/encoder_randomaccess_scalable.cfg -c cfg/layers.cfg -q0 38 -q1 38 -g 8 -f 9 -b str/Bus.bin -c option.cfg </LocalDebuggerCommandArguments>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

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

@@ -2680 +2680 @@
     }
 #if MULTIPLE_PTL_SUPPORT
-    Int olsToLsIndex = (olsCtr >= (m_numLayerSets + m_numAddLayerSets)) ? m_outputLayerSetIdx[olsCtr - m_numLayerSets] : olsCtr;
+    Int olsToLsIndex = (olsCtr >= (m_numLayerSets + m_numAddLayerSets)) ? m_outputLayerSetIdx[olsCtr - (m_numLayerSets + m_numAddLayerSets)] : 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
@@ -1694 +1693 @@
               break;
             case 2:
-            case 3: vps->setOutputLayerFlag( lsIdx, layer, std::find( m_listOfOutputLayers[lsIdx].begin(), m_listOfOutputLayers[lsIdx].end(), layer) != m_listOfOutputLayers[lsIdx].end() );
+            case 3: vps->setOutputLayerFlag( lsIdx, layer, (layer != vps->getNumLayersInIdList(lsIdx) - 1) ? std::find( m_listOfOutputLayers[lsIdx].begin(), m_listOfOutputLayers[lsIdx].end(), m_layerSetLayerIdList[lsIdx][layer]) != m_listOfOutputLayers[lsIdx].end() 
+                                                                                                           : m_listOfOutputLayers[lsIdx][m_listOfOutputLayers[lsIdx].size()-1] == m_layerSetLayerIdList[lsIdx][layer] );
               break;
           }
@@ -1708 +1708 @@
       for( UInt layer = 0; layer < vps->getNumLayersInIdList(vps->getOutputLayerSetIdx(olsIdx)); layer++ )
       {
-        vps->setOutputLayerFlag( olsIdx, layer, std::find( m_listOfOutputLayers[olsIdx].begin(), m_listOfOutputLayers[olsIdx].end(), layer) != m_listOfOutputLayers[olsIdx].end());
+        vps->setOutputLayerFlag( olsIdx, layer, (layer != vps->getNumLayersInIdList(vps->getOutputLayerSetIdx(olsIdx)) - 1) ? std::find( m_listOfOutputLayers[olsIdx].begin(), m_listOfOutputLayers[olsIdx].end(), vps->getLayerSetLayerIdList(vps->getOutputLayerSetIdx(olsIdx), layer)) != m_listOfOutputLayers[olsIdx].end()
+                                                                                                                            : m_listOfOutputLayers[olsIdx][m_listOfOutputLayers[olsIdx].size()-1] == vps->getLayerSetLayerIdList(vps->getOutputLayerSetIdx(olsIdx), layer) );
       }
     }