Changeset 443 in 3DVCSoftware for trunk/source/Lib/TLibEncoder/TEncTop.cpp

Timestamp:

26 May 2013, 15:41:34 (11 years ago)

Author:

tech

Message:

• Reintegrated branch 6.2-dev0 rev. 442.
• Changed version number.
• Added coding results.

File:

• trunk/source/Lib/TLibEncoder/TEncTop.cpp (modified) (8 diffs)

trunk/source/Lib/TLibEncoder/TEncTop.cpp

@@ -103 +103 @@
   if (m_bUseSAO)
   {
+#if LGE_SAO_MIGRATION_D0091
+    m_cEncSAO.setSaoLcuBoundary(getSaoLcuBoundary());
+    m_cEncSAO.setSaoLcuBasedOptimization(getSaoLcuBasedOptimization());
+#else
     m_cEncSAO.setSaoInterleavingFlag(getSaoInterleavingFlag());
+#endif
     m_cEncSAO.setMaxNumOffsetsPerPic(getMaxNumOffsetsPerPic());
     m_cEncSAO.create( getSourceWidth(), getSourceHeight(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth );
@@ -120 +125 @@
   m_cDepthMapGenerator. create( false, getSourceWidth(), getSourceHeight(), g_uiMaxCUDepth, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiBitDepth + g_uiBitIncrement, PDM_SUB_SAMP_EXP_X(m_uiPredDepthMapGeneration), PDM_SUB_SAMP_EXP_Y(m_uiPredDepthMapGeneration) );
 #endif
-#if H3D_IVRP
+#if H3D_IVRP & !QC_ARP_D0177
   m_cResidualGenerator. create( false, getSourceWidth(), getSourceHeight(), g_uiMaxCUDepth, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiBitDepth + g_uiBitIncrement );
 #endif
@@ -251 +256 @@
   m_cDepthMapGenerator. destroy();
 #endif
-#if H3D_IVRP
+#if H3D_IVRP & !QC_ARP_D0177
   m_cResidualGenerator. destroy();
 #endif
@@ -347 +352 @@
 #endif
 #endif
-#if H3D_IVRP
+#if H3D_IVRP & !QC_ARP_D0177
   m_cResidualGenerator.init( &m_cTrQuant, &m_cDepthMapGenerator );
 #endif
@@ -710 +715 @@
 #endif
 
+
+#if MTK_D0156
+#if MERL_VSP_COMPENSATION_C0152
+  m_cSPS.setUseVSPCompensation           ( m_bUseVSPCompensation );
+#endif
+  m_cSPS.setUseDVPRefine                 ( m_bUseDVPRefine       );
+#endif
+
   if( m_isDepth )
   {
@@ -722 +735 @@
 #endif
 #if H3D_IVRP
+#if QC_ARP_D0177
+    m_cSPS.setUseAdvRP              ( 0 );
+    m_cSPS.setARPStepNum            ( 1 );
+#else
     m_cSPS.setMultiviewResPredMode  ( 0 );
 #endif
+#endif
+
   }
   else
@@ -742 +761 @@
 #endif
 #if H3D_IVRP
-      m_cSPS.setMultiviewResPredMode  ( m_uiMultiviewResPredMode );
+#if QC_ARP_D0177
+     m_cSPS.setUseAdvRP  ( m_viewId > 0   ? m_nUseAdvResPred : 0 );
+     m_cSPS.setARPStepNum( m_viewId > 0   ? QC_ARP_WFNR      : 1 );
+#else
+     m_cSPS.setMultiviewResPredMode  ( m_uiMultiviewResPredMode );
+#endif
 #endif
     }
@@ -751 +775 @@
 #endif
 #if H3D_IVRP
+#if QC_ARP_D0177
+      m_cSPS.setUseAdvRP              ( 0 );
+      m_cSPS.setARPStepNum            ( 1 );
+#else
       m_cSPS.setMultiviewResPredMode  ( 0 );
+#endif
 #endif
     }