Changeset 779 in 3DVCSoftware for branches/HTM-9.3-dev1-Qualcomm/source/App

Timestamp:

20 Jan 2014, 04:09:40 (11 years ago)

Author:

qualcomm

Message:

integration of JCT3V-G0119 by Qualcomm

Location:

branches/HTM-9.3-dev1-Qualcomm/source/App/TAppEncoder

Files:

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

branches/HTM-9.3-dev1-Qualcomm/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -513 +513 @@
   ("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
 #if H_3D_IC
   ("IlluCompEnable",           m_abUseIC, true, "Enable illumination compensation")
@@ -1516 +1518 @@
   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.");
+  xConfirmPara( ( 1 << m_iSubPUMPILog2Size ) > m_uiMaxCUWidth,                  "SubPUMPILog2Size must be log2(maxCUSize) or smaller.");
 #endif
 #if ADAPTIVE_QP_SELECTION
@@ -2474 +2481 @@
 #endif
 #endif
+#if QC_SPIVMP_MPI_G0119
+  printf(" SubPUMPILog2Size:%d  " , m_iSubPUMPILog2Size  );
+#endif
 #if H_3D_ARP
   printf(" ARP:%d  ", m_uiUseAdvResPred  );

branches/HTM-9.3-dev1-Qualcomm/source/App/TAppEncoder/TAppEncCfg.h

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

branches/HTM-9.3-dev1-Qualcomm/source/App/TAppEncoder/TAppEncTop.cpp

@@ -184 +184 @@
 #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
 #if H_3D_IC
@@ -1911 +1914 @@
 #endif
   }  
+#if QC_SPIVMP_MPI_G0119
+  vps.setSubPUMPILog2Size( m_iSubPUMPILog2Size );
+#endif
 #if H_3D
   vps.setIvMvScalingFlag( m_ivMvScalingFlag );