Changeset 1225 in 3DVCSoftware for branches/HTM-14.1-update-dev2-Sharp/source/Lib/TLibCommon/TComDataCU.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/TComDataCU.h (modified) (3 diffs)

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

@@ -179 +179 @@
   UChar*        m_puhARPW;
 #endif
-#if H_3D_IC
+#if NH_3D_IC
   Bool*         m_pbICFlag;           ///< array of IC flags
 #endif
@@ -536 +536 @@
   Double        getARPWFactor      ( UInt uiIdx );
 #endif
-#if H_3D_IC
+#if NH_3D_IC
   Bool*         getICFlag          ()                        { return m_pbICFlag;               }
   Bool          getICFlag          ( UInt uiIdx )            { return m_pbICFlag[uiIdx];        }
@@ -705 +705 @@
   Bool          isBipredRestriction( UInt puIdx );
 
-#if H_3D_IC
-  Bool          isIC      ( UInt uiPartIdx );
-#endif
-
   // -------------------------------------------------------------------------------------------------------------------
   // member functions for symbol prediction (most probable / mode conversion)