Changeset 1412 in 3DVCSoftware for branches/HTM-16.2-dev/source/Lib/TLibCommon/TComPicYuv.cpp

Timestamp:

12 Apr 2018, 11:12:21 (7 years ago)

Author:

tech

Message:

• Update HM-16.18
• Cleanups
• Encoder Extension

-- Representation formats
-- Parameter set sharing
-- GOP configuration

File:

• branches/HTM-16.2-dev/source/Lib/TLibCommon/TComPicYuv.cpp (modified) (4 diffs)

branches/HTM-16.2-dev/source/Lib/TLibCommon/TComPicYuv.cpp

@@ -4 +4 @@
  * granted under this license.
  *
- * Copyright (c) 2010-2016, ITU/ISO/IEC
+ * Copyright (c) 2010-2017, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -93 +93 @@
   m_picHeight         = picHeight;
 
-#if NH_3D_IV_MERGE
+#if NH_3D
   m_iCuWidth        = maxCUWidth;
   m_iCuHeight       = maxCUHeight;
@@ -141 +141 @@
   createWithoutCUInfo(picWidth, picHeight, chromaFormatIDC, bUseMargin, maxCUWidth, maxCUHeight);
 
-#if NH_3D_IV_MERGE
+#if NH_3D
   m_iBaseUnitWidth  = maxCUWidth  >> maxCUDepth;
   m_iBaseUnitHeight = maxCUHeight >> maxCUDepth;
@@ -350 +350 @@
   fclose(pFile);
 }
-#if NH_3D_IV_MERGE
+#if NH_3D
 Void
 TComPicYuv::getTopLeftSamplePos( Int iCuAddr, Int iAbsZorderIdx, Int& riX, Int& riY )