Changeset 1449 in SHVCSoftware for branches/SHM-dev/source/App

Timestamp:

14 Aug 2015, 00:52:02 (9 years ago)

Author:

seregin

Message:

fix bug in SPS iterator for PS activation SEI

File:

• branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp (modified) (6 diffs)

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

@@ -78 +78 @@
 #if SVC_EXTENSION
   TComVPS& vps = *m_apcTEncTop[0]->getVPS();
+  Int& m_maxTempLayer = m_apcLayerCfg[0]->m_maxTempLayer;
 #else
   TComVPS vps;
@@ -503 +504 @@
 
     string&        m_colourRemapSEIFileName                     = m_apcLayerCfg[layer]->m_colourRemapSEIFileName;
+
+    GOPEntry*      m_GOPList                                    = m_apcLayerCfg[layer]->m_GOPList;
+    Int&           m_extraRPSs                                  = m_apcLayerCfg[layer]->m_extraRPSs;
+    Int&           m_maxTempLayer                               = m_apcLayerCfg[layer]->m_maxTempLayer;
 #endif
 
@@ -533 +538 @@
   m_cTEncTop.setDecodingRefreshType                               ( m_iDecodingRefreshType );
   m_cTEncTop.setGOPSize                                           ( m_iGOPSize );
-#if SVC_EXTENSION
-  m_cTEncTop.setGopList                                           ( layer ? m_EhGOPList[layer] : m_GOPList );
-  m_cTEncTop.setExtraRPSs                                         ( m_extraRPSs[layer] );
-#else
   m_cTEncTop.setGopList                                           ( m_GOPList );
   m_cTEncTop.setExtraRPSs                                         ( m_extraRPSs );
-#endif
 
   for(Int i = 0; i < MAX_TLAYER; i++)
@@ -559 +559 @@
   m_cTEncTop.setAccessUnitDelimiter                               ( m_AccessUnitDelimiter );
 
-#if SVC_EXTENSION
-  m_cTEncTop.setMaxTempLayer                                      ( layer ? m_EhMaxTempLayer[layer] : m_maxTempLayer );
-#else
   m_cTEncTop.setMaxTempLayer                                      ( m_maxTempLayer );
-#endif
   m_cTEncTop.setUseAMP( m_enableAMP );
 
@@ -1611 +1607 @@
           if( (*it_nalu)->m_nalUnitType == NAL_UNIT_SPS )
           {
-            first_au->insert(++it_sps, *it_nalu);
+            it_sps = first_au->insert(++it_sps, *it_nalu);
             it_nalu = it_au->erase(it_nalu);
           }
@@ -1617 +1613 @@
       }
     }
-
 #endif
 
 #if RC_SHVC_HARMONIZATION
-    for(UInt layer=0; layer<m_numLayers; layer++)
-    {
-      if ( m_apcTEncTop[layer]->getUseRateCtrl() )
-      {
-        (m_apcTEncTop[layer]->getRateCtrl())->destroyRCGOP();
+    for( UInt layer = 0; layer < m_numLayers; layer++ )
+    {
+      if( m_apcTEncTop[layer]->getUseRateCtrl() )
+      {
+        m_apcTEncTop[layer]->getRateCtrl()->destroyRCGOP();
       }
     }