Changeset 56 in 3DVCSoftware for trunk/source/Lib/TLibExtractor/TExtrTop.cpp

Timestamp:

11 May 2012, 21:20:17 (13 years ago)

Author:

hschwarz

Message:

updated trunk (move to HM6.1)

File:

• trunk/source/Lib/TLibExtractor/TExtrTop.cpp (modified) (3 diffs)

trunk/source/Lib/TLibExtractor/TExtrTop.cpp

@@ -46 +46 @@
 }
 
-Void TExtrTop::create()
-{
-}
-
-Void TExtrTop::destroy()
-{
-  m_acSPSBuffer.clear();
-}
-
 Void TExtrTop::init()
 {
@@ -62 +53 @@
 }
 
+Bool TExtrTop::extract( InputNALUnit& nalu, std::set<UInt>& rsuiExtractLayerIds )
+{
+  UInt uiLayerId = xGetLayerId( nalu.m_viewId, nalu.m_isDepth );
 
-Bool TExtrTop::extract( TComBitstream* pcBitstream, std::set<UInt>& rsuiExtractLayerIds )
-{
   // Initialize entropy decoder
-  m_cEntropyDecoder.setEntropyDecoder (&m_cCavlcDecoder);
-  m_cEntropyDecoder.setBitstream      (pcBitstream);
+  m_cEntropyDecoder.setEntropyDecoder( &m_cCavlcDecoder );
+  m_cEntropyDecoder.setBitstream     ( nalu.m_Bitstream );
   
-  NalUnitType eNalUnitType;
-  UInt uiTemporalId, uiLayerId;
-
-  m_cEntropyDecoder.decodeNalUnitHeader( eNalUnitType, uiTemporalId, uiLayerId );  
-
-  if ( eNalUnitType == NAL_UNIT_SPS )
+  if ( nalu.m_nalUnitType == NAL_UNIT_SPS )
   {
      TComSPS cSPS;
-
+#if RPS_IN_SPS
+     TComRPSList cRPS;
+     cSPS.setRPSList( &cRPS );
+#endif
+#if HHI_MPI
+     m_cEntropyDecoder.decodeSPS( &cSPS, nalu.m_isDepth );
+#else
      m_cEntropyDecoder.decodeSPS( &cSPS );
-     cSPS.setLayerId( uiLayerId );
+#endif
 
      m_acSPSBuffer.push_back( cSPS );
@@ -95 +88 @@
   {
      rcSpsInfoHandle << std::endl;
-     rcSpsInfoHandle << "layer_id = "              << iterSPS->getLayerId() << std::endl;
+     rcSpsInfoHandle << "layer_id = "              << xGetLayerId( iterSPS->getViewId(), iterSPS->isDepth() ) << std::endl;
      rcSpsInfoHandle << "seq_parameter_set_id = "  << iterSPS->getSPSId() << std::endl;
      rcSpsInfoHandle << "view_id = "               << iterSPS->getViewId() << std::endl;