Changeset 287 in 3DVCSoftware for branches/HTM-5.1-dev0/source/App

Timestamp:

17 Feb 2013, 01:49:33 (12 years ago)

Author:

tech

Message:

Integrated 5.1-dev1-LG-Fix Rev. 282

Location:

branches/HTM-5.1-dev0/source/App/TAppEncoder

Files:

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

branches/HTM-5.1-dev0/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -340 +340 @@
   ("LoopFilterTcOffset_div2", m_loopFilterTcOffsetDiv2, 0 )
 #if LGE_ILLUCOMP_B0045
+#if LGE_ILLUCOMP_DEPTH_C0046
+  ("IlluCompEnable", m_abUseIC, std::vector<Bool>(2, true), "Enable illumination compensation for inter-view prediction")
+#else
   ("IlluCompEnable",                  m_bUseIC                  , true         , "Use illumination compensation for inter-view prediction" )
+#endif
 #endif
 #if INTER_VIEW_VECTOR_SCALING_C0115
@@ -1807 +1811 @@
 #endif
 #if LGE_ILLUCOMP_B0045
+#if LGE_ILLUCOMP_DEPTH_C0046
+  printf("IlluCompEnable: %d %d", m_abUseIC[0] ? 1 : 0, m_abUseIC[1] ? 1 : 0);
+#else
   printf("IlluCompEnable: %d ", m_bUseIC);
+#endif
 #endif
 #if INTER_VIEW_VECTOR_SCALING_C0115

branches/HTM-5.1-dev0/source/App/TAppEncoder/TAppEncCfg.h

@@ -170 +170 @@
   vector<Bool> m_abUseSAO;
 #if LGE_ILLUCOMP_B0045
+#if LGE_ILLUCOMP_DEPTH_C0046
+  vector<Bool> m_abUseIC;                                    ///< flag for using illumination compensation for inter-view prediction
+#else
   Bool      m_bUseIC;                                     ///< flag for using illumination compensation for inter-view prediction
+#endif
 #endif
 #if INTER_VIEW_VECTOR_SCALING_C0115

branches/HTM-5.1-dev0/source/App/TAppEncoder/TAppEncTop.cpp

@@ -318 +318 @@
     m_acTEncTopList[iViewIdx]->setUseSAO               ( m_abUseSAO[0]     );
 #if LGE_ILLUCOMP_B0045
+#if LGE_ILLUCOMP_DEPTH_C0046
+    m_acTEncTopList[iViewIdx]->setUseIC                ( m_abUseIC[0]      );
+#else
     m_acTEncTopList[iViewIdx]->setUseIC                ( m_bUseIC          );
+#endif
 #endif
 #if INTER_VIEW_VECTOR_SCALING_C0115