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

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/TComMotionInfo.h (modified) (11 diffs)

branches/HTM-16.2-dev/source/Lib/TLibCommon/TComMotionInfo.h

@@ -4 +4 @@
  * granted under this license.  
  *
-* Copyright (c) 2010-2016, ITU/ISO/IEC
+ * Copyright (c) 2010-2017, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -51 +51 @@
 // ====================================================================================================================
 
-#if NH_3D_SPIVMP
+#if NH_3D
 class TComDataCU;
 #endif
@@ -59 +59 @@
   TComMv m_acMvCand[ AMVP_MAX_NUM_CANDS ];  ///< array of motion vector predictor candidates
   Int    iN;                                ///< number of motion vector predictor candidates
+#if MCTS_ENC_CHECK
+  UInt   numSpatialMVPCandidates;
+#endif
 } AMVPInfo;
 
-#if NH_3D_NBDV
+#if NH_3D
 typedef struct _DisCand 
 {
   TComMv m_acNBDV;              // DV from NBDV
-#if NH_3D_NBDV_REF 
   TComMv m_acDoNBDV;            // DV from DoNBDV
-#endif  
   Int    m_aVIdxCan;            // View order index (the same with the NBDV and the DoNBDV)
 } DisInfo;
@@ -108 +109 @@
   Int getHor   () const { return  m_acMv.getHor(); }
   Int getVer   () const { return  m_acMv.getVer(); }
-#if NH_3D_IV_MERGE
+#if NH_3D
   Bool operator== ( const TComMvField& rcMv ) const
   {
@@ -168 +169 @@
   Void    setAllRefIdx ( Int iRefIdx,                 PartSize eMbMode, Int iPartAddr, UInt uiDepth, Int iPartIdx=0 );
   Void    setAllMvField( TComMvField const & mvField, PartSize eMbMode, Int iPartAddr, UInt uiDepth, Int iPartIdx=0 );
-#if NH_3D_SPIVMP
+#if NH_3D
   Void    setMvFieldSP ( TComDataCU* pcCU, UInt uiAbsPartIdx, TComMvField cMvField, Int iWidth, Int iHeight  );
-#endif
-#if NH_3D_VSP
   Void    setMv         ( Int iIdx, TComMv const & rcMv ) { m_pcMv[iIdx] = rcMv; }
   Void    setRefIdx     ( Int iIdx, Int iRefIdx )         { m_piRefIdx[iIdx] = iRefIdx; }
@@ -188 +187 @@
   }
   
+#if REDUCED_ENCODER_MEMORY
+  Void compress(SChar *pePredMode, const SChar* pePredModeSource, const Int scale, const TComCUMvField &source);
+#else
   Void compress(SChar* pePredMode, Int scale);
+#endif
 #if NH_MV
   Void print   (SChar* pePredMode);
@@ -196 +199 @@
 //! \}
 
-#if NH_3D_MLC
+#if NH_3D
 /// class for container of merge candidate
 class TComMotionCand
@@ -204 +207 @@
   TComMvField           m_cMvField[2];
   UChar                 m_uDir;
-#if NH_3D_VSP
   Int                   m_iVspFlag;
-#endif
-#if NH_3D_SPIVMP
   Bool                  m_bSPIVMPFlag;
-#endif
 
 public:
@@ -216 +215 @@
     m_bAvailable = false;
     m_uDir = 0;
-#if NH_3D_VSP
     m_iVspFlag = 0;
-#endif
-#if NH_3D_SPIVMP
     m_bSPIVMPFlag = false;
-#endif
   }
 
@@ -235 +230 @@
     m_bAvailable = false;
     m_uDir = 0;
-#if NH_3D_VSP
     m_iVspFlag = 0;
-#endif
-#if NH_3D_SPIVMP
     m_bSPIVMPFlag = false;
-#endif
     m_cMvField[0].setMvField(cZeroMv, NOT_VALID);
     m_cMvField[1].setMvField(cZeroMv, NOT_VALID);
   }
 
-  Void setCand(TComMvField* pcMvFieldNeighbours, UChar uhInterDirNeighbours
-#if NH_3D_VSP
-    , Int vspFlag
-#endif
-#if NH_3D_SPIVMP
-    , Bool bSPIVMPFlag
-#endif
-    )
+  Void setCand(TComMvField* pcMvFieldNeighbours, UChar uhInterDirNeighbours, Int vspFlag, Bool bSPIVMPFlag )
   {
     m_bAvailable = true;
@@ -258 +242 @@
     m_cMvField[1] = pcMvFieldNeighbours[1];
     m_uDir = uhInterDirNeighbours;
-#if NH_3D_VSP
     m_iVspFlag = vspFlag;
-#endif
-#if NH_3D_SPIVMP
     m_bSPIVMPFlag = bSPIVMPFlag;
-#endif
-  }
-  
-  Void getCand(Int iCount, TComMvField* pcMvFieldNeighbours, UChar* puhInterDirNeighbours
-#if NH_3D_VSP
-    , Int* vspFlag
-#endif
-#if NH_3D_SPIVMP
-    , Bool* pbSPIVMPFlag
-#endif
-    )
+  }
+  
+  Void getCand(Int iCount, TComMvField* pcMvFieldNeighbours, UChar* puhInterDirNeighbours, Int* vspFlag , Bool* pbSPIVMPFlag )
   {
     pcMvFieldNeighbours[iCount<<1] = m_cMvField[0];
     pcMvFieldNeighbours[(iCount<<1) + 1] = m_cMvField[1];
     puhInterDirNeighbours[iCount] = m_uDir;
-#if NH_3D_VSP
     vspFlag[iCount] = m_iVspFlag;
-#endif
-#if NH_3D_SPIVMP
     pbSPIVMPFlag[iCount] = m_bSPIVMPFlag;
-#endif
-  }
-
-
+  }
   Void print( Int i );
-
 };