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

Timestamp:

7 Feb 2014, 20:31:12 (11 years ago)

Author:

tech

Message:

Merged 9.3-dev0@831.

File:

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

trunk/source/Lib/TLibEncoder/TEncSearch.h

@@ -219 +219 @@
     TComYuv* pcResi, 
     TComYuv* pcRec, 
+#if SEC_INTER_SDC_G0101
+    Int      uiOffset,
+#endif
     const UInt uiDepth );
 #endif
@@ -353 +356 @@
 #endif
 #if H_3D_DIM_SDC
-  Void xIntraCodingSDC            ( TComDataCU* pcCU, UInt uiAbsPartIdx, TComYuv* pcOrgYuv, TComYuv* pcPredYuv, Dist& ruiDist, Double& dRDCost, Bool bResidual );
+  Void xIntraCodingSDC            ( TComDataCU* pcCU, UInt uiAbsPartIdx, TComYuv* pcOrgYuv, TComYuv* pcPredYuv, Dist& ruiDist, Double& dRDCost, 
+#if QC_GENERIC_SDC_G0122
+    Bool bZeroResidual, Int iSDCDeltaResi
+#else
+    Bool bResidual
+#endif
+    );
 #endif
 #endif