Changeset 616 in SHVCSoftware for branches/SHM-5.1-dev/source/Lib/TLibCommon

Timestamp:

18 Feb 2014, 14:07:05 (11 years ago)

Author:

nokia

Message:

JCTVC-P0138: Implementation of use_alt_cpb_params_flag

Location:

branches/SHM-5.1-dev/source/Lib/TLibCommon

Files:

• SEI.h (modified) (2 diffs)
• TComBitStream.cpp (modified) (2 diffs)
• TypeDef.h (modified) (1 diff)

branches/SHM-5.1-dev/source/Lib/TLibCommon/SEI.h

@@ -157 +157 @@
   , m_cpbDelayOffset      (0)
   , m_dpbDelayOffset      (0)
+#if P0138_USE_ALT_CPB_PARAMS_FLAG
+  , m_useAltCpbParamsFlagPresent(false)
+  , m_useAltCpbParamsFlag (false)
+#endif
   {
     ::memset(m_initialCpbRemovalDelay, 0, sizeof(m_initialCpbRemovalDelay));
@@ -175 +179 @@
   Bool m_concatenationFlag;
   UInt m_auCpbRemovalDelayDelta;
+#if P0138_USE_ALT_CPB_PARAMS_FLAG
+  Bool m_useAltCpbParamsFlagPresent;
+  Bool m_useAltCpbParamsFlag;
+#endif
 };
 class SEIPictureTiming : public SEI

branches/SHM-5.1-dev/source/Lib/TLibCommon/TComBitStream.cpp

@@ -229 +229 @@
   UChar saved_held_bits = m_held_bits;
   UInt saved_fifo_idx = m_fifo_idx;
+#if P0138_USE_ALT_CPB_PARAMS_FLAG
+  UInt saved_numBitsRead = m_numBitsRead;
+#endif
 
   UInt num_bits_to_read = min(uiNumberOfBits, getNumBitsLeft());
@@ -237 +240 @@
   m_held_bits = saved_held_bits;
   m_num_held_bits = saved_num_held_bits;
+#if P0138_USE_ALT_CPB_PARAMS_FLAG
+  m_numBitsRead = saved_numBitsRead;
+#endif
 }
 

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

@@ -233 +233 @@
 #define NO_CLRAS_OUTPUT_FLAG             1
 #define O0149_CROSS_LAYER_BLA_FLAG       1      ///< JCTVC-O0149: signal cross_layer_bla_flag in slice header
+
+#define P0138_USE_ALT_CPB_PARAMS_FLAG    1      ///< JCTVC-P0138: use_alt_cpb_params_flag syntax in buffering period SEI message extension
 
 #if VIEW_ID_RELATED_SIGNALING