Changeset 468 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2a/source/App

Timestamp:

16 Jun 2013, 05:33:39 (12 years ago)

Author:

lg

Message:

1.IC and full pel depth coding are integrated and is guarded by Macro H_3D_IC.

Location:

branches/HTM-DEV-0.3-dev2a/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (2 diffs)
• TAppEncCfg.h (modified) (1 diff)
• TAppEncTop.cpp (modified) (1 diff)

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

@@ -508 +508 @@
   ("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")
@@ -2289 +2291 @@
   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
   printf("\n\n");  
 

branches/HTM-DEV-0.3-dev2a/source/App/TAppEncoder/TAppEncCfg.h

@@ -243 +243 @@
   UInt      m_uiARPStepNum;
 #endif
-
+#if H_3D_IC
+  vector<Bool> m_abUseIC;                                    ///< flag for using illumination compensation for inter-view prediction
+#endif
   Bool      m_useFastDecisionForMerge;                        ///< flag for using Fast Decision Merge RD-Cost 
   Bool      m_bUseCbfFastMode;                              ///< flag for using Cbf Fast PU Mode Decision

branches/HTM-DEV-0.3-dev2a/source/App/TAppEncoder/TAppEncTop.cpp

@@ -178 +178 @@
     m_cTEncTop.setUseAdvRP                     ( ( isDepth || 0==layer ) ? 0 : m_uiUseAdvResPred );
     m_cTEncTop.setARPStepNum                   ( ( isDepth || 0==layer ) ? 1 : H_3D_ARP_WFNR     );
+#endif
+#if H_3D_IC
+    m_cTEncTop.setUseIC                        ( vps.getViewIndex( layer ) == 0 ? false : m_abUseIC[isDepth ? 1 : 0] );
 #endif
 #endif // H_3D