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

Timestamp:

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

Author:

seregin

Message:

fix target layer Id assignment, ticket #97

Location:

branches/SHM-dev/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (5 diffs)
• TAppEncCfg.h (modified) (2 diffs)
• TAppEncTop.cpp (modified) (3 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

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

@@ -118 +118 @@
   Int       m_numLayers;                                      ///< number of layers
   Int       m_scalabilityMask[MAX_VPS_NUM_SCALABILITY_TYPES]; ///< scalability_mask
-#if AVC_BASE
-  Bool      m_nonHEVCBaseLayerFlag;                           ///< non HEVC BL
-#endif
   Bool      m_maxTidRefPresentFlag; 
 
@@ -542 +539 @@
   Bool      m_altOutputLayerFlag;                             ///< Specifies the value of alt_output_laye_flag in VPS extension
   Bool      m_elRapSliceBEnabled;
+#if AVC_BASE
+  Bool      m_nonHEVCBaseLayerFlag;                           ///< non HEVC BL
+#endif
 #endif
 

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

@@ -249 +249 @@
     //1
     m_cTEncTop.setInterLayerWeightedPredFlag                      ( m_useInterLayerWeightedPred );
+#if AVC_BASE
     m_cTEncTop.setMFMEnabledFlag                                  ( layer == 0 ? false : ( m_nonHEVCBaseLayerFlag ? false : true ) && m_apcLayerCfg[layer]->getNumMotionPredRefLayers());
+#else
+    m_cTEncTop.setMFMEnabledFlag                                  ( layer == 0 ? false : m_apcLayerCfg[layer]->getNumMotionPredRefLayers());
+#endif
 
     // set layer ID
@@ -1059 +1063 @@
 #if AVC_BASE
   vps->setNonHEVCBaseLayerFlag( m_nonHEVCBaseLayerFlag );
-  if ( m_nonHEVCBaseLayerFlag )
-  {
-    vps->setBaseLayerInternalFlag (false);
-  }
-#else
-  vps->setAvcBaseLayerFlag(false);
+  if( m_nonHEVCBaseLayerFlag )
+  {
+    vps->setBaseLayerInternalFlag(false);
+  }
 #endif
   
@@ -1607 +1609 @@
     {
       list<AccessUnit>::iterator first_au = outputAccessUnits.begin();
+#if AVC_BASE
       if( m_nonHEVCBaseLayerFlag )
       {
         first_au++;
       }
+#endif
       AccessUnit::iterator it_sps;
       for (it_sps = first_au->begin(); it_sps != first_au->end(); it_sps++)