Changeset 1111 in SHVCSoftware

Timestamp:

6 Jul 2015, 21:17:40 (9 years ago)

Author:

seregin

Message:

macro cleanup: FIX_NON_OUTPUT_LAYER

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecTop.cpp (modified) (6 diffs)
• TLibDecoder/TDecTop.h (modified) (3 diffs)

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

@@ -46 +46 @@
 #define MAX_LAYERS                       8      ///< max number of layers the codec is supposed to handle
 #define CONFORMANCE_BITSTREAM_MODE       1      ///< In order to generate the metadata related to conformance bitstreams
-#define FIX_NON_OUTPUT_LAYER             1
 #define INFERENCE_POC_MSB_VAL_PRESENT    1      ///< JCTVC-Q0146 -- poc_msb_val_present_flag shall be equal to 0 when slice_header_extension_length is (inferred to be ) equal to 0
 #define NON_REF_NAL_TYPE_DISCARDABLE     1      ///< JCTVC-P0041 -- If discardable picture is a non-IRAP, it must be a non-referenced sub-layer picture

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

@@ -89 +89 @@
   m_bFirstSliceInSequence   = true;
 #endif
-#if SVC_EXTENSION 
-  m_layerId = 0;
-  m_smallestLayerId = 0;
-#if AVC_BASE
-  m_pBLReconFile = NULL;
-#endif
-  memset(m_cIlpPic, 0, sizeof(m_cIlpPic));
-#endif
   m_prevSliceSkipped = false;
   m_skippedPOC = 0;
@@ -103 +95 @@
   m_craNoRaslOutputFlag = false;
   m_isNoOutputPriorPics = false;
+
+#if SVC_EXTENSION 
+  m_layerId = 0;
+  m_smallestLayerId = 0;
+#if AVC_BASE
+  m_pBLReconFile = NULL;
+#endif
+  memset(m_cIlpPic, 0, sizeof(m_cIlpPic));
 #if Q0177_EOS_CHECKS
   m_isLastNALWasEos = false;
@@ -133 +133 @@
   m_confModeFlag = false;
 #endif
-#if FIX_NON_OUTPUT_LAYER
   m_isOutputLayerFlag = false;
-#endif
+#endif //SVC_EXTENSION 
 }
 
@@ -379 +378 @@
   m_cGopDecoder.filterPicture(pcPic);
 
-#if FIX_NON_OUTPUT_LAYER
+#if SVC_EXTENSION
   if( this->getLayerDec(pcPic->getLayerId())->m_isOutputLayerFlag == false )
   {
@@ -2711 +2710 @@
   params->setTargetLayerId( vps->getLayerSetLayerIdList( targetLsIdx, vps->getNumLayersInIdList(targetLsIdx)-1 ) );
 
-#if FIX_NON_OUTPUT_LAYER
   // Check if the current layer is an output layer
   for(Int i = 0; i < vps->getNumLayersInIdList( targetLsIdx ); i++)
@@ -2720 +2718 @@
     }
   }
-#endif
 }
 #endif

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

@@ -152 +152 @@
 #endif
   TComPic*                m_cIlpPic[MAX_NUM_REF];                    ///<  Inter layer Prediction picture =  upsampled picture
-#endif 
 #if OUTPUT_LAYER_SET_INDEX
   CommonDecoderParams*    m_commonDecoderParams;
@@ -170 +169 @@
   std::vector<TComPic>   m_confListPic;         //  Dynamic buffer for storing pictures for conformance purposes
 #endif
-#if FIX_NON_OUTPUT_LAYER
   Bool m_isOutputLayerFlag;
-#endif
+#endif //SVC_EXTENSION
+
 public:
+#if SVC_EXTENSION
 #if POC_RESET_RESTRICTIONS
   static Bool                    m_checkPocRestrictionsForCurrAu;
@@ -189 +189 @@
   static Int                     m_crossLayerPocResetIdc;
 #endif
+#endif //SVC_EXTENSION
 
   TDecTop();