Changeset 1274 in 3DVCSoftware for branches/HTM-14.1-update-dev2/source/Lib/TLibCommon/TComPicYuv.h

Timestamp:

14 Jul 2015, 12:31:09 (9 years ago)

Author:

tech

Message:

Merged HTM-14.1-update-dev3@1273.

File:

• branches/HTM-14.1-update-dev2/source/Lib/TLibCommon/TComPicYuv.h (modified) (2 diffs)

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

@@ -80 +80 @@
 
   Bool  m_bIsBorderExtended;
-#if H_3D_IV_MERGE
+#if NH_3D_IV_MERGE
   Int   m_iBaseUnitWidth;       ///< Width of Base Unit (with maximum depth or minimum size, m_iCuWidth >> Max. Depth)
   Int   m_iBaseUnitHeight;      ///< Height of Base Unit (with maximum depth or minimum size, m_iCuHeight >> Max. Depth)
   Int   m_iNumCuInWidth;
+  Int   m_iCuWidth;             ///< Width of Coding Unit (CU)
+  Int   m_iCuHeight;            ///< Height of Coding Unit (CU)
 #endif
 
@@ -168 +170 @@
   Void  setLumaTo    ( Pel pVal );  
   Void  setChromaTo  ( Pel pVal );  
-#if H_3D_IV_MERGE
+#if NH_3D_IV_MERGE
   // sample to block and block to sample conversion
   Void  getTopLeftSamplePos( Int iCuAddr, Int iAbsZorderIdx, Int& riX, Int& riY );