Changeset 615 in 3DVCSoftware for branches/HTM-8.0-dev0/source/App/TAppEncoder/TAppEncCfg.cpp

Timestamp:

6 Sep 2013, 00:42:44 (12 years ago)

Author:

tech

Message:

Cleanups and macro removals related to merge and vsp

• MTK_VSP_FIX_ALIGN_WD_E0172
• H_3D_FIX_BVSP
• QC_INRIA_MTK_MRG_E0126
• MTK_DVMCP_FIX_E0172

• TComDataCU::xAddVspCand
• TComDataCU::xAddIvMRGCand
• TComDataCU::getInterMergeCandidates

File:

• branches/HTM-8.0-dev0/source/App/TAppEncoder/TAppEncCfg.cpp (modified) (2 diffs)

branches/HTM-8.0-dev0/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -719 +719 @@
   ("ViewSynthesisPred",               m_viewSynthesisPredFlag,  true           , "view synthesis prediction " )  
 #endif
-#if H_3D_TMVP
+#if H_3D
   ("IvMvScaling",                     m_ivMvScalingFlag      ,  true            , "inter view motion vector scaling" )    
 #endif
@@ -2283 +2283 @@
   printf("ViewSynthesisPred:%d ", m_viewSynthesisPredFlag );
 #endif
-#if H_3D_TMVP
+#if H_3D
   printf("IvMvScaling:%d ", m_ivMvScalingFlag ? 1 : 0  );
 #endif