Changeset 1390 in 3DVCSoftware for branches/HTM-16.0-MV-draft-5/source/Lib/TLibCommon/TComPicYuv.cpp

Timestamp:

13 Nov 2015, 17:00:20 (9 years ago)

Author:

tech

Message:

Removed 3D.

File:

• branches/HTM-16.0-MV-draft-5/source/Lib/TLibCommon/TComPicYuv.cpp (modified) (3 diffs)

branches/HTM-16.0-MV-draft-5/source/Lib/TLibCommon/TComPicYuv.cpp ¶

@@ -90 +90 @@
   m_picHeight         = picHeight;
 
-#if NH_3D_IV_MERGE
-  m_iCuWidth        = maxCUWidth;
-  m_iCuHeight       = maxCUHeight;
-
-  m_iNumCuInWidth   = picWidth / m_iCuWidth;
-  m_iNumCuInWidth  += ( picHeight % m_iCuWidth ) ? 1 : 0;
-  // Check if m_iBaseUnitWidth and m_iBaseUnitHeight need to be derived here
-#endif
 
   m_chromaFormatIDC   = chromaFormatIDC;
@@ -138 +130 @@
   createWithoutCUInfo(picWidth, picHeight, chromaFormatIDC, bUseMargin, maxCUWidth, maxCUHeight);
 
-#if NH_3D_IV_MERGE
-  m_iBaseUnitWidth  = maxCUWidth  >> maxCUDepth;
-  m_iBaseUnitHeight = maxCUHeight >> maxCUDepth;
-#endif
 
 
@@ -347 +335 @@
   fclose(pFile);
 }
-#if NH_3D_IV_MERGE
-Void
-TComPicYuv::getTopLeftSamplePos( Int iCuAddr, Int iAbsZorderIdx, Int& riX, Int& riY )
-{
-  Int iRastPartIdx    = g_auiZscanToRaster[iAbsZorderIdx];
-  Int iCuSizeInBases  = m_iCuWidth   / m_iBaseUnitWidth;
-  Int iCuX            = iCuAddr      % m_iNumCuInWidth;
-  Int iCuY            = iCuAddr      / m_iNumCuInWidth;
-  Int iBaseX          = iRastPartIdx % iCuSizeInBases;
-  Int iBaseY          = iRastPartIdx / iCuSizeInBases;
-  riX                 = iCuX * m_iCuWidth  + iBaseX * m_iBaseUnitWidth;
-  riY                 = iCuY * m_iCuHeight + iBaseY * m_iBaseUnitHeight; 
-}
-
-Void
-TComPicYuv::getCUAddrAndPartIdx( Int iX, Int iY, Int& riCuAddr, Int& riAbsZorderIdx )
-{
-  Int iCuX            = iX / m_iCuWidth;
-  Int iCuY            = iY / m_iCuHeight;
-  Int iBaseX          = ( iX - iCuX * m_iCuWidth  ) / m_iBaseUnitWidth;
-  Int iBaseY          = ( iY - iCuY * m_iCuHeight ) / m_iBaseUnitHeight;
-  Int iCuSizeInBases  = m_iCuWidth                  / m_iBaseUnitWidth;
-  riCuAddr            = iCuY   * m_iNumCuInWidth + iCuX;
-  Int iRastPartIdx    = iBaseY * iCuSizeInBases  + iBaseX;
-  riAbsZorderIdx      = g_auiRasterToZscan[ iRastPartIdx ];
-}
-
-#endif
-
-#if NH_3D_VSO
-Void TComPicYuv::setChromaTo( Pel pVal )
-{
-  xSetPels( getAddr( COMPONENT_Cb ), getStride( COMPONENT_Cb ), getWidth( COMPONENT_Cb), getHeight( COMPONENT_Cb ), pVal ); 
-  xSetPels( getAddr( COMPONENT_Cr ), getStride( COMPONENT_Cr ), getWidth( COMPONENT_Cr), getHeight( COMPONENT_Cr ), pVal );
-}
-
-Void TComPicYuv::xSetPels( Pel* piPelSource , Int iSourceStride, Int iWidth, Int iHeight, Pel iVal )
-{
-  for (Int iYPos = 0; iYPos < iHeight; iYPos++)
-  {
-    for (Int iXPos = 0; iXPos < iWidth; iXPos++)
-    {
-      piPelSource[iXPos] = iVal; 
-    }
-    piPelSource += iSourceStride; 
-  }
-}
-#endif
+
 //! \}