Changeset 1524 in SHVCSoftware for branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp

Timestamp:

3 Feb 2016, 23:00:44 (8 years ago)

Author:

seregin

Message:

fix target layer Id assignment, ticket #97

File:

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

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

@@ -121 +121 @@
 #if SVC_EXTENSION
 TAppEncCfg::TAppEncCfg()
-#if AVC_BASE
-: m_nonHEVCBaseLayerFlag(false)
-#endif
-, m_maxTidRefPresentFlag(1)
+: m_maxTidRefPresentFlag(1)
 , m_defaultTargetOutputLayerIdc (-1)
 , m_numOutputLayerSets          (-1)
@@ -131 +128 @@
 , m_outputInternalColourSpace(false)
 , m_elRapSliceBEnabled(false)
+#if AVC_BASE
+, m_nonHEVCBaseLayerFlag(false)
+#endif
 {
   memset( m_apcLayerCfg, 0, sizeof(m_apcLayerCfg) );
@@ -3130 +3130 @@
     ii++;
   }
+#if AVC_BASE
   if( m_numLayers > 1 && m_numPTLInfo > 1 && !m_nonHEVCBaseLayerFlag )
+#else
+  if( m_numLayers > 1 && m_numPTLInfo > 1 )
+#endif
   {
     assert(m_profileList[0] <= Profile::MULTIVIEWMAIN);  //Profile IDC of PTL in VPS shall be one of single-layer profile IDCs
@@ -3506 +3510 @@
   m_numLayers = m_numLayers > MAX_LAYERS ? MAX_LAYERS : m_numLayers;
   
-  // it can be updated after AVC BL support will be added to the WD
+#if AVC_BASE
   if( m_nonHEVCBaseLayerFlag )
   {
@@ -3513 +3517 @@
     m_crossLayerAlignedIdrOnlyFlag = false;
   }
+#endif
 
   // verify layer configuration parameters