Changeset 116 in 3DVCSoftware for trunk/source/App

Timestamp:

30 Aug 2012, 16:09:23 (12 years ago)

Author:

tech

Message:

Cleanup

Location:

trunk/source/App/TAppEncoder

Files:

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

trunk/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -336 +336 @@
 #endif
 #if LGE_WVSO_A0119
-  ("WVSO",                            m_bWVSO                   , true         , "Use WVSO" )
-  ("VSOWeight",                       m_iVSOWeight              , 10                                     , "VSO Weight" )
-  ("VSDWeight",                       m_iVSDWeight             , 1                                        , "SAIT Weight" )
-  ("DWeight",                                                                           m_iDWeight                                                  , 1                                          , "SSE Weight" )
-#endif
-
-#if OL_DEPTHLIMIT
+  ("WVSO",                            m_bWVSO                   , true          , "Use WVSO" )
+  ("VSOWeight",                       m_iVSOWeight              , 10            , "VSO Weight" )
+  ("VSDWeight",                       m_iVSDWeight              , 1             , "SAIT Weight" )
+  ("DWeight",                         m_iDWeight                , 1             , "SSE Weight" )
+#endif
+
+#if OL_DEPTHLIMIT_A0044
   ("DPL",   m_bDepthPartitionLimiting           , false         , "Use DepthPartitionLimiting" )
 #endif
@@ -1705 +1705 @@
   printf("WVSO:%d ", m_bWVSO );
 #endif
-#if OL_DEPTHLIMIT
+#if OL_DEPTHLIMIT_A0044
   printf("DPL:%d ", m_bDepthPartitionLimiting);
 #endif

trunk/source/App/TAppEncoder/TAppEncCfg.h

@@ -299 +299 @@
 #if LGE_WVSO_A0119
   Bool      m_bWVSO;                                    ///< flag for using View Synthesis Optimization  
-  Int                           m_iVSOWeight;
+  Int       m_iVSOWeight;
   Int       m_iVSDWeight;
-  Int                           m_iDWeight;
+  Int       m_iDWeight;
 #endif
   // coding tools (depth intra modes)
@@ -308 +308 @@
 #endif
 
-#if OL_DEPTHLIMIT
+#if OL_DEPTHLIMIT_A0044
   Bool      m_bDepthPartitionLimiting;
 #endif

trunk/source/App/TAppEncoder/TAppEncTop.cpp

@@ -208 +208 @@
 #endif
 #if LGE_WVSO_A0119
-    m_acTEncTopList[iViewIdx]->setWVSO                                                                                           ( false ); 
+    m_acTEncTopList[iViewIdx]->setWVSO                         ( false ); 
 #endif
 #endif
@@ -364 +364 @@
     m_acTEncTopList[iViewIdx]->setUseDMM                     ( false );
 #endif
-#if OL_DEPTHLIMIT
-        m_acTEncTopList[iViewIdx]->setUseDPL                     ( false );
+#if OL_DEPTHLIMIT_A0044
+    m_acTEncTopList[iViewIdx]->setUseDPL                     ( false );
 #endif
 #if HHI_MPI
@@ -643 +643 @@
     m_acTEncDepthTopList[iViewIdx]->setUseDMM                     ( m_bUseDMM );
 #endif
-#if OL_DEPTHLIMIT
-        m_acTEncDepthTopList[iViewIdx]->setUseDPL                      (m_bDepthPartitionLimiting);
+#if OL_DEPTHLIMIT_A0044
+    m_acTEncDepthTopList[iViewIdx]->setUseDPL                      (m_bDepthPartitionLimiting);
 #endif
 #if HHI_MPI