Changeset 193 in 3DVCSoftware for branches/HTM-4.0.1-VSP-dev0/source/Lib/TLibDecoder/TDecCu.cpp

Timestamp:

19 Nov 2012, 21:15:40 (12 years ago)

Author:

mitsubishi-htm

Message:

A second release, as planned

• Migrate to HTM 4.1
• Move VSP related switches to cfg file instead of #define in the source code
• A few bug fixes
• For VC project files, only VC9 file is updated

TODO

• Migrate to HTM 5.0, to be used as anchor for CE1 toward Geneva meeting

File:

• branches/HTM-4.0.1-VSP-dev0/source/Lib/TLibDecoder/TDecCu.cpp (modified) (8 diffs)

branches/HTM-4.0.1-VSP-dev0/source/Lib/TLibDecoder/TDecCu.cpp

@@ -351 +351 @@
 #if FORCE_REF_VSP==1
     if( pcCU->isSkipped(uiAbsPartIdx) && pcCU->getSlice()->getViewId() != 0 )
-#if VSP_TEXT_ONLY
-    if( !pcCU->getSlice()->getSPS()->isDepth() )
+#if VSP_CFG
+    if( pcCU->getSlice()->getSPS()->getVspDepthPresentFlag() || !pcCU->getSlice()->getSPS()->isDepth() )
+#else
+    if( !pcCU->getSlice()->getVspDepthDisableFlag() || !pcCU->getSlice()->getSPS()->isDepth() )
 #endif
     {
@@ -385 +387 @@
     if( pcCU->getTextureModeDepth( uiAbsPartIdx ) == uiDepth )
     {
-#if DEBUGLOGOUT
-      PredMode   eOrgPred = pcCU->getPredictionMode( uiAbsPartIdx );
-#endif
       TComDataCU *pcTextureCU = pcCU->getSlice()->getTexturePic()->getCU( pcCU->getAddr() );
       pcCU->copyTextureMotionDataFrom( pcTextureCU, uiDepth, pcCU->getZorderIdxInCU() + uiAbsPartIdx, uiAbsPartIdx );
-#if DEBUGLOGOUT
-      if( eOrgPred == MODE_SKIP )
-        pcCU->setPredModeSubParts( MODE_SKIP, uiAbsPartIdx, uiDepth );
-      m_cDebug.DebugLogOut( pcCU, uiAbsPartIdx, uiDepth );
-#endif
 
       UInt uiCurrPartNumb = pcCU->getPic()->getNumPartInCU() >> (uiDepth << 1);
@@ -437 +431 @@
 #endif
     xFinishDecodeCU( pcCU, uiAbsPartIdx, uiDepth, ruiIsLast );
-#if DEBUGLOGOUT
-#if HHI_MPI
-    if( pcCU->getTextureModeDepth( uiAbsPartIdx ) != uiDepth )
-#endif
-      m_cDebug.DebugLogOut( pcCU, uiAbsPartIdx, uiDepth );
-#endif
     return;
   }
@@ -472 +460 @@
 
     xFinishDecodeCU( pcCU, uiAbsPartIdx, uiDepth, ruiIsLast );
-#if DEBUGLOGOUT
-    m_cDebug.DebugLogOut( pcCU, uiAbsPartIdx, uiDepth );
-#endif
     return;
   }
@@ -508 +493 @@
     {
       xFinishDecodeCU( pcCU, uiAbsPartIdx, uiDepth, ruiIsLast );
-#if DEBUGLOGOUT
-      m_cDebug.DebugLogOut( pcCU, uiAbsPartIdx, uiDepth );
-#endif
       return;
     }
@@ -610 +592 @@
   setdQPFlag( bCodeDQP );
   xFinishDecodeCU( pcCU, uiAbsPartIdx, uiDepth, ruiIsLast );
-#if DEBUGLOGOUT
-  m_cDebug.DebugLogOut( pcCU, uiAbsPartIdx, uiDepth );
-#endif
 }
 
@@ -710 +689 @@
   
   xCopyToPic( m_ppcCU[uiDepth], pcPic, uiAbsPartIdx, uiDepth );
-#if DEBUGIMGOUT
-  xColsetToPicMerge( m_ppcCU[uiDepth], pcPic->getPicYuvRecDbg(), uiAbsPartIdx, uiDepth );
-#endif
 }
 
@@ -724 +700 @@
   // inter prediction
   m_pcPrediction->motionCompensation( pcCU, m_ppcYuvReco[uiDepth] );
+
 #if HHI_MPI
   if( pcCU->getTextureModeDepth( 0 ) != -1 )