Changeset 120 in 3DVCSoftware for trunk/source/App/TAppEncoder

Timestamp:

30 Aug 2012, 19:52:58 (12 years ago)

Author:

tech

Message:

Cleanup of WVSO and fixed cfg-file switch

Location:

trunk/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (4 diffs)
• TAppEncCfg.h (modified) (1 diff)
• 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" )
+  ("WVSO",                            m_bUseWVSO                , false         , "Use depth fidelity term for VSO" )
+  ("VSOWeight",                       m_iVSOWeight              , 10            , "Synthesized View Distortion Change weight" )
+  ("VSDWeight",                       m_iVSDWeight              , 1             , "View Synthesis Distortion estimate weight" )
+  ("DWeight",                         m_iDWeight                , 1             , "Depth Distortion weight" )
 #endif
 
 #if OL_DEPTHLIMIT_A0044
-  ("DPL",   m_bDepthPartitionLimiting           , false         , "Use DepthPartitionLimiting" )
+  ("DPL",                             m_bDepthPartitionLimiting , false         , "Use DepthPartitionLimiting" )
 #endif
 
@@ -655 +655 @@
 
 #if LGE_WVSO_A0119
-  m_bWVSO = m_bUseVSO && m_bWVSO && m_bUsingDepthMaps;
+  m_bUseWVSO = m_bUseVSO && m_bUseWVSO && m_bUsingDepthMaps;
 #endif
   xCleanUpVectors();
@@ -1703 +1703 @@
 #endif
 #if LGE_WVSO_A0119
-  printf("WVSO:%d ", m_bWVSO );
+  printf("WVSO:%d ", m_bUseWVSO );
 #endif
 #if OL_DEPTHLIMIT_A0044
@@ -1715 +1715 @@
 #endif
 #if LGE_WVSO_A0119
-  printf("\nVSO : SAIT : SAD weight = %d : %d : %d ", m_iVSOWeight, m_iVSDWeight, m_iDWeight );
+  printf("\nVSO : VSD : SAD weight = %d : %d : %d ", m_iVSOWeight, m_iVSDWeight, m_iDWeight );
 #endif
   printf("\n\n");

trunk/source/App/TAppEncoder/TAppEncCfg.h

@@ -298 +298 @@
 #endif
 #if LGE_WVSO_A0119
-  Bool      m_bWVSO;                                    ///< flag for using View Synthesis Optimization  
+  Bool      m_bUseWVSO;                                    ///< flag for using View Synthesis Optimization  
   Int       m_iVSOWeight;
   Int       m_iVSDWeight;

trunk/source/App/TAppEncoder/TAppEncTop.cpp

@@ -208 +208 @@
 #endif
 #if LGE_WVSO_A0119
-    m_acTEncTopList[iViewIdx]->setWVSO                         ( false ); 
+    m_acTEncTopList[iViewIdx]->setUseWVSO                      ( false ); 
 #endif
 #endif
@@ -531 +531 @@
 #endif
 #if LGE_WVSO_A0119
-      m_acTEncDepthTopList[iViewIdx]->setWVSO                          ( m_bWVSO      );
+      m_acTEncDepthTopList[iViewIdx]->setUseWVSO                      ( m_bUseWVSO         );
 #endif
 #endif
@@ -708 +708 @@
       {
         TEncTop* pcEncTop = ( iContent == 0 ) ? m_acTEncTopList[iViewNum] : m_acTEncDepthTopList[iViewNum]; 
-        pcEncTop->setWVSO( m_bWVSO );
+        pcEncTop->setUseWVSO  ( m_bUseWVSO );
         pcEncTop->setVSOWeight( m_iVSOWeight );
         pcEncTop->setVSDWeight( m_iVSDWeight );
-        pcEncTop->setDWeight( m_iDWeight );
+        pcEncTop->setDWeight  ( m_iDWeight );
       }
     }