Changeset 724 in 3DVCSoftware for trunk/source/Lib/TLibEncoder/TEncCfg.h

Timestamp:

30 Nov 2013, 12:29:49 (12 years ago)

Author:

tech

Message:

Merged HTM-8.2-dev0@723.

File:

• trunk/source/Lib/TLibEncoder/TEncCfg.h (modified) (5 diffs)

trunk/source/Lib/TLibEncoder/TEncCfg.h

@@ -403 +403 @@
   UInt      m_uiARPStepNum;
 #endif
+#if MTK_SPIVMP_F0110
+  Int      m_iSubPULog2Size;
+#endif
 #if H_3D_IC
   Bool      m_bUseIC;
@@ -412 +415 @@
 #if H_3D_DIM
   Bool      m_useDMM;
+#if !SEC_DMM3_RBC_F0147
   Bool      m_useRBC;
+#endif
   Bool      m_useSDC;
   Bool      m_useDLT;
+#endif
+#if SEC_MPI_ENABLING_MERGE_F0150
+  Bool      m_useMPI;
 #endif
 #if H_3D_QTLPC
@@ -500 +508 @@
   UInt       getARPStepNum                  ()               { return m_uiARPStepNum;    }
   Void       setARPStepNum                  ( UInt  u )      { m_uiARPStepNum = u;       }
+#endif
+#if MTK_SPIVMP_F0110
+  Int        getSubPULog2Size                   ()                   { return m_iSubPULog2Size;}
+  Void       setSubPULog2Size                   (Int u)              { m_iSubPULog2Size = u; }     
 #endif
 
@@ -980 +992 @@
   Bool      getUseDMM                       ()        { return m_useDMM; }
   Void      setUseDMM                       ( Bool b) { m_useDMM = b;    }
+#if !SEC_DMM3_RBC_F0147
   Bool      getUseRBC                       ()        { return m_useRBC; }
   Void      setUseRBC                       ( Bool b) { m_useRBC = b;    }
+#endif
   Bool      getUseSDC                       ()        { return m_useSDC; }
   Void      setUseSDC                       ( Bool b) { m_useSDC = b;    }
@@ -993 +1007 @@
   Bool      getUsePC                        ()         { return m_bUsePC;  }
 #endif
+#if SEC_MPI_ENABLING_MERGE_F0150
+  Void      setUseMPI                       ( Bool b ) { m_useMPI = b;    }
+  Bool      getUseMPI                       ()         { return m_useMPI; }
+#endif
 #endif // H_3D
 };