Changeset 40 in 3DVCSoftware for branches/0.3-ericsson/source/Lib/TLibDecoder/TDecCAVLC.cpp

Timestamp:

25 Mar 2012, 13:04:30 (13 years ago)

Author:

ericsson

Message:

Ericsson integration: integrated bitstream extractor; implemented NALu header according to HEVC CD, using reserved_one_5bit as layer_id_plus1

File:

• branches/0.3-ericsson/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (2 diffs)

branches/0.3-ericsson/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -82 +82 @@
 // ====================================================================================================================
 
+#if BITSTREAM_EXTRACTION
+Void  TDecCavlc::parseNalUnitHeader ( NalUnitType& eNalUnitType, UInt& TemporalId, UInt& uiLayerId )
+{
+  UInt  uiCode;
+
+  xReadCode ( 1, uiCode ); assert( 0 == uiCode); // forbidden_zero_bit
+  xReadCode ( 1, uiCode );                       // nal_ref_flag
+  xReadCode ( 6, uiCode );                       // nal_unit_type
+  eNalUnitType = (NalUnitType) uiCode;
+
+  xReadCode(3, uiCode); // temporal_id
+  TemporalId = uiCode;
+  xReadCode(5, uiCode); // layer_id_plus1
+  assert( 1 <= uiCode );
+  uiLayerId = uiCode - 1;
+}
+#else
 Void  TDecCavlc::parseNalUnitHeader ( NalUnitType& eNalUnitType, UInt& TemporalId, Bool& bOutputFlag )
 {
@@ -105 +122 @@
   }
 }
+#endif
 
 /**