Changeset 1126 in SHVCSoftware for branches/SHM-dev/source/App

Timestamp:

7 Jul 2015, 02:30:56 (10 years ago)

Author:

seregin

Message:

macro cleanup: O0223_PICTURE_TYPES_ALIGN_FLAG

Location:

branches/SHM-dev/source/App/TAppEncoder

Files:

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

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

@@ -1167 +1167 @@
   ("MaxTidRefPresentFlag",                           m_maxTidRefPresentFlag,                            false, "max_tid_ref_present_flag (0: not present, 1: present) " )
   ("MaxTidIlRefPicsPlus1%d",                         cfg_maxTidIlRefPicsPlus1,                  7, MAX_LAYERS, "allowed maximum temporal_id for inter-layer prediction")
-#if O0223_PICTURE_TYPES_ALIGN_FLAG
   ("CrossLayerPictureTypeAlignFlag",                 m_crossLayerPictureTypeAlignFlag,                   true, "align picture type across layers" )  
-#endif
   ("CrossLayerIrapAlignFlag",                        m_crossLayerIrapAlignFlag,                          true, "align IRAP across layers" )  
 #if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG
@@ -4509 +4507 @@
   printf("Skip picture at ARC switch        : %d\n", m_skipPictureAtArcSwitch );
 #endif
-#if O0223_PICTURE_TYPES_ALIGN_FLAG
   printf("Align picture type                : %d\n", m_crossLayerPictureTypeAlignFlag );
-#endif
   printf("Cross layer IRAP alignment        : %d\n", m_crossLayerIrapAlignFlag );
 #if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG

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

@@ -490 +490 @@
   UInt      m_ilcIdc[1024];
 #endif
-#if O0223_PICTURE_TYPES_ALIGN_FLAG
   Bool      m_crossLayerPictureTypeAlignFlag;
-#endif
   Bool      m_crossLayerIrapAlignFlag;
 #if Q0096_OVERLAY_SEI

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

@@ -1754 +1754 @@
     }
 #endif
-#if O0223_PICTURE_TYPES_ALIGN_FLAG
     vps->setCrossLayerPictureTypeAlignFlag( m_crossLayerPictureTypeAlignFlag );
-#endif
 #if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG
     vps->setCrossLayerAlignedIdrOnlyFlag( m_crossLayerAlignedIdrOnlyFlag );