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

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

Location:

branches/HTM-8.0-dev0/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (2 diffs)
• TAppEncCfg.h (modified) (1 diff)
• TAppEncTop.cpp (modified) (1 diff)

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

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

@@ -115 +115 @@
   Bool m_viewSynthesisPredFlag;
 #endif
-#if H_3D_TMVP
+#if H_3D
   Bool m_ivMvScalingFlag; 
 #endif

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

@@ -1242 +1242 @@
 #endif
   }  
-#if H_3D_TMVP
+#if H_3D
   vps.setIvMvScalingFlag( m_ivMvScalingFlag );   
 #endif