Changeset 1194 in SHVCSoftware for branches/SHM-dev/source

Timestamp:

8 Jul 2015, 19:32:13 (9 years ago)

Author:

seregin

Message:

macro cleanup: INFERENCE_POC_MSB_VAL_PRESENT

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)

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

@@ -46 +46 @@
 #define MAX_LAYERS                       8      ///< max number of layers the codec is supposed to handle
 #define CONFORMANCE_BITSTREAM_MODE       1      ///< In order to generate the metadata related to conformance bitstreams
-#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 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/TLibDecoder/TDecCAVLC.cpp

@@ -1912 +1912 @@
   {
     sliceHeaderExtensionLength = 0;
-#if INFERENCE_POC_MSB_VAL_PRESENT
     pcSlice->setPocMsbValPresentFlag( false );
-#endif
-  }
+  }
+
   UInt startBits = m_pcBitstream->getNumBitsRead();     // Start counter of # SH Extn bits
   if( sliceHeaderExtensionLength > 0 )