Changeset 1094 in 3DVCSoftware for branches/HTM-12.2-dev2-LGE/source/Lib/TLibEncoder/TEncSlice.h

Timestamp:

3 Nov 2014, 01:32:52 (10 years ago)

Author:

lg

Message:

Integration of JCT3V-J0042. The MACRO is "LGE_DDD_REMOVAL_J0042_J0030."
Integration of JCT3V-J0046. The MACRO is "LGE_DEFAULT_DV_J0046."
Integration of JCT3V-J0050. The MACRO is "LGE_CHROMA_IC_J0050_J0034."
Integration of JCT3V-J0041. The MACRO is "LGE_SIMP_DISP_AVAIL_J0041."

By Sunmi Yoo (sunmi.yoo@…) and Junghak Nam (junghak.nam@…)

File:

• branches/HTM-12.2-dev2-LGE/source/Lib/TLibEncoder/TEncSlice.h (modified) (2 diffs)

branches/HTM-12.2-dev2-LGE/source/Lib/TLibEncoder/TEncSlice.h

@@ -107 +107 @@
   UInt                    m_uiSliceIdx;
   std::vector<TEncSbac*> CTXMem;
+#if !LGE_DDD_REMOVAL_J0042_J0030
 #if H_3D_DDD
   Int          m_iDDDScale;
   Int          m_iDDDOffset;
   UInt         m_uiDDDPrecision;
+#endif
 #endif
 public:
@@ -145 +147 @@
   Void      initCtxMem( UInt i );
   Void      setCtxMem( TEncSbac* sb, Int b )   { CTXMem[b] = sb; }
-
+#if !LGE_DDD_REMOVAL_J0042_J0030
 #if H_3D_DDD
   Void setDDDPar( Int iScale, Int iOffset, UInt uiPrecision ){ m_iDDDScale = iScale; m_iDDDOffset = iOffset; m_uiDDDPrecision = uiPrecision; }
+#endif
 #endif