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

branches/HTM-14.1-update-dev2-Sharp/source/Lib/TLibEncoder/TEncTop.h

@@ -81 +81 @@
   TComPicLists*           m_ivPicLists;                   ///< access to picture lists of other layers 
 #endif
-#if H_3D_IC
+#if NH_3D_IC
   Int *m_aICEnableCandidate;
   Int *m_aICEnableNum;
@@ -158 +158 @@
   TComPicLists* getIvPicLists() { return m_ivPicLists; }
 #endif
-#if H_3D_IC
+#if NH_3D_IC
   Int*      getICEnableCandidate() { return m_aICEnableCandidate; }
   Int*      getICEnableNum() { return m_aICEnableNum; }
@@ -208 +208 @@
   Void                    setSps3dExtension     ( TComSps3dExtension sps3dExtension ) { m_cSPS.setSps3dExtension( sps3dExtension );  };
 #endif
-#if H_3D_IC
+#if NH_3D_IC
   Void                    setICEnableCandidate         ( Int* ICEnableCandidate) { m_aICEnableCandidate = ICEnableCandidate; }
   Void                    setICEnableNum         ( Int* ICEnableNum) { m_aICEnableNum = ICEnableNum; }