Changeset 847 in 3DVCSoftware

Timestamp:

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

Author:

tech

Message:

Further fix to braces. Aligned Intra reconstruction.

Location:

branches/HTM-10.0rc1-dev0/source/Lib

Files:

• TLibCommon/TComRom.cpp (modified) (1 diff)
• TLibDecoder/TDecCu.cpp (modified) (2 diffs)
• TLibEncoder/TEncSearch.cpp (modified) (2 diffs)
• TLibEncoder/TEncSlice.cpp (modified) (1 diff)

branches/HTM-10.0rc1-dev0/source/Lib/TLibCommon/TComRom.cpp

@@ -579 +579 @@
 
   Bool stopFlag = false; 
-  if ( g_stopAtPos && poc == 0 && layerId == 4 )
+  if ( g_stopAtPos && poc == 0 && layerId == 1 )
   {
     Bool stopAtCU = true; 
     if ( stopAtCU )        // Stop at CU with specific size
     {    
-      stopFlag = ( cuPelX  == 16 ) && ( cuPelY  == 112 ) && ( cuWidth == 16 ) && ( cuHeight == 16); 
+      stopFlag = ( cuPelX  == 888 ) && ( cuPelY  == 248 ) && ( cuWidth == 8 ) && ( cuHeight == 8); 
     }
     else
     {                     // Stop at specific position 
-      Int xPos = 18; 
-      Int yPos = 112; 
+      Int xPos = 888; 
+      Int yPos = 248; 
 
       Int cuPelXEnd = cuPelX + cuWidth  - 1; 

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 ] ) );

branches/HTM-10.0rc1-dev0/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -5803 +5803 @@
       dCostBest        = dCost;
       qpBest           = qp;
-        m_pcRDGoOnSbacCoder->store( m_pppcRDSbacCoder[ pcCU->getDepth( 0 ) ][ CI_TEMP_BEST ] );
-      }
+      m_pcRDGoOnSbacCoder->store( m_pppcRDSbacCoder[ pcCU->getDepth( 0 ) ][ CI_TEMP_BEST ] );
     }
 #if H_3D_VSO // M21
@@ -5814 +5813 @@
     }
 #endif
-  
+  }
   assert ( dCostBest != MAX_DOUBLE );
   

branches/HTM-10.0rc1-dev0/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -1457 +1457 @@
         m_pcBufferSbacCoders[uiTileCol].loadContexts( &pcSbacCoders[uiSubStrm] );
       }
-    }
 #if H_3D_QTLPC
     rpcPic->setReduceBitsFlag(false);
 #endif
+  }
   if( depSliceSegmentsEnabled )
   {