Changeset 332 in 3DVCSoftware for trunk/source/App

Timestamp:

21 Apr 2013, 19:13:11 (12 years ago)

Author:

tech

Message:

Merged branch 6.1-Cleanup@329.

Location:

trunk/source/App/TAppEncoder

Files:

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

trunk/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -368 +368 @@
 #endif
 
-#if OL_QTLIMIT_PREDCODING_B0068
+#if H3D_QTL
   ("QTLPC",                           m_bUseQTLPC               , true         , "Use depth Quadtree Limitation + Predictive Coding" )
 #endif
@@ -1695 +1695 @@
   printf("WVSO:%d ", m_bUseWVSO );
 #endif
-#if OL_QTLIMIT_PREDCODING_B0068
+#if H3D_QTL
   printf("QTLPC:%d ", m_bUseQTLPC);
 #endif

trunk/source/App/TAppEncoder/TAppEncCfg.h

@@ -313 +313 @@
 #endif
 
-#if OL_QTLIMIT_PREDCODING_B0068
+#if H3D_QTL
   Bool      m_bUseQTLPC;                                      ///< flag for using depth QuadTree Limitation + Predictive Coding
 #endif

trunk/source/App/TAppEncoder/TAppEncTop.cpp

@@ -357 +357 @@
     m_acTEncTopList[iViewIdx]->setUseDMM                     ( false );
 #endif
-#if OL_QTLIMIT_PREDCODING_B0068
+#if H3D_QTL
     m_acTEncTopList[iViewIdx]->setUseQTLPC                   ( false );
 #endif
@@ -595 +595 @@
       m_acTEncDepthTopList[iViewIdx]->setUseSAO               ( m_abUseSAO[1]     );
 #if LGE_ILLUCOMP_B0045
+#if LGE_ILLUCOMP_DEPTH_C0046
+      m_acTEncDepthTopList[iViewIdx]->setUseIC                ( m_abUseIC[1] );
+#else
       m_acTEncDepthTopList[iViewIdx]->setUseIC                ( false     );
+#endif
 #endif
 #if INTER_VIEW_VECTOR_SCALING_C0115
@@ -659 +663 @@
 #endif
 
-#if OL_QTLIMIT_PREDCODING_B0068
+#if H3D_QTL
     m_acTEncDepthTopList[iViewIdx]->setUseQTLPC                   (m_bUseQTLPC);
 #endif