Changeset 522 in SHVCSoftware for branches/SHM-4.1-dev/source

Timestamp:

19 Dec 2013, 07:01:36 (11 years ago)

Author:

seregin

Message:

add config parameter for IRAP alignment

Location:

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

Files:

• TAppEncCfg.cpp (modified) (3 diffs)
• TAppEncCfg.h (modified) (1 diff)
• TAppEncTop.cpp (modified) (1 diff)

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

@@ -614 +614 @@
   ("MaxTidRefPresentFlag", m_maxTidRefPresentFlag, true, "max_tid_ref_present_flag (0: not present, 1: present(default)) " )
   ("MaxTidIlRefPicsPlus1%d", cfg_maxTidIlRefPicsPlus1, 1, MAX_LAYERS, "allowed maximum temporal_id for inter-layer prediction")
-#endif 
+#endif
+#if N0147_IRAP_ALIGN_FLAG
+  ("CrossLayerIrapAlignFlag", m_crossLayerIrapAlignFlag, true, "align IRAP across layers" )  
+#endif
 #if AVC_BASE
   ("AvcBase,-avc",            m_avcBaseLayerFlag,     0, "avc_base_layer_flag")
@@ -2424 +2427 @@
   printf("Adaptive Resolution Change    : %d\n", m_adaptiveResolutionChange );
 #endif
+#if N0147_IRAP_ALIGN_FLAG
+  printf("Cross layer IRAP alignment    : %d\n", m_crossLayerIrapAlignFlag );
+#endif
   for(UInt layer=0; layer<m_numLayers; layer++)
   {
@@ -2488 +2494 @@
 #endif
 #if O0215_PHASE_ALIGNMENT
-  printf("cross-layer sample alignment : %d\n", m_phaseAlignFlag);
+  printf("Cross-layer sample alignment : %d\n", m_phaseAlignFlag);
 #endif
 #if RATE_CONTROL_LAMBDA_DOMAIN

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

@@ -389 +389 @@
 #endif
 #if O0215_PHASE_ALIGNMENT
-  bool m_phaseAlignFlag;
+  Bool m_phaseAlignFlag;
+#endif
+#if N0147_IRAP_ALIGN_FLAG
+  Bool m_crossLayerIrapAlignFlag;
 #endif
 public:

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

@@ -1338 +1338 @@
 #endif
 #if N0147_IRAP_ALIGN_FLAG
-    vps->setCrossLayerIrapAlignFlag(true);
+    vps->setCrossLayerIrapAlignFlag( m_crossLayerIrapAlignFlag );
     for(UInt layerCtr = 1;layerCtr <= vps->getMaxLayers() - 1; layerCtr++)
     {