Changeset 1394 in 3DVCSoftware for branches/HTM-16.0-dev1/source/App/TAppEncoder/TAppEncCfg.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/TAppEncCfg.cpp (modified) (10 diffs)

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

@@ -188 +188 @@
     free (  m_pchVSOConfig );
   }
+#endif
+#if NH_3D_VSO || NH_3D  
   
   if ( m_pchCameraParameterFile != NULL )
@@ -816 +818 @@
   ("ViewId",                         m_viewId                      , IntAry1d(1,0),                                 "View Id per View Order Index")
   ("AuxId",                          m_auxId                       , IntAry1d(1,0),                                 "AuxId per layer")
-#if NH_3D_VSO
+#if NH_3D_VSO || NH_3D
   ("DepthFlag",                      m_depthFlag                   , IntAry1d(1,0),                                 "Depth Flag")
 #endif
@@ -1285 +1287 @@
   ("Depth420OutputFlag",                              m_depth420OutputFlag,           true                     , "Output depth layers in 4:2:0 ") 
 #endif
-#if NH_3D_VSO  
+#if NH_3D_VSO  || NH_3D
   ("CameraParameterFile,cpf",                         m_pchCameraParameterFile,    (TChar *) 0                 , "Camera Parameter File Name")
   ("CodedCamParsPrecision",                           m_iCodedCamParPrecision,      STD_CAM_PARAMETERS_PRECISION, "precision for coding of camera parameters (in units of 2^(-x) luma samples)" )
-
+#endif
+#if NH_3D_VSO  
   /* View Synthesis Optimization */
   ("VSOConfig",                                       m_pchVSOConfig            , (TChar *) 0                   ,"VSO configuration")
@@ -1807 +1810 @@
   xResizeVector( m_auxId );
 
-#if NH_3D_VSO
+#if NH_3D_VSO || NH_3D
   xResizeVector( m_depthFlag ); 
 #endif
@@ -2070 +2073 @@
       LOG2_DISP_PREC_LUT );
   }
-#if NH_3D
   else
+#endif
+#if NH_3D || NH_3D_VSO
   {
     m_cCameraData     .init     ( ((UInt) m_iNumberOfViews ), 
@@ -2085 +2089 @@
   }
   m_cCameraData.check( false, true );
-#endif
 #endif
 
@@ -2270 +2273 @@
 #endif
 
-#if NH_3D_VSO
+#if NH_3D_VSO || NH_3D
   if ( m_scalabilityMask & ( 1 << DEPTH_ID ) )
   {
@@ -2629 +2632 @@
   }
 
-#if NH_3D_VSO
+#if NH_3D_VSO || NH_3D
   xConfirmPara( m_pchCameraParameterFile    == 0                ,   "CameraParameterFile must be given");
   xConfirmPara( m_pchBaseViewCameraNumbers  == 0                ,   "BaseViewCameraNumbers must be given" );
   xConfirmPara( m_iNumberOfViews != m_cCameraData.getBaseViewNumbers().size() ,   "Number of Views in BaseViewCameraNumbers must be equal to NumberOfViews" );
   xConfirmPara    ( m_iCodedCamParPrecision < 0 || m_iCodedCamParPrecision > 5,       "CodedCamParsPrecision must be in range of 0..5" );
+#endif
+#if NH_3D_VSO
     if( m_bUseVSO )
     {
@@ -3393 +3398 @@
   xPrintParaVector( "AuxId", m_auxId );
 #endif
-#if NH_3D_VSO
+#if NH_3D_VSO || NH_3D
   xPrintParaVector( "DepthLayerFlag", m_depthFlag ); 
   printf("Coded Camera Param. Precision     : %d\n", m_iCodedCamParPrecision);  
@@ -3595 +3600 @@
 
   printf("Max Num Merge Candidates          : %d\n", m_maxNumMergeCand);
-#if NH_3D_VSO
+#if NH_3D_VSO || NH_3D
   printf("BaseViewCameraNumbers             : %s\n", m_pchBaseViewCameraNumbers ); 
   printf("Coded Camera Param. Precision     : %d\n", m_iCodedCamParPrecision);
+#endif
+#if NH_3D_VSO
   printf("Force use of Lambda Scale         : %d\n", m_bForceLambdaScaleVSO );