Changeset 950 in SHVCSoftware for branches

Timestamp:

2 Jan 2015, 21:30:25 (10 years ago)

Author:

qualcomm

Message:

Rename configuration file parameter related to output layers.

Rename encoder configuration file parameter NumLayersInOutputLayerSet to NumOutputLayersInOutputLayerSet, to better convey the intent.

From: Adarsh K. Ramasubramonian <aramasub@…>

Location:

branches/SHM-dev

Files:

• cfg/layers.cfg (modified) (1 diff)
• cfg/layers_avcbase.cfg (modified) (1 diff)
• source/App/TAppEncoder/TAppEncCfg.cpp (modified) (6 diffs)
• source/App/TAppEncoder/TAppEncCfg.h (modified) (1 diff)

branches/SHM-dev/cfg/layers.cfg

@@ -56 +56 @@
 NumOutputLayerSets            : 2           # Include defualt OLS, value of 0 not allowed
 DefaultTargetOutputLayerIdc   : 1
-NumLayersInOutputLayerSet     : 1           # The number of layers in the 0-th OLS should not be specified, 
+NumOutputLayersInOutputLayerSet     : 1           # The number of layers in the 0-th OLS should not be specified, 
 # ListOfOutputLayers0 need not be specified
 ListOfOutputLayers1               : 1

branches/SHM-dev/cfg/layers_avcbase.cfg

@@ -52 +52 @@
 NumOutputLayerSets            : 2           # Include defualt OLS, value of 0 not allowed
 DefaultTargetOutputLayerIdc   : 1
-NumLayersInOutputLayerSet     : 1           # The number of layers in the 0-th OLS should not be specified, 
+NumOutputLayersInOutputLayerSet     : 1           # The number of layers in the 0-th OLS should not be specified, 
 # ListOfOutputLayers0 need not be specified
 ListOfOutputLayers1           : 1

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

@@ -604 +604 @@
 #endif
 #if OUTPUT_LAYER_SETS_CONFIG
-  string* cfg_numLayersInOutputLayerSet = new string;
+  string* cfg_numOutputLayersInOutputLayerSet = new string;
   string* cfg_listOfOutputLayers     = new string[MAX_VPS_OUTPUT_LAYER_SETS_PLUS1];
   string* cfg_outputLayerSetIdx      = new string;
@@ -696 +696 @@
   ("DefaultTargetOutputLayerIdc",    m_defaultTargetOutputLayerIdc, 1, "Default target output layers. 0: All layers are output layer, 1: Only highest layer is output layer, 2 or 3: No default output layers")
   ("NumOutputLayerSets",            m_numOutputLayerSets, 1, "Number of output layer sets excluding the 0-th output layer set")
-  ("NumLayersInOutputLayerSet",   cfg_numLayersInOutputLayerSet, string(""), 1 , "List containing number of output layers in the output layer sets")
+  ("NumOutputLayersInOutputLayerSet",   cfg_numOutputLayersInOutputLayerSet, string(""), 1 , "List containing number of output layers in the output layer sets")
   ("ListOfOutputLayers%d",          cfg_listOfOutputLayers, string(""), MAX_VPS_LAYER_ID_PLUS1, "Layer IDs for the set, in terms of layer ID in the output layer set Range: [0..NumLayersInOutputLayerSet-1]")
   ("OutputLayerSetIdx",            cfg_outputLayerSetIdx, string(""), 1, "Corresponding layer set index, only for non-default output layer sets")
@@ -1936 +1936 @@
 
   // Number of output layers in output layer sets
-  scanStringToArray( *cfg_numLayersInOutputLayerSet, m_numOutputLayerSets - 1, "NumLayersInOutputLayerSets", m_numLayersInOutputLayerSet );
-  m_numLayersInOutputLayerSet.insert(m_numLayersInOutputLayerSet.begin(), 1);
+  scanStringToArray( *cfg_numOutputLayersInOutputLayerSet, m_numOutputLayerSets - 1, "NumOutputLayersInOutputLayerSets", m_numOutputLayersInOutputLayerSet );
+  m_numOutputLayersInOutputLayerSet.insert(m_numOutputLayersInOutputLayerSet.begin(), 1);
   // Layers in the output layer set
   m_listOfOutputLayers.resize(m_numOutputLayerSets);
@@ -1955 +1955 @@
     if( olsCtr < startOlsCtr )
     {
-      if(scanStringToArray( cfg_listOfOutputLayers[olsCtr], m_numLayersInOutputLayerSet[olsCtr], "ListOfOutputLayers", m_listOfOutputLayers[olsCtr] ) )
+      if(scanStringToArray( cfg_listOfOutputLayers[olsCtr], m_numOutputLayersInOutputLayerSet[olsCtr], "ListOfOutputLayers", m_listOfOutputLayers[olsCtr] ) )
       {
         std::cout << "Default OLS defined. Ignoring ListOfOutputLayers" << olsCtr << endl;
@@ -1962 +1962 @@
     else
     {
-      assert( scanStringToArray( cfg_listOfOutputLayers[olsCtr], m_numLayersInOutputLayerSet[olsCtr], "ListOfOutputLayers", m_listOfOutputLayers[olsCtr] ) );
+      assert( scanStringToArray( cfg_listOfOutputLayers[olsCtr], m_numOutputLayersInOutputLayerSet[olsCtr], "ListOfOutputLayers", m_listOfOutputLayers[olsCtr] ) );
     }
 #if MULTIPLE_PTL_SUPPORT
@@ -1979 +1979 @@
   delete [] cfg_listOfLayerPTLOfOlss;
 #endif
-  delete cfg_numLayersInOutputLayerSet;
+  delete cfg_numOutputLayersInOutputLayerSet;
   delete [] cfg_listOfOutputLayers;
   delete cfg_outputLayerSetIdx;

branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.h

@@ -88 +88 @@
   Int       m_defaultTargetOutputLayerIdc;
   Int       m_numOutputLayerSets;
-  std::vector<Int>                m_numLayersInOutputLayerSet;
+  std::vector<Int>                m_numOutputLayersInOutputLayerSet;
   std::vector< std::vector<Int> > m_listOfOutputLayers;
 #endif