Changeset 876 in 3DVCSoftware for branches/HTM-10.1-dev0/source/App/TAppEncoder

Timestamp:

27 Mar 2014, 18:52:26 (11 years ago)

Author:

tech

Message:

Cleanups part 1.

Location:

branches/HTM-10.1-dev0/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (3 diffs)
• TAppEncCfg.h (modified) (1 diff)
• TAppEncTop.cpp (modified) (2 diffs)

branches/HTM-10.1-dev0/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -521 +521 @@
 #if H_3D_SPIVMP
   ("SubPULog2Size", m_iSubPULog2Size, (Int)3, "Sub-PU size index: 2^n")
-#endif
-#if QC_SPIVMP_MPI_G0119
   ("SubPUMPILog2Size", m_iSubPUMPILog2Size, (Int)3, "Sub-PU MPI size index: 2^n")
 #endif
@@ -1552 +1550 @@
 #endif
 #if H_3D_SPIVMP
-#if SEC_SPIVMP_MCP_SIZE_G0077
   xConfirmPara( m_iSubPULog2Size < 3,                                        "SubPULog2Size must be 3 or greater.");
-#else
-  xConfirmPara( m_iSubPULog2Size < 2,                                        "SubPULog2Size must be 2 or greater.");
-#endif
   xConfirmPara( m_iSubPULog2Size > 6,                                        "SubPULog2Size must be 6 or smaller.");
   xConfirmPara( (1<<m_iSubPULog2Size) > m_uiMaxCUWidth,                      "SubPULog2Size must be log2(maxCUSize) or smaller.");
-#endif
-#if QC_SPIVMP_MPI_G0119
+ 
   xConfirmPara( m_iSubPUMPILog2Size < 3,                                        "SubPUMPILog2Size must be 3 or greater.");
   xConfirmPara( m_iSubPUMPILog2Size > 6,                                        "SubPUMPILog2Size must be 6 or smaller.");
@@ -2499 +2492 @@
 #if H_3D_SPIVMP
   printf(" SubPULog2Size:%d  " , m_iSubPULog2Size  );
-#endif
-#endif
-#if QC_SPIVMP_MPI_G0119
   printf(" SubPUMPILog2Size:%d  " , m_iSubPUMPILog2Size  );
+#endif
 #endif
 #if H_3D_ARP

branches/HTM-10.1-dev0/source/App/TAppEncoder/TAppEncCfg.h

@@ -141 +141 @@
 #if H_3D_SPIVMP
   Int                    m_iSubPULog2Size;                    
-#endif
-#endif
-#if QC_SPIVMP_MPI_G0119
   Int                    m_iSubPUMPILog2Size;                    
+#endif
 #endif
 #if H_3D_ARP                                                  /// < flag and number of weighting factors in ARP

branches/HTM-10.1-dev0/source/App/TAppEncoder/TAppEncTop.cpp

@@ -187 +187 @@
 #if H_3D_SPIVMP
     m_cTEncTop.setSubPULog2Size                 (( isDepth || 0==layerIdInVps ) ? 0 : m_iSubPULog2Size   );
-#endif
-#if QC_SPIVMP_MPI_G0119
     m_cTEncTop.setSubPUMPILog2Size              ( !isDepth ? 0 : m_iSubPUMPILog2Size   );
 #endif
@@ -1970 +1968 @@
 #endif
   }  
-#if QC_SPIVMP_MPI_G0119
+#if H_3D_SPIVMP
   vps.setSubPUMPILog2Size( m_iSubPUMPILog2Size );
 #endif