Changeset 847 in SHVCSoftware

Timestamp:

29 Jul 2014, 00:31:31 (10 years ago)

Author:

qualcomm

Message:

JCTVC-R0221: Changes to BSP nesting SEI (Macro: NESTING_SEI_EXTENSIBILITY)

Include signalling the number of SEI messages in bitstream partition nesting SEI message.

From: Adarsh K. Ramasubramonian <aramasub@…>

Location:

branches/SHM-dev/source/Lib

Files:

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

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

@@ -48 +48 @@
 #define VPS_VUI_OFFSET                   1      ///< N0085: Signal VPS VUI offset in the VPS extension 
 #define REMOVE_BSP_HRD_SEI               1      ///< R0010: Remove bitstream partition HRD SEI message.
+#define NESTING_SEI_EXTENSIBILITY        1      ///< R0221: Signalling the number of SEI messages in bitstream partition nesting SEI message
 #define O0137_MAX_LAYERID                1      ///< JCTVC-O0137, JCTVC-O0200, JCTVC-O0223: restrict nuh_layer_id and vps_max_layers_minus1
 
@@ -299 +300 @@
 #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
 #define MAX_VPS_OP_LAYER_SETS_PLUS1               (MAX_LAYERS+1)

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

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

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

@@ -903 +903 @@
     WRITE_FLAG( 0, "bsp_nesting_zero_bit" );
   }
-
+#if NESTING_SEI_EXTENSIBILITY
+  assert( sei.m_nestedSEIs.size() <= MAX_SEIS_IN_BSP_NESTING );
+  WRITE_UVLC( 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++)