Changeset 504 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncCfg.cpp

Timestamp:

28 Jun 2013, 03:51:50 (11 years ago)

Author:

zhang

Message:

Merge Dev2.a to Dev2 and simulation results updated

File:

• branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncCfg.cpp (modified) (3 diffs)

branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -505 +505 @@
 #endif
 
+#if H_3D_ARP
+  ("AdvMultiviewResPred",      m_uiUseAdvResPred,           (UInt)1, "Usage of Advanced Residual Prediction" )
+#endif
+#if H_3D_IC
+  ("IlluCompEnable",           m_abUseIC, std::vector<Bool>(2, true), "Enable illumination compensation")
+#endif
   // Coding tools
   ("AMP",                      m_enableAMP,                 true,  "Enable asymmetric motion partitions")
@@ -1400 +1406 @@
   xConfirmPara(  m_maxNumMergeCand < 1,  "MaxNumMergeCand must be 1 or greater.");
   xConfirmPara(  m_maxNumMergeCand > 5,  "MaxNumMergeCand must be 5 or smaller.");
+
+#if H_3D_ARP
+  xConfirmPara( ( 0 != m_uiUseAdvResPred ) &&  ( 1 != m_uiUseAdvResPred ), "UseAdvResPred must be 0 or 1." );
+#endif
 
 #if ADAPTIVE_QP_SELECTION
@@ -2294 +2304 @@
   printf("IvMvPred:%d ", m_ivMvPredFlag );
 #endif
+#if H_3D_ARP
+  printf(" ARP:%d  ", m_uiUseAdvResPred  );
+#endif
+#if H_3D_IC
+  printf( "IlluCompEnable: %d %d ", m_abUseIC[0] ? 1 : 0, m_abUseIC[1] ? 1 : 0 );
+#endif
 #if H_3D_NBDV_REF
   printf("DepthRefinement:%d ", m_depthRefinementFlag );