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

Timestamp:

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

Author:

seregin

Message:

remove macro N0147_IRAP_ALIGN_FLAG

Location:

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

Files:

• TEncCavlc.cpp (modified) (1 diff)
• TEncGOP.cpp (modified) (2 diffs)

branches/SHM-6-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -1200 +1200 @@
   WRITE_FLAG(vps->getPhaseAlignFlag(), "cross_layer_phase_alignment_flag" );
 #endif
-#if N0147_IRAP_ALIGN_FLAG && !IRAP_ALIGN_FLAG_IN_VPS_VUI
+#if !IRAP_ALIGN_FLAG_IN_VPS_VUI
   WRITE_FLAG(vps->getCrossLayerIrapAlignFlag(), "cross_layer_irap_aligned_flag");
 #endif 

branches/SHM-6-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -1160 +1160 @@
       if( pocCurr % m_pcCfg->getIntraPeriod() == 0 )
       {
-#if N0147_IRAP_ALIGN_FLAG
         if(pcSlice->getVPS()->getCrossLayerIrapAlignFlag())
         {
@@ -1175 +1174 @@
         }
         else
-#endif 
+        {
           pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_CRA);
+        }
       }