Changeset 70 in 3DVCSoftware for branches/HTM-3.0-Vidyo/source/Lib/TLibExtractor/TExtrTop.cpp

Timestamp:

3 Jun 2012, 21:48:11 (12 years ago)

Author:

vidyo

Message:

 

File:

• branches/HTM-3.0-Vidyo/source/Lib/TLibExtractor/TExtrTop.cpp (modified) (2 diffs)

branches/HTM-3.0-Vidyo/source/Lib/TLibExtractor/TExtrTop.cpp

@@ -55 +55 @@
 Bool TExtrTop::extract( InputNALUnit& nalu, std::set<UInt>& rsuiExtractLayerIds )
 {
+#if VIDYO_VPS_INTEGRATION
+        //extraction now has to be done using layer_id
+  UInt uiLayerId = nalu.m_layerId;
+#else
   UInt uiLayerId = xGetLayerId( nalu.m_viewId, nalu.m_isDepth );
-
+#endif
   // Initialize entropy decoder
   m_cEntropyDecoder.setEntropyDecoder( &m_cCavlcDecoder );
   m_cEntropyDecoder.setBitstream     ( nalu.m_Bitstream );
   
+#if VIDYO_VPS_INTEGRATION
+  if ( nalu.m_nalUnitType == NAL_UNIT_VPS )
+  {
+    // a hack for now assuming there's only one VPS in the bitstream
+    m_cEntropyDecoder.decodeVPS( &m_cVPS );
+      
+  }
+#endif
+
   if ( nalu.m_nalUnitType == NAL_UNIT_SPS )
   {
@@ -69 +82 @@
 #endif
 #if HHI_MPI
+#if VIDYO_VPS_INTEGRATION
+     m_cEntropyDecoder.decodeSPS( &cSPS, m_cVPS.getDepthFlag(uiLayerId) );
+#else
      m_cEntropyDecoder.decodeSPS( &cSPS, nalu.m_isDepth );
+#endif
 #else
      m_cEntropyDecoder.decodeSPS( &cSPS );