Changeset 115 in 3DVCSoftware for trunk/source/App/TAppEncoder/TAppEncCfg.cpp

Timestamp:

30 Aug 2012, 14:52:41 (12 years ago)

Author:

tech

Message:

Integrated revision 114. with:

• A0119: VSO Depth Fidelity
• A0044: Depth Quadtree Prediction

File:

• trunk/source/App/TAppEncoder/TAppEncCfg.cpp (modified) (4 diffs)

trunk/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -335 +335 @@
   ("AllowNegDist",                    m_bAllowNegDist           , true          , "Allow negative Distortion in VSO")
 #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
+  ("DPL",   m_bDepthPartitionLimiting           , false         , "Use DepthPartitionLimiting" )
+#endif
 
 #endif
@@ -644 +654 @@
 #endif
 
+#if LGE_WVSO_A0119
+  m_bWVSO = m_bUseVSO && m_bWVSO && m_bUsingDepthMaps;
+#endif
   xCleanUpVectors();
 
@@ -1688 +1701 @@
 #if HHI_VSO
   printf("VSO:%d ", m_bUseVSO             );
-#endif  
+#endif
+#if LGE_WVSO_A0119
+  printf("WVSO:%d ", m_bWVSO );
+#endif
+#if OL_DEPTHLIMIT
+  printf("DPL:%d ", m_bDepthPartitionLimiting);
+#endif
 #if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
   printf("DMM:%d ", m_bUseDMM );
@@ -1694 +1713 @@
 #if HHI_MPI
   printf("MVI:%d ", m_bUseMVI ? 1 : 0 );
+#endif
+#if LGE_WVSO_A0119
+  printf("\nVSO : SAIT : SAD weight = %d : %d : %d ", m_iVSOWeight, m_iVSDWeight, m_iDWeight );
 #endif
   printf("\n\n");