Changeset 100 in 3DVCSoftware for trunk/source/Lib/TLibEncoder/TEncGOP.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/Lib/TLibEncoder/TEncGOP.cpp (modified) (7 diffs)

trunk/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -436 +436 @@
   Bool bUseVSO = m_pcEncTop->getUseVSO();
   m_pcRdCost->setUseVSO( bUseVSO );
+#if SAIT_VSO_EST_A0033
+  m_pcRdCost->setUseEstimatedVSD( m_pcEncTop->getUseEstimatedVSD() );
+#endif
 
   if ( bUseVSO )
@@ -445 +448 @@
 #endif
 
+#if HHI_VSO_SPEEDUP_A033
+#else
     if ( iVSOMode == 4 )
     {
@@ -453 +458 @@
       AOT(true); 
     }
+#endif
+
+#if SAIT_VSO_EST_A0033
+    m_pcRdCost->setVideoRecPicYuv( m_pcEncTop->getEncTop()->xGetPicYuvFromViewTemp( pcSlice->getViewId(), pcSlice->getPOC(), false, true ) );
+    m_pcRdCost->setDepthPicYuv   ( m_pcEncTop->getEncTop()->xGetPicYuvFromViewTemp( pcSlice->getViewId(), pcSlice->getPOC(), true, false ) );
+#endif
+
+
   }
 #endif
@@ -691 +704 @@
       // init view component and predict virtual depth map
       m_pcDepthMapGenerator->initViewComponent( pcPic );
+#if !QC_MULTI_DIS_CAN
       m_pcDepthMapGenerator->predictDepthMap  ( pcPic );
+#endif
 #endif
 #if HHI_INTER_VIEW_MOTION_PRED
@@ -758 +773 @@
 #endif
 #if DEPTH_MAP_GENERATION
+#if !QC_MULTI_DIS_CAN
       // update virtual depth map
       m_pcDepthMapGenerator->updateDepthMap( pcPic );
+#endif
 #endif
 
@@ -2475 +2492 @@
     if( hasModification )
     {
-            Int temporalRefIdx = 0;
-            for( Int i = 0; i < pcSlice->getNumRefIdx( REF_PIC_LIST_0 ); i++ )
-            {
-              if( tempListEntryL0[i] >= 0 ) 
-              {
-                refPicListModification->setRefPicSetIdxL0( i, tempListEntryL0[i] );
-              }
-              else
-              {
-                refPicListModification->setRefPicSetIdxL0( i, temporalRefIdx );
-                temporalRefIdx++;
-              }
-            }
-          }
+      Int temporalRefIdx = 0;
+      for( Int i = 0; i < pcSlice->getNumRefIdx( REF_PIC_LIST_0 ); i++ )
+      {
+        if( tempListEntryL0[i] >= 0 ) 
+        {
+          refPicListModification->setRefPicSetIdxL0( i, tempListEntryL0[i] );
+        }
+        else
+        {
+          refPicListModification->setRefPicSetIdxL0( i, temporalRefIdx );
+          temporalRefIdx++;
+        }
+      }
+    }
     else
     {
@@ -2520 +2537 @@
     if( hasModification )
     {
-            Int temporalRefIdx = 0;
-            for( Int i = 0; i < pcSlice->getNumRefIdx( REF_PIC_LIST_1 ); i++ )
-            {
-              if( tempListEntryL1[i] >= 0 ) 
-              {
-                refPicListModification->setRefPicSetIdxL1( i, tempListEntryL1[i] );
-              }
-              else
-              {
-                refPicListModification->setRefPicSetIdxL1( i, temporalRefIdx );
-                temporalRefIdx++;
-              }
-            }
+      Int temporalRefIdx = 0;
+      for( Int i = 0; i < pcSlice->getNumRefIdx( REF_PIC_LIST_1 ); i++ )
+      {
+        if( tempListEntryL1[i] >= 0 ) 
+        {
+          refPicListModification->setRefPicSetIdxL1( i, tempListEntryL1[i] );
+        }
+        else
+        {
+          refPicListModification->setRefPicSetIdxL1( i, temporalRefIdx );
+          temporalRefIdx++;
+        }
+      }
     } 
     else