Changeset 100 in 3DVCSoftware for trunk/source/App/TAppEncoder/TAppEncTop.cpp

Timestamp:

9 Aug 2012, 12:53:16 (13 years ago)

Author:

tech

Message:

Adopted modifications:

• disparity vector generation (A0097)
• inter-view motion prediction modification (A0049)
• simplification of disparity vector derivation (A0126)
• region boundary chain coding (A0070)
• residual skip intra (A0087)
• VSO modification (A0033/A0093)

+ Clean ups + Bug fixes

Update of cfg files (A0033 modification 2)

File:

• trunk/source/App/TAppEncoder/TAppEncTop.cpp (modified) (5 diffs)

trunk/source/App/TAppEncoder/TAppEncTop.cpp

@@ -203 +203 @@
     m_acTEncTopList[iViewIdx]->setLambdaScaleVSO               ( 1     );
     m_acTEncTopList[iViewIdx]->setVSOMode                      ( 0     );
-    m_acTEncTopList[iViewIdx]->setUseVSO                       ( false ); //GT: might be enabled later for VSO Mode 4
+    m_acTEncTopList[iViewIdx]->setUseVSO                       ( false ); 
+#if SAIT_VSO_EST_A0033
+    m_acTEncTopList[iViewIdx]->setUseEstimatedVSD              ( false );
+#endif
 #endif
 
@@ -517 +520 @@
 #endif
       m_acTEncDepthTopList[iViewIdx]->setVSOMode                      ( m_uiVSOMode );
+
+#if SAIT_VSO_EST_A0033
+      m_acTEncDepthTopList[iViewIdx]->setUseEstimatedVSD              ( m_bUseEstimatedVSD );
+#endif
 #endif
 
@@ -648 +655 @@
     if ( m_uiVSOMode == 4 )
     {
+#if HHI_VSO_SPEEDUP_A033
+#if LGE_VSO_EARLY_SKIP_A0093
+      m_cRendererModel.create( m_cRenModStrParser.getNumOfBaseViews(), m_cRenModStrParser.getNumOfModels(), m_iSourceWidth, g_uiMaxCUHeight , LOG2_DISP_PREC_LUT, 0, m_bVSOEarlySkip );
+#else
+      m_cRendererModel.create( m_cRenModStrParser.getNumOfBaseViews(), m_cRenModStrParser.getNumOfModels(), m_iSourceWidth, g_uiMaxCUHeight , LOG2_DISP_PREC_LUT, 0 );
+#endif
+#else
       m_cRendererModel.create( m_cRenModStrParser.getNumOfBaseViews(), m_cRenModStrParser.getNumOfModels(), m_iSourceWidth, m_iSourceHeight, LOG2_DISP_PREC_LUT, 0 );
+#endif
 
       for ( Int iViewNum = 0; iViewNum < m_iNumberOfViews; iViewNum++ )
@@ -1141 +1156 @@
 };
 
+#if SAIT_VSO_EST_A0033
+TComPicYuv* TAppEncTop::xGetPicYuvFromViewTemp( Int iViewIdx, Int iPoc, Bool bDepth, Bool bRecon )
+{
+  TComPic*    pcPic = xGetPicFromView( iViewIdx, iPoc, bDepth);
+  TComPicYuv* pcPicYuv = NULL;
+
+  if (pcPic != NULL)
+  {
+    if( bRecon )
+    {
+      if ( pcPic->getReconMark() )
+      {
+        pcPicYuv = pcPic->getPicYuvRec();
+      }
+    }
+    else
+    {
+      pcPicYuv = pcPic->getPicYuvOrg();
+    }
+  };
+
+  return pcPicYuv;
+};
+#endif
+
 /**
  *
@@ -1209 +1249 @@
 #endif
 #if HHI_VSO
+#if HHI_VSO_SPEEDUP_A033
+Void TAppEncTop::setupRenModel( Int iPoc, Int iEncViewIdx, Int iEncContent, Int iHorOffset )
+{
+  m_cRendererModel.setHorOffset( iHorOffset ); 
+#else
 Void TAppEncTop::setupRenModel( Int iPoc, Int iEncViewIdx, Int iEncContent )
 {
+#endif
   Int iEncViewSIdx = m_cCameraData.getBaseId2SortedId()[ iEncViewIdx ];