Changeset 1313 in 3DVCSoftware for trunk/source/Lib/TLibExtractor


Ignore:
Timestamp:
13 Aug 2015, 17:38:13 (9 years ago)
Author:
tech
Message:

Merged 14.1-update-dev1@1312.

Location:
trunk/source/Lib/TLibExtractor
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibExtractor/TExtrTop.cpp

    r1179 r1313  
    3737
    3838#include "TExtrTop.h"
    39 #if H_MV
     39#if NH_MV
    4040TExtrTop::TExtrTop()
    4141{
     
    5656{
    5757  //extraction now has to be done using layer_id
    58   UInt uiLayerId      = nalu.m_layerId;
     58  UInt uiLayerId      = nalu.m_nuhLayerId;
    5959
    6060 
    6161  // Initialize entropy decoder
    6262  m_cEntropyDecoder.setEntropyDecoder( &m_cCavlcDecoder );
    63   m_cEntropyDecoder.setBitstream     ( nalu.m_Bitstream );
     63
     64  TComInputBitstream inpBs = nalu.getBitstream();
     65  m_cEntropyDecoder.setBitstream     ( &inpBs );
    6466 
    6567  if ( nalu.m_nalUnitType == NAL_UNIT_VPS )
     
    7274  {
    7375     TComSPS     cSPS;
    74 #if H_3D
    75 
    7676     m_cEntropyDecoder   .decodeSPS( &cSPS );
    77 #else
    78      m_cEntropyDecoder   .decodeSPS( &cSPS );
    79 #endif
    8077     m_acSPSBuffer       .push_back( cSPS );
    8178  }
     
    109106    rcVpsInfoHandle << "LayerIdInNuh   = " << layerId                             << std::endl;
    110107    rcVpsInfoHandle << "ViewOrderIndex = " << m_cVPS.getViewIndex     ( layerId ) << std::endl;     
    111 #if H_3D   
    112108    rcVpsInfoHandle << "DepthFlag      = " << m_cVPS.getDepthId       ( layerId ) << std::endl;     
    113 #endif
    114109    rcVpsInfoHandle << "ViewId         = " << m_cVPS.getViewId        ( layerId ) << std::endl;     
    115110  }
  • trunk/source/Lib/TLibExtractor/TExtrTop.h

    r1179 r1313  
    4646#include <set>
    4747
    48 #if H_MV
     48#if NH_MV
    4949// ====================================================================================================================
    5050// Class definition
Note: See TracChangeset for help on using the changeset viewer.