Changeset 1380 in SHVCSoftware for branches/SHM-dev

Timestamp:

24 Jul 2015, 19:36:45 (9 years ago)

Author:

seregin

Message:

remove LayerConfig option, related to the ticket #83

Location:

branches/SHM-dev/source

Files:

• App/TAppEncoder/TAppEncCfg.cpp (modified) (2 diffs)
• Lib/TLibEncoder/TEncGOP.cpp (modified) (1 diff)

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

@@ -797 +797 @@
   
 #if SVC_EXTENSION
-  string  cfg_LayerCfgFile   [MAX_LAYERS];
   string  cfg_BitstreamFile;
   string* cfg_InputFile      [MAX_LAYERS];
@@ -1102 +1101 @@
   ("InputFile%d,-i%d",                              cfg_InputFile,                    string(""), m_numLayers, "original YUV input file name for layer %d")
   ("ReconFile%d,-o%d",                              cfg_ReconFile,                    string(""), m_numLayers, "reconstruction YUV input file name for layer %d")
-  ("LayerConfig%d,-lc%d",                           cfg_LayerCfgFile,                 string(""), m_numLayers, "layer %d configuration file name")
   ("SourceWidth%d,-wdt%d",                          cfg_SourceWidth,                           0, m_numLayers, "Source picture width for layer %d")
   ("SourceHeight%d,-hgt%d",                         cfg_SourceHeight,                          0, m_numLayers, "Source picture height for layer %d")

branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -2571 +2571 @@
       OutputNALUnit nalu(NAL_UNIT_PPS, 0, m_layerId);
       m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream);
-      m_pcEntropyCoder->encodePPS(pcSlice->getPPS() , &m_Enc3DAsymLUTPPS );      
+      m_pcEntropyCoder->encodePPS(pcSlice->getPPS() , &m_Enc3DAsymLUTPPS );
       accessUnit.push_back(new NALUnitEBSP(nalu));
     }