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

Timestamp:

8 Jul 2015, 01:52:42 (9 years ago)

Author:

seregin

Message:

macro cleanup: O0092_0094_DEPENDENCY_CONSTRAINT

File:

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

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

@@ -2406 +2406 @@
         pcSlice->getSPS()->getVuiParameters()->setHrdParametersPresentFlag( true );
       }
-#if O0092_0094_DEPENDENCY_CONSTRAINT
+
+#if SVC_EXTENSION
+      // dependency constraint
       assert( pcSlice->getSPS()->getLayerId() == 0 || pcSlice->getSPS()->getLayerId() == m_layerId || m_pcEncTop->getVPS()->getRecursiveRefLayerFlag(m_layerId, pcSlice->getSPS()->getLayerId()) );
 #endif
+
       m_pcEntropyCoder->encodeSPS(pcSlice->getSPS());
       writeRBSPTrailingBits(nalu.m_Bitstream);
@@ -2427 +2430 @@
 
       m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream);
-#if O0092_0094_DEPENDENCY_CONSTRAINT
+
+#if SVC_EXTENSION
+      // dependency constraint
       assert( pcSlice->getPPS()->getLayerId() == 0 || pcSlice->getPPS()->getLayerId() == m_layerId || m_pcEncTop->getVPS()->getRecursiveRefLayerFlag(m_layerId, pcSlice->getPPS()->getLayerId()) );
 #endif
-#if Q0048_CGS_3D_ASYMLUT
+#if SVC_EXTENSION && Q0048_CGS_3D_ASYMLUT
       m_pcEntropyCoder->encodePPS(pcSlice->getPPS(), &m_Enc3DAsymLUTPPS);
 #else