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

Timestamp:

30 Apr 2014, 00:04:11 (11 years ago)

Author:

seregin

Message:

remove macro N0147_IRAP_ALIGN_FLAG

Location:

branches/SHM-6-dev/source/Lib/TLibDecoder

Files:

• TDecCAVLC.cpp (modified) (2 diffs)
• TDecTop.cpp (modified) (3 diffs)

branches/SHM-6-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1631 +1631 @@
 #endif
 
-#if N0147_IRAP_ALIGN_FLAG && !IRAP_ALIGN_FLAG_IN_VPS_VUI
   READ_FLAG(uiCode, "cross_layer_irap_aligned_flag" );
   vps->setCrossLayerIrapAlignFlag(uiCode);
-#endif
 
 #if VPS_DPB_SIZE_TABLE
@@ -1829 +1827 @@
 Void TDecCavlc::defaultVPSVUI( TComVPS* vps )
 {
-#if N0147_IRAP_ALIGN_FLAG
   // When not present, the value of all_layers_idr_aligned_flag is inferred to be equal to 0.
   vps->setCrossLayerIrapAlignFlag( false );
-#endif
 
 #if M0040_ADAPTIVE_RESOLUTION_CHANGE

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

@@ -1109 +1109 @@
   // actual decoding starts here
   xActivateParameterSets();
-#if !O0223_O0139_IRAP_ALIGN_NO_CONTRAINTS && N0147_IRAP_ALIGN_FLAG
+#if !O0223_O0139_IRAP_ALIGN_NO_CONTRAINTS
   //Note setting O0223_O0139_IRAP_ALIGN_NO_CONTRAINTS to 0 may cause decoder to crash.
   //When cross_layer_irap_aligned_flag is equal to 0, num_extra_slice_header_bits >=1 
@@ -1763 +1763 @@
 #endif
     
-#if N0147_IRAP_ALIGN_FLAG
     if( m_layerId > 0 && pcSlice->getVPS()->getCrossLayerIrapAlignFlag() )
     {
@@ -1779 +1778 @@
       }
     }
-#endif
 
     if( m_layerId > 0 && !pcSlice->isIntra() && pcSlice->getEnableTMVPFlag() )