Changeset 466 in SHVCSoftware for branches/SHM-4.0-dev/source/Lib/TLibCommon/TComPicYuv.cpp

Timestamp:

13 Nov 2013, 23:25:47 (11 years ago)

Author:

nokia

Message:

Integration of O0194: Support different bit-depth values for different layers, enable weighted prediction for ILR for color gamut scalability.

File:

• branches/SHM-4.0-dev/source/Lib/TLibCommon/TComPicYuv.cpp (modified) (1 diff)

branches/SHM-4.0-dev/source/Lib/TLibCommon/TComPicYuv.cpp

@@ -90 +90 @@
   Int numCuInHeight = m_iPicHeight / m_iCuHeight + (m_iPicHeight % m_iCuHeight != 0);
   
-#if LAYER_CTB
-  m_iLumaMarginX    = uiMaxCUWidth  + 16; // for 16-byte alignment
-  m_iLumaMarginY    = uiMaxCUHeight + 16;  // margin for 8-tap filter and infinite padding
-#else
   m_iLumaMarginX    = g_uiMaxCUWidth  + 16; // for 16-byte alignment
   m_iLumaMarginY    = g_uiMaxCUHeight + 16;  // margin for 8-tap filter and infinite padding
-#endif
   
   m_iChromaMarginX  = m_iLumaMarginX>>1;