Changeset 1225 in 3DVCSoftware for branches/HTM-14.1-update-dev2-Sharp/source/Lib/TLibCommon/TComRdCost.h

Timestamp:

22 May 2015, 05:38:04 (9 years ago)

Author:

sharpjp-htm

Message:

Migration of illumination compensation(NH_3D_IC) and small fix(H_MV_ENC_DEC_TRAC_FIX)

File:

• branches/HTM-14.1-update-dev2-Sharp/source/Lib/TLibCommon/TComRdCost.h (modified) (4 diffs)

branches/HTM-14.1-update-dev2-Sharp/source/Lib/TLibCommon/TComRdCost.h

@@ -91 +91 @@
   Int   iStrideVir;
 #endif
-#if H_3D_IC
+#if NH_3D_IC
   Bool  bUseIC;
 #endif
@@ -256 +256 @@
   static Distortion xGetSSE64         ( DistParam* pcDtParam );
   static Distortion xGetSSE16N        ( DistParam* pcDtParam );
-#if H_3D_IC || H_3D_INTER_SDC
+#if NH_3D_IC || H_3D_INTER_SDC
   static UInt xGetSADic         ( DistParam* pcDtParam );
   static UInt xGetSAD4ic        ( DistParam* pcDtParam );
@@ -283 +283 @@
 #endif
 
-#if H_3D_IC || H_3D_INTER_SDC
+#if NH_3D_IC || H_3D_INTER_SDC
   static UInt xGetSAD12ic       ( DistParam* pcDtParam );
   static UInt xGetSAD24ic       ( DistParam* pcDtParam );
@@ -294 +294 @@
 
 
-#if H_3D_IC || H_3D_INTER_SDC
+#if NH_3D_IC || H_3D_INTER_SDC
   static UInt xGetHADsic          ( DistParam* pcDtParam );
 #endif