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

Timestamp:

13 Aug 2015, 17:38:13 (9 years ago)

Author:

tech

Message:

Merged 14.1-update-dev1@1312.

File:

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

trunk/source/Lib/TLibExtractor/TExtrTop.cpp

@@ -37 +37 @@
 
 #include "TExtrTop.h"
-#if H_MV
+#if NH_MV
 TExtrTop::TExtrTop()
 {
@@ -56 +56 @@
 {
   //extraction now has to be done using layer_id
-  UInt uiLayerId      = nalu.m_layerId;
+  UInt uiLayerId      = nalu.m_nuhLayerId;
 
   
   // Initialize entropy decoder
   m_cEntropyDecoder.setEntropyDecoder( &m_cCavlcDecoder );
-  m_cEntropyDecoder.setBitstream     ( nalu.m_Bitstream );
+
+  TComInputBitstream inpBs = nalu.getBitstream(); 
+  m_cEntropyDecoder.setBitstream     ( &inpBs );
   
   if ( nalu.m_nalUnitType == NAL_UNIT_VPS )
@@ -72 +74 @@
   {
      TComSPS     cSPS;
-#if H_3D
-
      m_cEntropyDecoder   .decodeSPS( &cSPS );
-#else
-     m_cEntropyDecoder   .decodeSPS( &cSPS );
-#endif
      m_acSPSBuffer       .push_back( cSPS );
   }
@@ -109 +106 @@
     rcVpsInfoHandle << "LayerIdInNuh   = " << layerId                             << std::endl; 
     rcVpsInfoHandle << "ViewOrderIndex = " << m_cVPS.getViewIndex     ( layerId ) << std::endl;     
-#if H_3D    
     rcVpsInfoHandle << "DepthFlag      = " << m_cVPS.getDepthId       ( layerId ) << std::endl;     
-#endif
     rcVpsInfoHandle << "ViewId         = " << m_cVPS.getViewId        ( layerId ) << std::endl;     
   }