Changeset 1134 in SHVCSoftware

Timestamp:

7 Jul 2015, 23:04:30 (9 years ago)

Author:

seregin

Message:

macro cleanup: NESTING_SEI_EXTENSIBILITY

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (3 diffs)
• TLibDecoder/SEIread.cpp (modified) (2 diffs)
• TLibEncoder/SEIwrite.cpp (modified) (1 diff)

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

@@ -51 +51 @@
 #define VPS_VUI_VST_PARAMS               1      ///< JCTVC-R0227: Related to signalling of VST parameters of the base layer.
 #define VPS_VUI_OFFSET                   1      ///< N0085: Signal VPS VUI offset in the VPS extension 
-#define NESTING_SEI_EXTENSIBILITY        1      ///< R0221: Signalling the number of SEI messages in bitstream partition nesting SEI message
 #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
@@ -257 +256 @@
 #endif
 #define P0123_ALPHA_CHANNEL_SEI          1      ///< JCTVC-P0123: SEI message for alpha channel information
+#define MAX_SEIS_IN_BSP_NESTING          64
 
 #endif // SVC_EXTENSION
@@ -316 +316 @@
 #define MAX_NESTING_NUM_OPS                            1024
 #define MAX_NESTING_NUM_LAYER                            64
-
-#if NESTING_SEI_EXTENSIBILITY
-#define MAX_SEIS_IN_BSP_NESTING                          64
-#endif
 
 #if SVC_EXTENSION

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

@@ -1535 +1535 @@
 
   // read nested SEI messages
-#if NESTING_SEI_EXTENSIBILITY
   Int numSeiMessages = 0;
   sei_read_uvlc( pDecodedMessageOutputStream, uiCode, "num_seis_in_bsp_minus1" );  assert( uiCode <= MAX_SEIS_IN_BSP_NESTING );
@@ -1543 +1542 @@
     xReadSEImessage(sei.m_nestedSEIs, nalUnitType, vps, sps, pDecodedMessageOutputStream, &nestingSei, &sei);
   }
-#else
-  do {
-#if LAYERS_NOT_PRESENT_SEI
-    xReadSEImessage(sei.m_nestedSEIs, nalUnitType, vps, sps, pDecodedMessageOutputStream, &nestingSei, &sei);
-#else
-    xReadSEImessage(sei.m_nestedSEIs, nalUnitType, sps, pDecodedMessageOutputStream, &nestingSei);
-#endif
-  } while (m_pcBitstream->getNumBitsLeft() > 8);
-#endif
 }
 

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

@@ -1150 +1150 @@
     WRITE_FLAG( 0, "bsp_nesting_zero_bit" );
   }
-#if NESTING_SEI_EXTENSIBILITY
+
   assert( sei.m_nestedSEIs.size() <= MAX_SEIS_IN_BSP_NESTING );
   WRITE_UVLC( (UInt)sei.m_nestedSEIs.size(), "num_seis_in_bsp_minus1" );
-#endif
+
   // write nested SEI messages
   for (SEIMessages::const_iterator it = sei.m_nestedSEIs.begin(); it != sei.m_nestedSEIs.end(); it++)