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

Timestamp:

9 Aug 2012, 12:53:16 (12 years ago)

Author:

tech

Message:

Adopted modifications:

• disparity vector generation (A0097)
• inter-view motion prediction modification (A0049)
• simplification of disparity vector derivation (A0126)
• region boundary chain coding (A0070)
• residual skip intra (A0087)
• VSO modification (A0033/A0093)

+ Clean ups + Bug fixes

Update of cfg files (A0033 modification 2)

File:

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

trunk/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -74 +74 @@
 {
   m_aidQP = NULL;
+#if FIXES
+  m_aidQPdepth = NULL;
+#endif
 }
 
@@ -82 +85 @@
     delete[] m_aidQP; m_aidQP = NULL;
   }
+
+#if FIXES
+  if ( m_aidQPdepth )
+  {
+    delete[] m_aidQPdepth; m_aidQPdepth = NULL;
+  }
+#endif
+
   for(Int i = 0; i< m_pchInputFileList.size(); i++ )
   {
@@ -306 +317 @@
 #if HHI_VSO
   ("VSOConfig",                       m_pchVSOConfig            , (Char *) 0    , "VSO configuration")
-    ("VSO",                             m_bUseVSO                 , false         , "Use VSO" )
-    // GT: For development, will be removed later
+  ("VSO",                             m_bUseVSO                 , false         , "Use VSO" )    
   ("VSOMode",                         m_uiVSOMode               , (UInt)   4    , "VSO Mode")
+  ("LambdaScaleVSO",                  m_dLambdaScaleVSO         , (Double) 1    , "Lambda Scaling for VSO")
+
 #if HHI_VSO_LS_TABLE
-  ("LambdaScaleVSO",                  m_dLambdaScaleVSO         , (Double) 1  , "Lambda Scaling for VSO")
-#else
-  ("LambdaScaleVSO",                  m_dLambdaScaleVSO         , (Double) 0.5  , "Lambda Scaling for VSO")
-#endif
-    ("ForceLambdaScaleVSO",             m_bForceLambdaScaleVSO    , false         , "Force using Lambda Scale VSO also in non-VSO-Mode")
+  ("VSOLSTable",                      m_bVSOLSTable             , true          , "Depth QP dependent video/depth rate allocation by Lagrange multiplier" )    
+#endif
+
+#if SAIT_VSO_EST_A0033
+  ("UseEstimatedVSD",                 m_bUseEstimatedVSD        , true          , "Model based VSD estimation instead of rendering based for some encoder decisions" )      
+#endif
+#if LGE_VSO_EARLY_SKIP_A0093
+  ("VSOEarlySkip",                    m_bVSOEarlySkip           , true          , "Early skip of VSO computation if synthesis error assumed to be zero" )      
+#endif
+  ("ForceLambdaScaleVSO",             m_bForceLambdaScaleVSO    , false         , "Force using Lambda Scale VSO also in non-VSO-Mode")
 #if HHI_VSO_DIST_INT
-  ("AllowNegDist",                    m_bAllowNegDist           , true         , "Allow negative Distortion in VSO")
+  ("AllowNegDist",                    m_bAllowNegDist           , true          , "Allow negative Distortion in VSO")
 #endif
 
@@ -667 +684 @@
      0.753550, 0.800000  
   }; 
-  AOT( (m_aiQP[1] < 0) || (m_aiQP[1] > 51));
-  m_dLambdaScaleVSO *= adLambdaScaleTable[m_aiQP[1]]; 
+  if ( m_bVSOLSTable )
+  {
+    AOT( (m_aiQP[1] < 0) || (m_aiQP[1] > 51));
+    m_dLambdaScaleVSO *= adLambdaScaleTable[m_aiQP[1]]; 
+  }
 #endif
 #endif
@@ -1562 +1582 @@
     printf("VSO Negative Distortion      : %d\n",    m_bAllowNegDist ? 1 : 0);
 #endif
+#if HHI_VSO_LS_TABLE
+    printf("VSO LS Table                 : %d\n",    m_bVSOLSTable ? 1 : 0);    
+#endif
+#if SAIT_VSO_EST_A0033
+    printf("VSO Estimated VSD            : %d\n",    m_bUseEstimatedVSD ? 1 : 0);        
+#endif
+#if LGE_VSO_EARLY_SKIP_A0093
+    printf("VSO Early Skip               : %d\n",    m_bVSOEarlySkip ? 1 : 0);    
+#endif
+   
   }
 #endif
@@ -1658 +1688 @@
 #if HHI_VSO
   printf("VSO:%d ", m_bUseVSO             );
-#endif
+#endif  
 #if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
   printf("DMM:%d ", m_bUseDMM );