Changeset 1181 in SHVCSoftware

Timestamp:

8 Jul 2015, 02:53:47 (9 years ago)

Author:

seregin

Message:

macro cleanup: VPS_VUI_OFFSET

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibEncoder/TEncGOP.cpp (modified) (1 diff)

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

@@ -48 +48 @@
 #define INFERENCE_POC_MSB_VAL_PRESENT    1      ///< JCTVC-Q0146 -- poc_msb_val_present_flag shall be equal to 0 when slice_header_extension_length is (inferred to be ) equal to 0
 #define NON_REF_NAL_TYPE_DISCARDABLE     1      ///< JCTVC-P0041 -- If discardable picture is a non-IRAP, it must be a non-referenced sub-layer picture
-#define VPS_VUI_OFFSET                   1      ///< N0085: Signal VPS VUI offset in the VPS extension 
 #define POC_RESET_RESTRICTIONS           1      ///< Restrictions on semantics of POC reset-related syntax elements, including one item from R0223
 #define POC_RESET_VALUE_RESTRICTION      1      ///< R0223: Restriction on the value of full_poc_reset_flag

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

@@ -2353 +2353 @@
 #endif
       {
+        //The following code also calculates the VPS VUI offset
 #else
       OutputNALUnit nalu(NAL_UNIT_VPS);
-#endif
-#if VPS_VUI_OFFSET
-      // The following code also calculates the VPS VUI offset
 #endif
       m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream);