Changeset 1145 in SHVCSoftware

Timestamp:

7 Jul 2015, 23:44:14 (9 years ago)

Author:

seregin

Message:

macro cleanup: SPS_DPB_PARAMS

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TComSlice.h (modified) (1 diff)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCAVLC.h (modified) (2 diffs)
• TLibDecoder/TDecTop.cpp (modified) (7 diffs)
• TLibDecoder/TDecTop.h (modified) (1 diff)

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

@@ -775 +775 @@
   UInt       m_treePartitionLayerIdList[MAX_LAYERS][MAX_LAYERS];
 #endif
-#if SPS_DPB_PARAMS
   Int        m_TolsIdx;
-#endif
 #if VPS_DPB_SIZE_TABLE
   Bool       m_subLayerFlagInfoPresentFlag [MAX_VPS_OP_LAYER_SETS_PLUS1];

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

@@ -182 +182 @@
 #endif
 #endif
-#define SPS_DPB_PARAMS                   1      ///< JCTVC-P0155 signaling & inferrence for sps dpb parameters for nuh_layer_id > 0
 #define DPB_PARAMS_MAXTLAYERS            1      ///< JCTVC-P0156 DPB parameters up to maximum temporal sub-layers in the layer set
 #define NUM_OL_FLAGS                     1      ///< JCTVC-P0156 output_layer_flag[ i ][ j ] is signalled for j equal to 0 to NumLayersInIdList[ lsIdx ] inclusive

branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.h

@@ -76 +76 @@
   Void  parseQtRootCbf      ( UInt uiAbsPartIdx, UInt& uiQtRootCbf );
   Void  parseVPS            ( TComVPS* pcVPS );
+  Void  parseSPS            ( TComSPS* pcSPS );
 #if !SVC_EXTENSION
-  Void  parseSPS            ( TComSPS* pcSPS );
   Void  parsePPS            ( TComPPS* pcPPS );
 #endif
@@ -141 +141 @@
   Void  parseVpsVuiBspHrdParams( TComVPS *vps );
 #endif
-#if SPS_DPB_PARAMS
-  Void  parseSPS            ( TComSPS* pcSPS ); // it should be removed after macro clean up
-#else
-  Void  parseSPS            ( TComSPS* pcSPS, ParameterSetManagerDecoder *parameterSetManager );
-#endif
   Void  parseSPSExtension    ( TComSPS* pcSPS );
 #if Q0048_CGS_3D_ASYMLUT

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

@@ -484 +484 @@
   }
 
+#if SVC_EXTENSION
 #if SCALINGLIST_INFERRING
   // scaling list settings and checks
@@ -578 +579 @@
 #endif
 
-#if SPS_DPB_PARAMS
   if( m_layerId > 0 )
   {
@@ -629 +629 @@
 #endif
   }
-#endif
 
 #if R0227_REP_FORMAT_CONSTRAINT //Conformance checking for rep format -- rep format of current picture of current layer shall never be greater rep format defined in VPS for the current layer
@@ -651 +650 @@
   }
 #endif
+#endif //SVC_EXTENSION
 
   m_apcSlicePilot->setPPS(pps);
@@ -2004 +2004 @@
 }
 
-#if SVC_EXTENSION
 Void TDecTop::xDecodeSPS()
 {
@@ -2011 +2010 @@
   sps->setForceDecodeBitDepth(m_forceDecodeBitDepth);
 #endif
+#if SVC_EXTENSION
   sps->setLayerId(m_layerId);
-#if SPS_DPB_PARAMS
-  m_cEntropyDecoder.decodeSPS( sps ); // it should be removed after macro clean up
-#else
-  m_cEntropyDecoder.decodeSPS( sps, &m_parameterSetManagerDecoder );
-#endif
+#endif
+  m_cEntropyDecoder.decodeSPS( sps );
   m_parameterSetManagerDecoder.storePrefetchedSPS(sps);
-#if !REPN_FORMAT_IN_VPS   // ILRP can only be initialized at activation  
-  if(m_numLayer>0)
-  {
-    xInitILRP(sps);
-  }
-#endif
-}
-
-Void TDecTop::xDecodePPS(
+}
+
 #if Q0048_CGS_3D_ASYMLUT
-  TCom3DAsymLUT * pc3DAsymLUT
-#endif
-  )
+Void TDecTop::xDecodePPS( TCom3DAsymLUT * pc3DAsymLUT )
+#else
+Void TDecTop::xDecodePPS()
+#endif
 {
   TComPPS* pps = new TComPPS();
@@ -2037 +2028 @@
   pps->setLayerId( m_layerId );
 #endif
-
-  m_cEntropyDecoder.decodePPS( pps 
 #if Q0048_CGS_3D_ASYMLUT
-    , pc3DAsymLUT , m_layerId 
-#endif
-    );
+  m_cEntropyDecoder.decodePPS( pps, pc3DAsymLUT, m_layerId );
+#else
+  m_cEntropyDecoder.decodePPS( pps );
+#endif
   m_parameterSetManagerDecoder.storePrefetchedPPS( pps );
 }
-#else
-Void TDecTop::xDecodeSPS()
-{
-  TComSPS* sps = new TComSPS();
-#if O0043_BEST_EFFORT_DECODING
-  sps->setForceDecodeBitDepth(m_forceDecodeBitDepth);
-#endif
-  m_cEntropyDecoder.decodeSPS( sps );
-  m_parameterSetManagerDecoder.storePrefetchedSPS(sps);
-}
-
-Void TDecTop::xDecodePPS()
-{
-  TComPPS* pps = new TComPPS();
-  m_cEntropyDecoder.decodePPS( pps );
-  m_parameterSetManagerDecoder.storePrefetchedPPS( pps );
-}
-#endif //SVC_EXTENSION
 
 Void TDecTop::xDecodeSEI( TComInputBitstream* bs, const NalUnitType nalUnitType )

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

@@ -301 +301 @@
   Void      xDecodeVPS();
   Void      xDecodeSPS();
-  Void      xDecodePPS(
 #if Q0048_CGS_3D_ASYMLUT
-    TCom3DAsymLUT * pc3DAsymLUT
-#endif
-    );
+  Void      xDecodePPS( TCom3DAsymLUT * pc3DAsymLUT );
+#else
+  Void      xDecodePPS();
+#endif
   Void      xDecodeSEI( TComInputBitstream* bs, const NalUnitType nalUnitType );