Changeset 1123 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder

Timestamp:

7 Jul 2015, 02:16:06 (10 years ago)

Author:

seregin

Message:

code rearrangement

File:

• branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp (modified) (2 diffs)

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

@@ -227 +227 @@
   seiActiveParameterSets->activeVPSId = m_pcCfg->getVPS()->getVPSId();
   seiActiveParameterSets->m_selfContainedCvsFlag = false;
-  seiActiveParameterSets->m_noParameterSetUpdateFlag = false;
-#if !R0247_SEI_ACTIVE
-  seiActiveParameterSets->numSpsIdsMinus1 = 0;
-  seiActiveParameterSets->activeSeqParameterSetId.resize(seiActiveParameterSets->numSpsIdsMinus1 + 1);
-  seiActiveParameterSets->activeSeqParameterSetId[0] = sps->getSPSId();
-#else
+  seiActiveParameterSets->m_noParameterSetUpdateFlag = false;  
+#if R0247_SEI_ACTIVE
   seiActiveParameterSets->numSpsIdsMinus1 = m_pcCfg->getNumLayer()-1;
   seiActiveParameterSets->activeSeqParameterSetId.resize(seiActiveParameterSets->numSpsIdsMinus1 + 1);
@@ -244 +240 @@
      seiActiveParameterSets->layerSpsIdx[c] = c;
   }
+#else
+  seiActiveParameterSets->numSpsIdsMinus1 = 0;
+  seiActiveParameterSets->activeSeqParameterSetId.resize(seiActiveParameterSets->numSpsIdsMinus1 + 1);
+  seiActiveParameterSets->activeSeqParameterSetId[0] = sps->getSPSId();
 #endif
   return seiActiveParameterSets;