Changeset 530 in SHVCSoftware for branches/SHM-4.1-dev/source/App

Timestamp:

28 Dec 2013, 02:37:15 (11 years ago)

Author:

qualcomm

Message:

Related to Adoption of JCTVC_O0223 with macro (O0223_PICTURE_TYPES_ALIGN_FLAG)
Related to Adoption of JCTVC_O0226 with macros (VPS_VUI_TILES_NOT_IN_USEFLAG
and VPS_VUI_WPP_NOT_IN_USEFLAG)

From Hendry -- hendry@…

Location:

branches/SHM-4.1-dev/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (2 diffs)
• TAppEncCfg.h (modified) (1 diff)

branches/SHM-4.1-dev/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -615 +615 @@
   ("MaxTidIlRefPicsPlus1%d", cfg_maxTidIlRefPicsPlus1, 1, MAX_LAYERS, "allowed maximum temporal_id for inter-layer prediction")
 #endif
+#if O0223_PICTURE_TYPES_ALIGN_FLAG
+  ("CrossLayerPictureTypeAlignFlag", m_crossLayerPictureTypeAlignFlag, true, "align picture type across layers" )  
+#endif
 #if N0147_IRAP_ALIGN_FLAG
-  ("CrossLayerIrapAlignFlag", m_crossLayerIrapAlignFlag, true, "align IRAP across layers" )  
+    ("CrossLayerIrapAlignFlag", m_crossLayerIrapAlignFlag, true, "align IRAP across layers" )  
 #endif
 #if AVC_BASE
@@ -2443 +2446 @@
   printf("Skip picture at ARC switch    : %d\n", m_skipPictureAtArcSwitch );
 #endif
+#if O0223_PICTURE_TYPES_ALIGN_FLAG
+  printf("Cross layer picture type alignment    : %d\n", m_crossLayerPictureTypeAlignFlag );
+#endif
 #if N0147_IRAP_ALIGN_FLAG
   printf("Cross layer IRAP alignment    : %d\n", m_crossLayerIrapAlignFlag );

branches/SHM-4.1-dev/source/App/TAppEncoder/TAppEncCfg.h

@@ -394 +394 @@
   Bool m_phaseAlignFlag;
 #endif
+#if O0223_PICTURE_TYPES_ALIGN_FLAG
+  Bool m_crossLayerPictureTypeAlignFlag;
+#endif
 #if N0147_IRAP_ALIGN_FLAG
   Bool m_crossLayerIrapAlignFlag;