Changeset 485 in SHVCSoftware for branches/SHM-4.0-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

Timestamp:

16 Nov 2013, 01:12:02 (11 years ago)

Author:

qualcomm

Message:

Removal of IRAP align dependency constraints on poc_Reset_flag and move IRAP align flag to VPS VUI (JCTVC-O0223 proposal 2,JCTVC-O0139 proposal 5)

File:

• branches/SHM-4.0-dev/source/Lib/TLibEncoder/TEncCavlc.cpp (modified) (2 diffs)

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

@@ -1022 +1022 @@
   WRITE_FLAG(vps->getPhaseAlignFlag(), "cross_layer_phase_alignment_flag" );
 #endif
-#if N0147_IRAP_ALIGN_FLAG
+#if N0147_IRAP_ALIGN_FLAG && !IRAP_ALIGN_FLAG_IN_VPS_VUI
   WRITE_FLAG(vps->getCrossLayerIrapAlignFlag(), "cross_layer_irap_aligned_flag");
 #endif 
@@ -1092 +1092 @@
 {
   Int i,j;
+#if IRAP_ALIGN_FLAG_IN_VPS_VUI
+      WRITE_FLAG(vps->getCrossLayerIrapAlignFlag(), "cross_layer_irap_aligned_flag");
+#endif 
 #if VPS_VUI_BITRATE_PICRATE
   WRITE_FLAG( vps->getBitRatePresentVpsFlag(),        "bit_rate_present_vps_flag" );