Changeset 1172 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp

Timestamp:

8 Jul 2015, 01:45:57 (9 years ago)

Author:

seregin

Message:

macro cleanup: Q0078_ADD_LAYER_SETS

File:

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

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

@@ -2370 +2370 @@
 #if SVC_EXTENSION
       nalu = NALUnit(NAL_UNIT_SPS, 0, m_layerId);
+
+      if( m_pcEncTop->getVPS()->getNumDirectRefLayers(m_layerId) == 0 && m_pcEncTop->getVPS()->getNumAddLayerSets() > 0 )
+      {
+        // For independent base layer rewriting
+        nalu.m_layerId = 0; 
+      }
 #else
       nalu = NALUnit(NAL_UNIT_SPS);
 #endif
-#if Q0078_ADD_LAYER_SETS
-      if (m_pcEncTop->getVPS()->getNumDirectRefLayers(m_layerId) == 0 && m_pcEncTop->getVPS()->getNumAddLayerSets() > 0)
-      {
-        nalu.m_layerId = 0; // For independent base layer rewriting
-      }
-#endif
+
       m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream);
       if (m_bSeqFirst)
@@ -2415 +2416 @@
 #if SVC_EXTENSION
       nalu = NALUnit(NAL_UNIT_PPS, 0, m_layerId);
+
+      if( m_pcEncTop->getVPS()->getNumDirectRefLayers(m_layerId) == 0 && m_pcEncTop->getVPS()->getNumAddLayerSets() > 0 )
+      {
+        // For independent base layer rewriting
+        nalu.m_layerId = 0;
+      }
 #else
       nalu = NALUnit(NAL_UNIT_PPS);
 #endif
-#if Q0078_ADD_LAYER_SETS
-      if (m_pcEncTop->getVPS()->getNumDirectRefLayers(m_layerId) == 0 && m_pcEncTop->getVPS()->getNumAddLayerSets() > 0)
-      {
-        nalu.m_layerId = 0; // For independent base layer rewriting
-      }
-#endif
+
       m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream);
 #if O0092_0094_DEPENDENCY_CONSTRAINT