Changeset 833 in 3DVCSoftware for trunk/source/App/TAppEncoder

Timestamp:

7 Feb 2014, 20:31:12 (11 years ago)

Author:

tech

Message:

Merged 9.3-dev0@831.

Location:

trunk/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (5 diffs)
• TAppEncCfg.h (modified) (2 diffs)
• TAppEncTop.cpp (modified) (5 diffs)

trunk/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")
@@ -519 +521 @@
 #if H_3D_INTER_SDC
   ("InterSDC",                 m_bDepthInterSDCFlag,        true, "Enable depth inter SDC")
+#endif
+#if H_3D_DBBP
+  ("DBBP",                     m_bUseDBBP,   true, "Enable depth-based block partitioning" )
 #endif
 #if H_3D_IV_MERGE
@@ -1513 +1518 @@
 #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.");
+  xConfirmPara( ( 1 << m_iSubPUMPILog2Size ) > m_uiMaxCUWidth,                  "SubPUMPILog2Size must be log2(maxCUSize) or smaller.");
 #endif
 #if ADAPTIVE_QP_SELECTION
@@ -2474 +2488 @@
 #endif
 #endif
+#if QC_SPIVMP_MPI_G0119
+  printf(" SubPUMPILog2Size:%d  " , m_iSubPUMPILog2Size  );
+#endif
 #if H_3D_ARP
   printf(" ARP:%d  ", m_uiUseAdvResPred  );
 #endif
 #if H_3D_IC
-  printf( "IlluCompEnable: %d ", m_abUseIC);
+  printf( "IlluCompEnable:%d ", m_abUseIC);
 #endif
 #if H_3D_NBDV_REF
@@ -2495 +2512 @@
 #endif
 #if H_3D_INTER_SDC
-  printf( "interSDC: %d ", m_bDepthInterSDCFlag ? 1 : 0 );
+  printf( "interSDC:%d ", m_bDepthInterSDCFlag ? 1 : 0 );
+#endif
+#if H_3D_DBBP
+  printf("DBBP:%d ", m_bUseDBBP ? 1 : 0);
 #endif
 #if H_3D_IV_MERGE
-  printf( "MPI: %d ", m_bMPIFlag ? 1 : 0 );
+  printf( "MPI:%d ", m_bMPIFlag ? 1 : 0 );
 #endif
   printf("\n\n");  

trunk/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
@@ -489 +492 @@
   Bool m_bDepthInterSDCFlag;                                ///< flag for inter SDC of depth map coding
 #endif
+#if H_3D_DBBP
+  Bool      m_bUseDBBP;                                     ///< flag for depth-based block partitioning
+#endif
 #if H_3D_IV_MERGE
   Bool m_bMPIFlag;                                           ///< flag for MPI of depth map coding

trunk/source/App/TAppEncoder/TAppEncTop.cpp

@@ -185 +185 @@
     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
     m_cTEncTop.setUseIC                        ( vps.getViewIndex( layerId ) == 0 || isDepth ? false : m_abUseIC );
@@ -201 +204 @@
 #if H_3D_INTER_SDC
     m_cTEncTop.setInterSDCEnable               ( isDepth ? m_bDepthInterSDCFlag    : false );
+#endif
+#if H_3D_DBBP
+    m_cTEncTop.setUseDBBP                      ( vps.getViewIndex( layerId ) == 0 || isDepth ? false : m_bUseDBBP );
 #endif
 #if H_3D_IV_MERGE
@@ -911 +917 @@
           }
 #endif
+
+#if MTK_DDD_G0063
+          m_acTEncTopList[ layer ]->getSliceEncoder()->setDDDPar( m_cCameraData.getCodedScale()[0][ m_acTEncTopList[layer]->getViewIndex() ], 
+              m_cCameraData.getCodedOffset()[0][ m_acTEncTopList[layer]->getViewIndex() ], 
+              m_cCameraData.getCamParsCodedPrecision() );
+#endif
         Int   iNumEncoded = 0;
 
@@ -1903 +1915 @@
 #if H_3D_VSP
     vps.setViewSynthesisPredFlag( layer, !isLayerZero && !isDepth && m_viewSynthesisPredFlag );         
-#endif      
+#endif
+#if H_3D_DBBP
+    vps.setUseDBBP              ( layer, !isLayerZero && !isDepth && m_bUseDBBP );
+#endif
 #if H_3D_INTER_SDC
     vps.setInterSDCFlag( layer, !isLayerZero && isDepth && m_bDepthInterSDCFlag );
@@ -1911 +1926 @@
 #endif
   }  
+#if QC_SPIVMP_MPI_G0119
+  vps.setSubPUMPILog2Size( m_iSubPUMPILog2Size );
+#endif
 #if H_3D
   vps.setIvMvScalingFlag( m_ivMvScalingFlag );