Changeset 478 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon

Timestamp:

18 Jun 2013, 17:25:49 (12 years ago)

Author:

tech

Message:

Minor clean ups.

Location:

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon

Files:

• CommonDef.h (modified) (3 diffs)
• TComDataCU.cpp (modified) (4 diffs)
• TComDataCU.h (modified) (1 diff)
• TComDepthMapGenerator.cpp (modified) (2 diffs)
• TComDepthMapGenerator.h (modified) (2 diffs)
• TComMotionInfo.h (modified) (1 diff)
• TComPicYuv.cpp (modified) (1 diff)
• TComSlice.cpp (modified) (4 diffs)
• TComSlice.h (modified) (1 diff)

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/CommonDef.h

@@ -211 +211 @@
 }
 #endif
-
 template <typename T>
 __inline T gSign(const T& t)
@@ -362 +361 @@
 
 #if H_3D_IV_MERGE
+ // GT: To be checked if all of this is still necessary. 
 #define PDM_USE_FOR_IVIEW                 1
 #define PDM_USE_FOR_INTER                 2
@@ -381 +381 @@
 
 #endif
-
 #endif // end of H_3D
 //! \}

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDataCU.cpp

@@ -2457 +2457 @@
   deriveLeftRightTopIdxGeneral( uiAbsPartIdx, uiPUIdx, uiPartIdxLT, uiPartIdxRT );
   deriveLeftBottomIdxGeneral  ( uiAbsPartIdx, uiPUIdx, uiPartIdxLB );
-
 #if H_3D_IV_MERGE
   Bool bNoPdmMerge   = ( m_pcSlice->getSPS()->getViewIndex() == 0 || ( m_pcSlice->getSPS()->getMultiviewMvPredMode() & PDM_USE_FOR_MERGE ) != PDM_USE_FOR_MERGE );
@@ -2603 +2602 @@
 #endif
 #endif
-
   //left
   UInt uiLeftPartIdx = 0;
@@ -2623 +2621 @@
       pcCULeft->getMvField( pcCULeft, uiLeftPartIdx, REF_PIC_LIST_1, pcMvFieldNeighbours[(iCount<<1)+1] );
     }
-
 #if H_3D_IV_MERGE 
     Bool bRemoveSpa = false; //pruning to inter-view candidates
@@ -4502 +4499 @@
 }
 #endif 
-
 #if H_3D_IV_MERGE
 Bool TComDataCU::getUnifiedMvPredCan(UInt uiPartIdx, RefPicList eRefPicList, Int iRefIdx, Int* paiPdmRefIdx, TComMv* pacPdmMv, DisInfo* pDInfo, Int* iPdm, Bool bMerge )

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDataCU.h

@@ -434 +434 @@
    
 #endif
-
 #if H_3D_IV_MERGE
   Bool          getUnifiedMvPredCan       ( UInt uiPartIdx, RefPicList eRefPicList, Int iRefIdx, Int* paiPdmRefIdx, TComMv* pacPdmMv, DisInfo* pDInfo, Int* iPdm, Bool bMerge );

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDepthMapGenerator.cpp

@@ -43 +43 @@
 #include "TComDepthMapGenerator.h"
 
-
+#if H_3D_IV_MERGE
 
 TComDepthMapGenerator::TComDepthMapGenerator()
@@ -136 +136 @@
 }
 
-
-#if H_3D_IV_MERGE
 Bool
 TComDepthMapGenerator::getPdmCandidate(TComDataCU* pcCU, UInt uiPartIdx, RefPicList eRefPicList, Int iRefIdx, Int* paiPdmRefIdx, TComMv* pacPdmMv, DisInfo* pDInfo, Int* iPdm, Bool bMerge )

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDepthMapGenerator.h

@@ -48 +48 @@
 #include "TComSlice.h"
 
-
+#if H_3D_IV_MERGE
 
 class TComVPSAccess // would be better to have a real VPS buffer
@@ -156 +156 @@
 
 
-
+#endif
 #endif // __TCOM_DEPTH_MAP_GENERATOR__
 

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComMotionInfo.h

@@ -105 +105 @@
   Int getHor   () const { return  m_acMv.getHor(); }
   Int getVer   () const { return  m_acMv.getVer(); }
-
 #if H_3D_IV_MERGE
   Bool operator== ( const TComMvField& rcMv ) const

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComPicYuv.cpp

@@ -84 +84 @@
   m_iBaseUnitHeight = uiMaxCUHeight >> uiMaxCUDepth;
 #endif
-
   Int numCuInWidth  = m_iPicWidth  / m_iCuWidth  + (m_iPicWidth  % m_iCuWidth  != 0);
   Int numCuInHeight = m_iPicHeight / m_iCuHeight + (m_iPicHeight % m_iCuHeight != 0);

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.cpp

@@ -1857 +1857 @@
   }
 }
-
 #if H_3D_IV_MERGE
 Void
@@ -1871 +1870 @@
 }
 #endif
-
 const Int TComSPS::m_winUnitX[]={1,2,2,1};
 const Int TComSPS::m_winUnitY[]={1,2,1,1};
@@ -1942 +1940 @@
   m_bDepth                = false;
 #endif
-
   if( !m_bCamParInSliceHeader )
   {
@@ -1954 +1951 @@
   }
 }
-
 #if H_3D_IV_MERGE
 Void

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.h

@@ -54 +54 @@
 class TComPicLists; 
 #endif
-
 #if H_3D_IV_MERGE
 class TComDepthMapGenerator;