Changeset 1150 in SHVCSoftware for branches/SHM-dev/source/Lib

Timestamp:

8 Jul 2015, 00:17:46 (9 years ago)

Author:

seregin

Message:

macro cleanup: O0149_CROSS_LAYER_BLA_FLAG

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TComSlice.cpp (modified) (1 diff)
• TLibCommon/TComSlice.h (modified) (2 diffs)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecTop.cpp (modified) (2 diffs)
• TLibEncoder/TEncCfg.h (modified) (2 diffs)
• TLibEncoder/TEncGOP.cpp (modified) (3 diffs)
• TLibEncoder/TEncTop.cpp (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -127 +127 @@
 #endif
 , m_bDiscardableFlag              ( false )
-#if O0149_CROSS_LAYER_BLA_FLAG
 , m_bCrossLayerBLAFlag            ( false )
-#endif
 #if POC_RESET_IDC_SIGNALLING
 , m_pocResetIdc                   ( 0 )

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.h

@@ -2204 +2204 @@
   Int         m_interLayerPredLayerIdc  [MAX_VPS_LAYER_IDX_PLUS1];
   Bool        m_bDiscardableFlag;
-#if O0149_CROSS_LAYER_BLA_FLAG
   Bool        m_bCrossLayerBLAFlag;
-#endif
 #if POC_RESET_IDC_SIGNALLING
   Int         m_pocResetIdc;
@@ -2539 +2537 @@
   Bool      getDiscardableFlag  ()                           { return m_bDiscardableFlag;    }
   Void      setDiscardableFlag  (Bool b)                     { m_bDiscardableFlag = b;       }
-#if O0149_CROSS_LAYER_BLA_FLAG
   Bool      getCrossLayerBLAFlag  ()                         { return m_bCrossLayerBLAFlag;  }
   Void      setCrossLayerBLAFlag  (Bool b)                   { m_bCrossLayerBLAFlag = b;     }
-#endif
 
 #if RPL_INIT_N0316_N0082

branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

@@ -180 +180 @@
 #define NUM_OL_FLAGS                     1      ///< JCTVC-P0156 output_layer_flag[ i ][ j ] is signalled for j equal to 0 to NumLayersInIdList[ lsIdx ] inclusive
 #define NO_CLRAS_OUTPUT_FLAG             1
-#define O0149_CROSS_LAYER_BLA_FLAG       1      ///< JCTVC-O0149: signal cross_layer_bla_flag in slice header
 
 #define P0138_USE_ALT_CPB_PARAMS_FLAG    1      ///< JCTVC-P0138: use_alt_cpb_params_flag syntax in buffering period SEI message extension

branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -837 +837 @@
 
 #if NO_CLRAS_OUTPUT_FLAG
-  if (m_layerId == m_smallestLayerId && m_apcSlicePilot->getRapPicFlag())
-  {
-    if (m_bFirstSliceInSequence)
+  if( m_layerId == m_smallestLayerId && m_apcSlicePilot->getRapPicFlag() )
+  {
+    if( m_bFirstSliceInSequence )
     {
       setNoClrasOutputFlag(true);
@@ -847 +847 @@
       setNoClrasOutputFlag(true);
     }
-    else if ( m_apcSlicePilot->getBlaPicFlag() )
+    else if( m_apcSlicePilot->getBlaPicFlag() )
     {
       setNoClrasOutputFlag(true);
     }
-#if O0149_CROSS_LAYER_BLA_FLAG
-    else if (m_apcSlicePilot->getIdrPicFlag() && m_apcSlicePilot->getCrossLayerBLAFlag())
+    else if( m_apcSlicePilot->getIdrPicFlag() && m_apcSlicePilot->getCrossLayerBLAFlag() )
     {
       setNoClrasOutputFlag(true);
     }
-#endif
     else
     {

branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h

@@ -371 +371 @@
   Int       m_elRapSliceBEnabled;
   Int       m_adaptiveResolutionChange;
-  int       m_layerSwitchOffBegin;
-  int       m_layerSwitchOffEnd;
+  Int       m_layerSwitchOffBegin;
+  Int       m_layerSwitchOffEnd;
   Bool      m_altOutputLayerFlag;
   Int       m_skipPictureAtArcSwitch;
-#if O0149_CROSS_LAYER_BLA_FLAG
   Bool      m_crossLayerBLAFlag;
-#endif
 
   Int       m_numDirectRefLayers;
@@ -1024 +1022 @@
   Bool      getAltOuputLayerFlag() const                     { return m_altOutputLayerFlag; }
   Void      setAltOuputLayerFlag(Bool b)                     { m_altOutputLayerFlag = b;    }
-#if O0149_CROSS_LAYER_BLA_FLAG
   Bool      getCrossLayerBLAFlag() const                     { return m_crossLayerBLAFlag; }
   Void      setCrossLayerBLAFlag(Bool b)                     { m_crossLayerBLAFlag = b;    }
-#endif
 #if FAST_INTRA_SHVC
   Bool      getUseFastIntraScalable         ()               { return m_useFastIntraScalable; }

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

@@ -1195 +1195 @@
 #endif
 
-#if O0149_CROSS_LAYER_BLA_FLAG
     if( m_layerId == 0 && (getNalUnitType(pocCurr, m_iLastIDR, isField) == NAL_UNIT_CODED_SLICE_IDR_W_RADL || getNalUnitType(pocCurr, m_iLastIDR, isField) == NAL_UNIT_CODED_SLICE_IDR_N_LP) )
     {
@@ -1204 +1203 @@
       pcSlice->setCrossLayerBLAFlag(false);
     }
-#endif
 
     // Set the nal unit type
@@ -1232 +1230 @@
         m_pcEncTop->setNoClrasOutputFlag(true);
       }
-#if O0149_CROSS_LAYER_BLA_FLAG
-      else if ((pcSlice->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_W_RADL || pcSlice->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_N_LP) &&
-               pcSlice->getCrossLayerBLAFlag())
+      else if( pcSlice->getCrossLayerBLAFlag() && ( pcSlice->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_W_RADL || pcSlice->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_N_LP ) )
       {
         m_pcEncTop->setNoClrasOutputFlag(true);
       }
-#endif
       else
       {
         m_pcEncTop->setNoClrasOutputFlag(false);
       }
-      if (m_pcEncTop->getNoClrasOutputFlag())
+
+      if( m_pcEncTop->getNoClrasOutputFlag() )
       {
         for (UInt i = 0; i < m_pcCfg->getNumLayer(); i++)

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

@@ -1049 +1049 @@
   m_cPPS.setPPSId( m_iPPSIdCnt );
   m_cPPS.setSPSId( m_iSPSIdCnt );
-#if O0149_CROSS_LAYER_BLA_FLAG
-  if (m_crossLayerBLAFlag)
+
+  if( m_crossLayerBLAFlag )
   {
     m_cPPS.setNumExtraSliceHeaderBits( 3 );
   }
-#endif
+
   m_cPPS.setNumRefLayerLocationOffsets(m_numRefLayerLocationOffsets);
   for(Int i = 0; i < m_cPPS.getNumRefLayerLocationOffsets(); i++)