Changeset 1446 in SHVCSoftware

Timestamp:

13 Aug 2015, 20:18:24 (9 years ago)

Author:

seregin

Message:

fix invocation of scalingListFileName

File:

• branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp (modified) (4 diffs)

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

@@ -780 +780 @@
   Int*    cfg_layerSwitchOffEnd[MAX_LAYERS];
   Int*    cfg_layerPTLIdx[MAX_VPS_LAYER_IDX_PLUS1];
-  string  cfg_ScalingListFile[MAX_LAYERS];
+  string* cfg_scalingListFileName[MAX_LAYERS];
   ScalingListMode*   cfg_UseScalingListId[MAX_LAYERS];
 
@@ -826 +826 @@
     cfg_numMotionPredRefLayers  [layer] = &m_apcLayerCfg[layer]->m_numMotionPredRefLayers;
     cfg_motionPredRefLayerIdsPtr[layer] = &cfg_motionPredRefLayerIds[layer];
-    cfg_numActiveRefLayers  [layer] = &m_apcLayerCfg[layer]->m_numActiveRefLayers;
-    cfg_predLayerIdsPtr     [layer] = &cfg_predLayerIds[layer];
+    cfg_numActiveRefLayers      [layer] = &m_apcLayerCfg[layer]->m_numActiveRefLayers;
+    cfg_predLayerIdsPtr         [layer] = &cfg_predLayerIds[layer];
+    cfg_scalingListFileName     [layer] = &m_apcLayerCfg[layer]->m_scalingListFileName;
 
     cfg_numRefLayerLocationOffsets [layer] = &m_apcLayerCfg[layer]->m_numRefLayerLocationOffsets;
@@ -1368 +1369 @@
   ("WaveFrontSynchro%d",                              cfg_waveFrontSynchro,                   0,  m_numLayers, "0: no synchro; 1 synchro with TR; 2 TRR etc")
   ("ScalingList%d",                                   cfg_UseScalingListId,     SCALING_LIST_OFF, m_numLayers, "0/off: no scaling list, 1/default: default scaling lists, 2/file: scaling lists specified in ScalingListFile")
-  ("ScalingListFile%d",                               cfg_ScalingListFile,            string(""), m_numLayers, "Scaling list file name. Use an empty string to produce help.")
+  ("ScalingListFile%d",                               cfg_scalingListFileName,        string(""), m_numLayers, "Scaling list file name. Use an empty string to produce help.")
 #else
   ("WaveFrontSynchro",                                m_iWaveFrontSynchro,                                  0, "0: no synchro; 1 synchro with top-right-right")
@@ -1803 +1804 @@
   for( Int layer = 0; layer < m_numLayers; layer++ )
   {
-    m_apcLayerCfg[layer]->m_scalingListFileName = cfg_ScalingListFile[layer].empty() ? NULL : strdup(cfg_ScalingListFile[layer].c_str());
-
     if( m_apcLayerCfg[layer]->m_layerId < 0 )
     {