Changeset 1304 in 3DVCSoftware for branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TComRdCost.h

Timestamp:

29 Jul 2015, 12:04:32 (10 years ago)

Author:

tech

Message:

Merged 14.1-update-dev1-LG@1303.

Location:

branches/HTM-14.1-update-dev1

Files:

• . (modified) (1 prop)
• source/Lib/TLibCommon/TComRdCost.h (modified) (5 diffs)

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

@@ -94 +94 @@
   Bool  bUseIC;
 #endif
-#if H_3D_INTER_SDC
+#if NH_3D_SDC_INTER
   Bool  bUseSDCMRSAD;
 #endif
@@ -129 +129 @@
     iStrideVir = 0;
 #endif
-#if H_3D_INTER_SDC
+#if NH_3D_SDC_INTER
     bUseSDCMRSAD = false;
 #endif
@@ -256 +256 @@
   static Distortion xGetSSE64         ( DistParam* pcDtParam );
   static Distortion xGetSSE16N        ( DistParam* pcDtParam );
-#if NH_3D_IC || H_3D_INTER_SDC
+#if NH_3D_IC || NH_3D_SDC_INTER
   static UInt xGetSADic         ( DistParam* pcDtParam );
   static UInt xGetSAD4ic        ( DistParam* pcDtParam );
@@ -283 +283 @@
 #endif
 
-#if NH_3D_IC || H_3D_INTER_SDC
+#if NH_3D_IC || NH_3D_SDC_INTER
   static UInt xGetSAD12ic       ( DistParam* pcDtParam );
   static UInt xGetSAD24ic       ( DistParam* pcDtParam );
@@ -294 +294 @@
 
 
-#if NH_3D_IC || H_3D_INTER_SDC
+#if NH_3D_IC || NH_3D_SDC_INTER
   static UInt xGetHADsic          ( DistParam* pcDtParam );
 #endif