Changeset 847 in 3DVCSoftware for branches/HTM-10.0rc1-dev0/source/Lib/TLibDecoder/TDecCu.cpp

Timestamp:

12 Feb 2014, 20:30:47 (11 years ago)

Author:

tech

Message:

Further fix to braces. Aligned Intra reconstruction.

File:

• branches/HTM-10.0rc1-dev0/source/Lib/TLibDecoder/TDecCu.cpp (modified) (2 diffs)

branches/HTM-10.0rc1-dev0/source/Lib/TLibDecoder/TDecCu.cpp

@@ -927 +927 @@
   }
 #endif
-  
+
+#if UPDATE_HM13
+  Bool useDltFlag = (isDimMode( uiLumaPredMode ) || uiLumaPredMode == HOR_IDX || uiLumaPredMode == VER_IDX || uiLumaPredMode == DC_IDX) && pcCU->getSlice()->getIsDepth() && pcCU->getSlice()->getPPS()->getDLT()->getUseDLTFlag(pcCU->getSlice()->getLayerIdInVps());
+
+  if ( pcCU->getCbf( uiAbsPartIdx, TEXT_LUMA, uiTrDepth ) || useDltFlag )
+#else
   if ( pcCU->getCbf( uiAbsPartIdx, TEXT_LUMA, uiTrDepth ) )
+#endif
   {
   //===== inverse transform =====
@@ -948 +954 @@
     {
 #if H_3D
+#if UPDATE_HM13
+      if ( useDltFlag )
+#else
       if( (isDimMode( uiLumaPredMode ) || uiLumaPredMode == HOR_IDX || uiLumaPredMode == VER_IDX || uiLumaPredMode == DC_IDX) && pcCU->getSlice()->getIsDepth() && pcCU->getSlice()->getPPS()->getDLT()->getUseDLTFlag(pcCU->getSlice()->getLayerIdInVps()) )
+#endif
       {
         pReco    [ uiX ] = pcCU->getSlice()->getPPS()->getDLT()->idx2DepthValue( pcCU->getSlice()->getLayerIdInVps(), Clip3( 0, pcCU->getSlice()->getPPS()->getDLT()->getNumDepthValues( pcCU->getSlice()->getLayerIdInVps() ) - 1, pcCU->getSlice()->getPPS()->getDLT()->depthValue2idx( pcCU->getSlice()->getLayerIdInVps(), pPred[ uiX ] ) + pResi[ uiX ] ) );