Changeset 1233 in 3DVCSoftware for branches/HTM-14.1-update-dev3-ETRI/source/Lib/TLibCommon/TComMotionInfo.h

Timestamp:

26 May 2015, 07:13:47 (9 years ago)

Author:

etri-htm

Message:

Reactive_MLC (the MACRO is "NH_3D_MLC")

File:

• branches/HTM-14.1-update-dev3-ETRI/source/Lib/TLibCommon/TComMotionInfo.h (modified) (7 diffs)

branches/HTM-14.1-update-dev3-ETRI/source/Lib/TLibCommon/TComMotionInfo.h

@@ -192 +192 @@
 //! \}
 
-#if H_3D_IV_MERGE
+#if NH_3D_MLC
+/// class for container of merge candidate
 class TComMotionCand
 {
@@ -202 +203 @@
   Int                   m_iVspFlag;
 #endif  
+#if H_3D_SPIVMP
   Bool                  m_bSPIVMPFlag;
+#endif
 
 public:
@@ -212 +215 @@
     m_iVspFlag = 0;
 #endif
+#if H_3D_SPIVMP
     m_bSPIVMPFlag = false;
+#endif
   }
 
@@ -229 +234 @@
     m_iVspFlag = 0;
 #endif
+#if H_3D_SPIVMP
     m_bSPIVMPFlag = false;
+#endif
     m_cMvField[0].setMvField(cZeroMv, NOT_VALID);
     m_cMvField[1].setMvField(cZeroMv, NOT_VALID);
@@ -238 +245 @@
     , Int vspFlag
 #endif
+#if H_3D_SPIVMP
     , Bool bSPIVMPFlag
+#endif
     )
   {
@@ -248 +257 @@
     m_iVspFlag = vspFlag;
 #endif
+#if H_3D_SPIVMP
     m_bSPIVMPFlag = bSPIVMPFlag;
-  }
-
-
+#endif
+  }
+  
   Void getCand(Int iCount, TComMvField* pcMvFieldNeighbours, UChar* puhInterDirNeighbours
 #if H_3D_VSP
     , Int* vspFlag
 #endif
+#if H_3D_SPIVMP
     , Bool* pbSPIVMPFlag
+#endif
     )
   {
@@ -265 +277 @@
     vspFlag[iCount] = m_iVspFlag;
 #endif
+#if H_3D_SPIVMP
     pbSPIVMPFlag[iCount] = m_bSPIVMPFlag;
+#endif
   }
 };