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

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/Lib

Files:

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

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -2050 +2050 @@
   ::memset(m_pocLsbNotPresentFlag, 0, sizeof(m_pocLsbNotPresentFlag));
 #endif
-#if O0223_PICTURE_TYPES_ALIGN_FLAG
   m_crossLayerPictureTypeAlignFlag = true;
-#endif 
   m_crossLayerIrapAlignFlag = true;
 #if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG

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

@@ -697 +697 @@
   Bool       m_pocLsbNotPresentFlag[MAX_VPS_LAYER_IDX_PLUS1];
 #endif
-#if O0223_PICTURE_TYPES_ALIGN_FLAG
   Bool       m_crossLayerPictureTypeAlignFlag;
-#endif
   Bool       m_crossLayerIrapAlignFlag;
 #if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG
@@ -849 +847 @@
 #endif
 #endif //SVC_EXTENSION
+
 public:
   TComVPS();
@@ -1117 +1116 @@
   Void   setVpsPocLsbAlignedFlag(Bool x)                                        { m_vpsPocLsbAlignedFlag = x; }
 #endif
-#if O0223_PICTURE_TYPES_ALIGN_FLAG
   Bool   getCrossLayerPictureTypeAlignFlag()                                    { return m_crossLayerPictureTypeAlignFlag;                      }
   Void   setCrossLayerPictureTypeAlignFlag(Bool x)                              { m_crossLayerPictureTypeAlignFlag = x;                         }
-#endif 
 #if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG
   Bool   getCrossLayerAlignedIdrOnlyFlag()                                    { return m_crossLayerAlignedIdrOnlyFlag;                      }

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

@@ -169 +169 @@
 #define Q0060_MAX_TID_REF_EQUAL_TO_ZERO  1      ///< JCTVC-Q0060 handling the case max_tid_il_ref_pics_plus1 is equal to 0.
 
-#define O0223_PICTURE_TYPES_ALIGN_FLAG   1      ///< a flag to indicatate whether picture types are aligned across layers.
-
 #define P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG   1  ///< a flag to indicatate whether picture types for IRAP are IDR across layers.
 

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

@@ -3660 +3660 @@
   UInt i,j;
   UInt uiCode;
-#if O0223_PICTURE_TYPES_ALIGN_FLAG
   READ_FLAG(uiCode, "cross_layer_pic_type_aligned_flag" );
   vps->setCrossLayerPictureTypeAlignFlag(uiCode);
   if (!uiCode) 
   {
-#endif
     READ_FLAG(uiCode, "cross_layer_irap_aligned_flag" );
     vps->setCrossLayerIrapAlignFlag(uiCode);
-#if O0223_PICTURE_TYPES_ALIGN_FLAG
   }
   else
@@ -3674 +3671 @@
     vps->setCrossLayerIrapAlignFlag(true);
   }
-#endif
+
 #if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG
   if( uiCode )

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

@@ -2511 +2511 @@
 {
   Int i,j;
-#if O0223_PICTURE_TYPES_ALIGN_FLAG
   WRITE_FLAG(vps->getCrossLayerPictureTypeAlignFlag(), "cross_layer_pic_type_aligned_flag");
   if (!vps->getCrossLayerPictureTypeAlignFlag())
   {
-#endif 
     WRITE_FLAG(vps->getCrossLayerIrapAlignFlag(), "cross_layer_irap_aligned_flag");
-#if O0223_PICTURE_TYPES_ALIGN_FLAG
   }
   else
@@ -2523 +2520 @@
     vps->setCrossLayerIrapAlignFlag(vps->getVpsVuiPresentFlag()); // When not present, the value of cross_layer_irap_aligned_flag is inferred to be equal to vps_vui_present_flag
   }
-#endif
+
 #if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG
   if(vps->getCrossLayerIrapAlignFlag())