Changeset 1394 in 3DVCSoftware for branches/HTM-16.0-dev1/source/App/TAppEncoder/TAppEncTop.cpp

Timestamp:

4 Mar 2016, 09:42:34 (9 years ago)

Author:

tech

Message:

Clean-up VSO.

File:

• branches/HTM-16.0-dev1/source/App/TAppEncoder/TAppEncTop.cpp (modified) (5 diffs)

branches/HTM-16.0-dev1/source/App/TAppEncoder/TAppEncTop.cpp

@@ -148 +148 @@
   xSetCamPara              ( vps ); 
 #endif
-#if NH_3D_VSO
+#if NH_3D_VSO || NH_3D
   m_ivPicLists.setVPS      ( &vps );
 #endif
@@ -278 +278 @@
     m_cTEncTop.setViewId                       ( vps.getViewId      (  layerId ) );
     m_cTEncTop.setViewIndex                    ( vps.getViewIndex   (  layerId ) );
-#if NH_3D_VSO
+#if NH_3D_VSO || NH_3D
     Bool isDepth    = ( vps.getDepthId     ( layerId ) != 0  ) ;
     Bool isAuxDepth = ( vps.getAuxId       ( layerId ) ==  2 ) ; // TBD: define 2 as AUX_DEPTH
@@ -284 +284 @@
     m_cTEncTop.setIsAuxDepth               ( isAuxDepth ); 
     //====== Camera Parameters =========
-    m_cTEncTop.setCameraParameters             ( &m_cCameraData );     
+    m_cTEncTop.setCameraParameters         ( &m_cCameraData );     
+#endif
+#if NH_3D_VSO
     //====== VSO =========
     m_cTEncTop.setRenderModelParameters        ( &m_cRenModStrParser ); 
@@ -796 +798 @@
     {
 #if H_3D_VSO_EARLY_SKIP
-      m_cRendererModel.create( m_cRenModStrParser.getNumOfBaseViews(), m_cRenModStrParser.getNumOfModels(), m_iSourceWidth, m_uiMaxCUHeight , LOG2_DISP_PREC_LUT, 0, m_bVSOEarlySkip );
-#else
-      m_cRendererModel.create( m_cRenModStrParser.getNumOfBaseViews(), m_cRenModStrParser.getNumOfModels(), m_iSourceWidth, m_uiMaxCUHeight , LOG2_DISP_PREC_LUT, 0 );
+      m_cRendererModel.create( m_cRenModStrParser.getNumOfBaseViews(), m_cRenModStrParser.getNumOfModels(), m_iSourceWidth, m_uiMaxCUHeight , LOG2_DISP_PREC_LUT, 0, true, m_bVSOEarlySkip );
+#else
+      m_cRendererModel.create( m_cRenModStrParser.getNumOfBaseViews(), m_cRenModStrParser.getNumOfModels(), m_iSourceWidth, m_uiMaxCUHeight , LOG2_DISP_PREC_LUT, 0 , true);
 #endif
       for ( Int layer = 0; layer < m_numberOfLayers ; layer++ )
@@ -1036 +1038 @@
     for ( Int gopId=0; gopId < gopSize; gopId++ )
     {
-#if NH_3D_VSO
+#if NH_3D_VSO || NH_3D
       UInt iNextPoc = m_acTEncTopList[0] -> getFrameId( gopId );
       if ( iNextPoc < m_framesToBeEncoded )