Changeset 1131 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder

Timestamp:

7 Jul 2015, 03:31:59 (10 years ago)

Author:

seregin

Message:

macro cleanup: R0071_IRAP_EOS_CROSS_LAYER_IMPACTS

Location:

branches/SHM-dev/source/Lib/TLibDecoder

Files:

• TDecTop.cpp (modified) (8 diffs)
• TDecTop.h (modified) (3 diffs)

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

@@ -106 +106 @@
   m_isLastNALWasEos = false;
 #endif
-#if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
   m_lastPicHasEos = false;
-#endif
 #if NO_CLRAS_OUTPUT_FLAG
   m_noClrasOutputFlag          = false;
@@ -852 +850 @@
       setNoClrasOutputFlag(true);
     }
-#if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
     else if( m_lastPicHasEos )
     {
       setNoClrasOutputFlag(true);
     }
-#endif
     else if ( m_apcSlicePilot->getBlaPicFlag() )
     {
@@ -1483 +1479 @@
     }
 #endif
-#if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
+
+#if SVC_EXTENSION
     xCheckLayerReset();
     xSetLayerInitializedFlag();
 #endif
+
     // Buffer initialize for prediction.
     m_cPrediction.initTempBuff(m_apcSlicePilot->getSPS()->getChromaFormatIdc());
@@ -1993 +1991 @@
   setFirstPicInLayerDecodedFlag(true);
 #endif
-#if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
+#if SVC_EXTENSION
   m_lastPicHasEos = false;
 #endif
@@ -2248 +2246 @@
 #if Q0177_EOS_CHECKS
       assert( m_isLastNALWasEos == false );
-#if !R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
-      //Check layer id of the nalu. if it is not 0, give a warning message and just return without doing anything.
-      if (nalu.m_layerId > 0)
-      {
-        printf( "\nThis bitstream has EOS with non-zero layer id.\n" );
-        return false;
-      }
-#endif
+
       m_isLastNALWasEos = true;
-#if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
       m_lastPicHasEos = true;
-#endif
 #endif
       m_associatedIRAPType = NAL_UNIT_INVALID;
@@ -2687 +2676 @@
 #endif
 
-#if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
 Void TDecTop::xCheckLayerReset()
 {
@@ -2772 +2760 @@
   }
 }
-#endif
-
-#if SVC_EXTENSION
+
 Void TDecTop::xDeriveSmallestLayerId(TComVPS* vps)
 {
@@ -2811 +2797 @@
   }
 }
-#endif
 
 Void TDecTop::xSetSpatialEnhLayerFlag(TComSlice* slice, TComPic* pic)

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

@@ -124 +124 @@
   Bool                    m_isLastNALWasEos;
 #endif
-#if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
   Bool                    m_lastPicHasEos;
-#endif
   static UInt             m_prevPOC;        // POC of the previous slice
   static UInt             m_uiPrevLayerId;  // LayerId of the previous slice
@@ -310 +308 @@
   Void      xDecodeSEI( TComInputBitstream* bs, const NalUnitType nalUnitType );
 
+#if SVC_EXTENSION
 #if NO_CLRAS_OUTPUT_FLAG
   Int  getNoClrasOutputFlag()                { return m_noClrasOutputFlag;}
@@ -324 +323 @@
   Void resetPocRestrictionCheckParameters();
 #endif
-#if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
   Void xCheckLayerReset();
   Void xSetNoRaslOutputFlag();