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

Timestamp:

15 Feb 2012, 19:05:04 (13 years ago)

Author:

hschwarz

Message:

updated with HHI branch (0.2-HHI)

Location:

trunk/source/Lib/TLibEncoder

Files:

• TEncCfg.h (modified) (1 diff)
• TEncSlice.cpp (modified) (1 diff)
• TEncTop.cpp (modified) (3 diffs)

trunk/source/Lib/TLibEncoder/TEncCfg.h

@@ -355 +355 @@
 #endif
 
+#if SONY_COLPIC_AVAILABILITY
+  Int       getViewOrderIdx                 ()      { return  m_iViewOrderIdx; }
+#endif
+
 #if HHI_VSO
   //==== VSO  ==========

trunk/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -149 +149 @@
   rpcSlice->initSlice();
   rpcSlice->setPOC( pcPic->getPOC() );
+#if SONY_COLPIC_AVAILABILITY
+  rpcSlice->setViewOrderIdx(m_pcCfg->getViewOrderIdx());
+#endif 
 
   // slice type

trunk/source/Lib/TLibEncoder/TEncTop.cpp

@@ -92 +92 @@
   m_cLoopFilter.        create( g_uiMaxCUDepth );
 #if DEPTH_MAP_GENERATION
-  m_cDepthMapGenerator. create( false, getSourceWidth(), getSourceHeight(), g_uiMaxCUDepth, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiBitDepth + g_uiBitIncrement );
+  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) );
 #endif
 #if HHI_INTER_VIEW_RESIDUAL_PRED
@@ -304 +304 @@
       if( bNeedPrdDepthMapBuf && !pcPic->getPredDepthMap() )
       {
-        pcPic->addPrdDepthMapBuffer();
+        pcPic->addPrdDepthMapBuffer( PDM_SUB_SAMP_EXP_X(m_uiPredDepthMapGeneration), PDM_SUB_SAMP_EXP_Y(m_uiPredDepthMapGeneration) );
       }
 #endif
@@ -798 +798 @@
   pcPic->setQP(max(MIN_QP,min(MAX_QP, m_iQP+ m_aiTLayerQPOffset[m_cSeqIter.getFrameDescriptor().getTEncSeqStructureLayer(m_uiViewId)] + iQpChangeOffset )) );
   pcPic->setViewIdx( m_uiViewId );
+#if SONY_COLPIC_AVAILABILITY
+  pcPic->setViewOrderIdx(m_iViewOrderIdx);
+#endif
 #if 0
   pcPic->setNumRefs(0, REF_PIC_LIST_0);