Changeset 21 in 3DVCSoftware for trunk/source/Lib/TLibEncoder


Ignore:
Timestamp:
15 Feb 2012, 19:05:04 (12 years ago)
Author:
hschwarz
Message:

updated with HHI branch (0.2-HHI)

Location:
trunk/source/Lib/TLibEncoder
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibEncoder/TEncCfg.h

    r5 r21  
    355355#endif
    356356
     357#if SONY_COLPIC_AVAILABILITY
     358  Int       getViewOrderIdx                 ()      { return  m_iViewOrderIdx; }
     359#endif
     360
    357361#if HHI_VSO
    358362  //==== VSO  ==========
  • trunk/source/Lib/TLibEncoder/TEncSlice.cpp

    r5 r21  
    149149  rpcSlice->initSlice();
    150150  rpcSlice->setPOC( pcPic->getPOC() );
     151#if SONY_COLPIC_AVAILABILITY
     152  rpcSlice->setViewOrderIdx(m_pcCfg->getViewOrderIdx());
     153#endif
    151154
    152155  // slice type
  • trunk/source/Lib/TLibEncoder/TEncTop.cpp

    r5 r21  
    9292  m_cLoopFilter.        create( g_uiMaxCUDepth );
    9393#if DEPTH_MAP_GENERATION
    94   m_cDepthMapGenerator. create( false, getSourceWidth(), getSourceHeight(), g_uiMaxCUDepth, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiBitDepth + g_uiBitIncrement );
     94  m_cDepthMapGenerator. create( false, getSourceWidth(), getSourceHeight(), g_uiMaxCUDepth, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiBitDepth + g_uiBitIncrement, PDM_SUB_SAMP_EXP_X(m_uiPredDepthMapGeneration), PDM_SUB_SAMP_EXP_Y(m_uiPredDepthMapGeneration) );
    9595#endif
    9696#if HHI_INTER_VIEW_RESIDUAL_PRED
     
    304304      if( bNeedPrdDepthMapBuf && !pcPic->getPredDepthMap() )
    305305      {
    306         pcPic->addPrdDepthMapBuffer();
     306        pcPic->addPrdDepthMapBuffer( PDM_SUB_SAMP_EXP_X(m_uiPredDepthMapGeneration), PDM_SUB_SAMP_EXP_Y(m_uiPredDepthMapGeneration) );
    307307      }
    308308#endif
     
    798798  pcPic->setQP(max(MIN_QP,min(MAX_QP, m_iQP+ m_aiTLayerQPOffset[m_cSeqIter.getFrameDescriptor().getTEncSeqStructureLayer(m_uiViewId)] + iQpChangeOffset )) );
    799799  pcPic->setViewIdx( m_uiViewId );
     800#if SONY_COLPIC_AVAILABILITY
     801  pcPic->setViewOrderIdx(m_iViewOrderIdx);
     802#endif
    800803#if 0
    801804  pcPic->setNumRefs(0, REF_PIC_LIST_0);
Note: See TracChangeset for help on using the changeset viewer.