Changeset 1084 in 3DVCSoftware for trunk/source/Lib/TLibEncoder/TEncSearch.h

Timestamp:

24 Oct 2014, 11:44:58 (10 years ago)

Author:

tech

Message:

Merged branches/HTM-12.1-dev0@1083.

File:

• trunk/source/Lib/TLibEncoder/TEncSearch.h (modified) (5 diffs)

trunk/source/Lib/TLibEncoder/TEncSearch.h

@@ -181 +181 @@
                                   UInt&       ruiDistC,
                                   Bool        bLumaOnly
-#if HHI_DMM4_ENC_I0066
+#if H_3D_DIM
                                 , Bool        bOnlyIVP
 #endif
@@ -191 +191 @@
                                   TComYuv*    pcRecoYuv,
                                   UInt        uiPreCalcDistC );
-#if MTK_SINGLE_DEPTH_MODE_I0095
+#if H_3D_SINGLE_DEPTH
   Void  estIntraPredSingleDepth  ( TComDataCU* pcCU, 
                                   TComYuv*    pcOrgYuv, 
@@ -354 +354 @@
                                     UInt         uiAbsPartIdx,
                                     UInt         stateU0V1Both2 );
-#if MTK_SINGLE_DEPTH_MODE_I0095
+#if H_3D_SINGLE_DEPTH
   Void xIntraCodingSingleDepth( TComDataCU* pcCU, UInt uiAbsPartIdx, TComYuv* pcOrgYuv, TComYuv* pcPredYuv, Dist& ruiDist, Double& dRDCost, Int iTestDepthIdx, Pel * DepthNeighbor );
 #endif
@@ -429 +429 @@
 #if H_3D_VSP
                                   , Int* vspFlag
-#if !FIX_TICKET_79
-                                  , InheritedVSPDisInfo*  inheritedVSPDisInfo
-#endif
 #endif
 #if H_3D_SPIVMP
@@ -443 +440 @@
                                     TComMvField*    mvFieldNeighbours, 
                                     UChar*          interDirNeighbours, 
-#if H_3D_VSP && !FIX_TICKET_75
-                                    Int* vspFlag,
-#endif
                                     Int             numValidMergeCand );