Changeset 1125 in SHVCSoftware for branches

Timestamp:

7 Jul 2015, 02:27:23 (9 years ago)

Author:

seregin

Message:

macro cleanup: IRAP_ALIGN_FLAG_IN_VPS_VUI

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (2 diffs)
• TLibEncoder/TEncCavlc.cpp (modified) (2 diffs)

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

@@ -173 +173 @@
 #define P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG   1  ///< a flag to indicatate whether picture types for IRAP are IDR across layers.
 
-#define IRAP_ALIGN_FLAG_IN_VPS_VUI       1      ///< Move IRAP align flag to VPS VUI 
-
 #define VIEW_ID_RELATED_SIGNALING        1      ///< Introduce syntax elements view_id and view_id_val
 #define N0065_LAYER_POC_ALIGNMENT        1

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

@@ -3274 +3274 @@
 #endif
 
-#if !IRAP_ALIGN_FLAG_IN_VPS_VUI
-  READ_FLAG(uiCode, "cross_layer_irap_aligned_flag" );
-  vps->setCrossLayerIrapAlignFlag(uiCode);
-#endif
-
 #if VPS_DPB_SIZE_TABLE
   parseVpsDpbSizeTable(vps);
@@ -3671 +3666 @@
   {
 #endif
-#if IRAP_ALIGN_FLAG_IN_VPS_VUI
     READ_FLAG(uiCode, "cross_layer_irap_aligned_flag" );
     vps->setCrossLayerIrapAlignFlag(uiCode);
-#endif
 #if O0223_PICTURE_TYPES_ALIGN_FLAG
   }

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

@@ -2313 +2313 @@
   }
 #endif
-#if !IRAP_ALIGN_FLAG_IN_VPS_VUI
-  WRITE_FLAG(vps->getCrossLayerIrapAlignFlag(), "cross_layer_irap_aligned_flag");
-#endif 
+ 
 #if VPS_DPB_SIZE_TABLE
   codeVpsDpbSizeTable(vps);
@@ -2518 +2516 @@
   {
 #endif 
-#if IRAP_ALIGN_FLAG_IN_VPS_VUI
     WRITE_FLAG(vps->getCrossLayerIrapAlignFlag(), "cross_layer_irap_aligned_flag");
-#endif 
 #if O0223_PICTURE_TYPES_ALIGN_FLAG
   }