Changeset 1220 in SHVCSoftware for branches/SHM-dev/source

Timestamp:

8 Jul 2015, 23:54:03 (9 years ago)

Author:

seregin

Message:

macro cleanup: Q0177_EOS_CHECKS

Location:

branches/SHM-dev/source/Lib

Files:

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

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

@@ -47 +47 @@
 #define CONFORMANCE_BITSTREAM_MODE       1      ///< In order to generate the metadata related to conformance bitstreams
 
-#define Q0177_EOS_CHECKS                 1      ///< JCTVC-Q0177; Put checks on handling EOS
 #define DISCARDABLE_PIC_RPS              1      ///< JCTVC-P0130: Inter-layer RPS and temporal RPS should not contain picture with discardable_flag equal to 1
 #define ALIGNED_BUMPING                  1      ///< JCTVC-P0192: Align bumping of pictures in an AU

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

@@ -99 +99 @@
 #endif
   memset(m_cIlpPic, 0, sizeof(m_cIlpPic));
-#if Q0177_EOS_CHECKS
   m_isLastNALWasEos = false;
-#endif
   m_lastPicHasEos = false;
 #if NO_CLRAS_OUTPUT_FLAG
@@ -1962 +1960 @@
 #endif
 #if SVC_EXTENSION
-#if Q0177_EOS_CHECKS
       m_isLastNALWasEos = false;
-#endif
 #if AVC_BASE
       if( m_parameterSetManagerDecoder.getPrefetchedVPS(0)->getNonHEVCBaseLayerFlag() )
@@ -2004 +2000 @@
     case NAL_UNIT_PREFIX_SEI:
     case NAL_UNIT_SUFFIX_SEI:
-#if Q0177_EOS_CHECKS
-      if ( nalu.m_nalUnitType == NAL_UNIT_SUFFIX_SEI )
+#if SVC_EXTENSION
+      if( nalu.m_nalUnitType == NAL_UNIT_SUFFIX_SEI )
       {
         assert( m_isLastNALWasEos == false );
@@ -2029 +2025 @@
     case NAL_UNIT_CODED_SLICE_RASL_N:
     case NAL_UNIT_CODED_SLICE_RASL_R:
-#if Q0177_EOS_CHECKS
-      if (nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_TRAIL_R || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_TRAIL_N ||
+#if SVC_EXTENSION
+      if( nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_TRAIL_R || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_TRAIL_N ||
           nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_TSA_R || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_TSA_N ||
           nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_STSA_R || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_STSA_N ||
@@ -2042 +2038 @@
         m_isLastNALWasEos = false;
       }
-#endif
-#if SVC_EXTENSION
+
       return xDecodeSlice(nalu, iSkipFrame, iPOCLastDisplay, curLayerId, bNewPOC);
 #else
@@ -2051 +2046 @@
 
     case NAL_UNIT_EOS:
-#if Q0177_EOS_CHECKS
+#if SVC_EXTENSION
       assert( m_isLastNALWasEos == false );
 
@@ -2080 +2075 @@
 
     case NAL_UNIT_FILLER_DATA:
-#if Q0177_EOS_CHECKS
+#if SVC_EXTENSION
       assert( m_isLastNALWasEos == false );
 #endif

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

@@ -121 +121 @@
 
 #if SVC_EXTENSION
-#if Q0177_EOS_CHECKS
   Bool                    m_isLastNALWasEos;
-#endif
   Bool                    m_lastPicHasEos;
   static UInt             m_prevPOC;        // POC of the previous slice