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

Timestamp:

8 Jul 2015, 20:22:40 (10 years ago)

Author:

seregin

Message:

macro cleanup: O0194_DIFFERENT_BITDEPTH_EL_BL

File:

• branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp (modified) (8 diffs)

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

@@ -611 +611 @@
 
 #if SVC_EXTENSION //Temporal solution, should be modified
-      if(m_layerId > 0)
-      {
-        for(UInt i = 0; i < m_cVPS.getNumDirectRefLayers( m_layerId ); i++ )
+      if( m_layerId > 0 )
+      {
+        for( UInt i = 0; i < m_cVPS.getNumDirectRefLayers( m_layerId ); i++ )
         {
           const Window scalEL = getPPS()->getScaledRefLayerWindowForLayer(m_cVPS.getRefLayerId(m_layerId, i));
@@ -621 +621 @@
 
           TEncTop *pcEncTopBase = (TEncTop *)getRefLayerEnc( i );
-#if O0194_DIFFERENT_BITDEPTH_EL_BL
+
           UInt refLayerId = m_cVPS.getRefLayerId(m_layerId, i);
           Bool sameBitDepths = ( g_bitDepthLayer[CHANNEL_TYPE_LUMA][m_layerId] == g_bitDepthLayer[CHANNEL_TYPE_LUMA][refLayerId] ) && ( g_bitDepthLayer[CHANNEL_TYPE_CHROMA][m_layerId] == g_bitDepthLayer[CHANNEL_TYPE_CHROMA][refLayerId] );
@@ -644 +644 @@
 #endif
             )
-#else
-          if(m_iSourceWidth != pcEncTopBase->getSourceWidth() || m_iSourceHeight != pcEncTopBase->getSourceHeight()
-            || !equalOffsets
-            || !zeroPhase
-          )
-#endif
           {
             pcEPic->setSpatialEnhLayerFlag( i, true );
@@ -658 +652 @@
         }
       }
-#endif
-
-#if SVC_EXTENSION
+
       pcEPic->create( m_iSourceWidth, m_iSourceHeight, m_chromaFormatIDC, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, m_cPPS.getMaxCuDQPDepth()+1 ,
                       m_conformanceWindow, m_defaultDisplayWindow, m_numReorderPics, &m_cSPS);
@@ -673 +665 @@
 
 #if SVC_EXTENSION //Temporal solution, should be modified
-      if(m_layerId > 0)
-      {
-        for(UInt i = 0; i < m_cVPS.getNumDirectRefLayers( m_layerId ); i++ )
+      if( m_layerId > 0 )
+      {
+        for( UInt i = 0; i < m_cVPS.getNumDirectRefLayers( m_layerId ); i++ )
         {
           const Window scalEL = getPPS()->getScaledRefLayerWindowForLayer(m_cVPS.getRefLayerId(m_layerId, i));
@@ -683 +675 @@
 
           TEncTop *pcEncTopBase = (TEncTop *)getRefLayerEnc( i );
-#if O0194_DIFFERENT_BITDEPTH_EL_BL
+
           UInt refLayerId = m_cVPS.getRefLayerId(m_layerId, i);
           Bool sameBitDepths = ( g_bitDepthLayer[CHANNEL_TYPE_LUMA][m_layerId] == g_bitDepthLayer[CHANNEL_TYPE_LUMA][refLayerId] ) && ( g_bitDepthLayer[CHANNEL_TYPE_CHROMA][m_layerId] == g_bitDepthLayer[CHANNEL_TYPE_CHROMA][refLayerId] );
@@ -696 +688 @@
             || pcEncTopBase->getSPS()->getMaxCUWidth() != m_cSPS.getMaxCUWidth() || pcEncTopBase->getSPS()->getMaxCUHeight() != m_cSPS.getMaxCUHeight() || pcEncTopBase->getSPS()->getMaxCUDepth() != m_cSPS.getMaxCUDepth()
 #endif
-)
-#else
-          if(m_iSourceWidth != pcEncTopBase->getSourceWidth() || m_iSourceHeight != pcEncTopBase->getSourceHeight()
-            || !equalOffsets 
-            || !zeroPhase
-          )
-#endif
+            )
           {
             rpcPic->setSpatialEnhLayerFlag( i, true );
@@ -711 +697 @@
         }
       }
-#endif
-
-#if SVC_EXTENSION
+
       rpcPic->create( m_iSourceWidth, m_iSourceHeight, m_chromaFormatIDC, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, m_conformanceWindow, m_defaultDisplayWindow, m_numReorderPics, &m_cSPS);
 #else  //SVC_EXTENSION