Changeset 724 in 3DVCSoftware for trunk/source/Lib/TLibDecoder/TDecTop.cpp


Ignore:
Timestamp:
30 Nov 2013, 12:29:49 (10 years ago)
Author:
tech
Message:

Merged HTM-8.2-dev0@723.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibDecoder/TDecTop.cpp

    r655 r724  
    282282}
    283283
     284#if QC_DEPTH_IV_MRG_F0125
     285Void
     286CamParsCollector::copyCamParamForSlice( TComSlice* pcSlice )
     287{
     288  UInt uiViewIndex = pcSlice->getViewIndex();
     289
     290  pcSlice->getSPS()->initCamParaSPS( uiViewIndex, m_uiCamParsCodedPrecision, m_bCamParsVaryOverTime, m_aaiCodedScale, m_aaiCodedOffset );
     291
     292  if( m_bCamParsVaryOverTime )
     293  {
     294    pcSlice->setCamparaSlice( m_aaiCodedScale, m_aaiCodedOffset );
     295  }
     296}
     297#endif
     298
    284299Bool
    285300CamParsCollector::xIsComplete()
     
    951966    pcSlice->setRefPicList     ( tempRefPicLists, usedAsLongTerm, numPocTotalCurr, true );
    952967#if H_3D_ARP
     968#if SHARP_ARP_REF_CHECK_F0105
     969    pcSlice->setARPStepNum(m_ivPicLists);
     970#else
    953971    pcSlice->setARPStepNum();
     972#endif
    954973    if( pcSlice->getARPStepNum() > 1 )
    955974    {
     
    10531072  }
    10541073
     1074#if QC_DEPTH_IV_MRG_F0125
     1075  if( pcSlice->getIsDepth() && m_pcCamParsCollector )
     1076  {
     1077    m_pcCamParsCollector->copyCamParamForSlice( pcSlice );
     1078  }
     1079#endif
     1080
    10551081  //  Decode a picture
    10561082  m_cGopDecoder.decompressSlice(nalu.m_Bitstream, pcPic);
     
    10601086    m_pcCamParsCollector->setSlice( pcSlice );
    10611087  }
     1088#if QC_DEPTH_IV_MRG_F0125
     1089  if( pcSlice->getIsDepth() )
     1090  {
     1091    pcSlice->getSPS()->setHasCamParInSliceHeader( false );
     1092  }
     1093#endif
    10621094#endif
    10631095  m_bFirstSliceInPicture = false;
Note: See TracChangeset for help on using the changeset viewer.