Changeset 820 in 3DVCSoftware

Timestamp:

5 Feb 2014, 09:54:12 (11 years ago)

Author:

rwth

Message:

• cleanup: removed some assertions and added some comments

Location:

branches/HTM-9.3-dev1-RWTH/source/Lib

Files:

• TLibCommon/TComPrediction.cpp (modified) (5 diffs)
• TLibDecoder/TDecCu.cpp (modified) (2 diffs)
• TLibDecoder/TDecEntropy.cpp (modified) (1 diff)
• TLibDecoder/TDecSbac.cpp (modified) (1 diff)
• TLibEncoder/TEncCu.cpp (modified) (5 diffs)
• TLibEncoder/TEncEntropy.cpp (modified) (1 diff)
• TLibEncoder/TEncSbac.cpp (modified) (1 diff)
• TLibEncoder/TEncSearch.cpp (modified) (2 diffs)

branches/HTM-9.3-dev1-RWTH/source/Lib/TLibCommon/TComPrediction.cpp

@@ -625 +625 @@
   
   Int iSizeInBits = g_aucConvertToBit[uiSize] - g_aucConvertToBit[iSubSample];  // respect sub-sampling factor
-  Int iMean = iSumDepth >> iSizeInBits*2;       // iMean /= (uiWidth*uiHeight);
-  AOF( iMean == iSumDepth/((uiSize/iSubSample)*(uiSize/iSubSample) ) );
-  AOF( iMean >= 0 && iMean < 256);
+  Int iMean = iSumDepth >> iSizeInBits*2;       // iMean /= (uiSize*uiSize);
   
   // start again for segmentation
@@ -648 +646 @@
       // decide which segment this pixel belongs to
       Int ucSegment = (Int)(depthPel>iMean);
-      AOF( ucSegment == 0 || ucSegment == 1 );
       
       // Matched Filter to find optimal (conventional) partitioning
@@ -718 +715 @@
 Bool TComPrediction::getSegmentMaskFromDepth( Pel* pDepthPels, UInt uiDepthStride, UInt uiWidth, UInt uiHeight, Bool* pMask )
 {
-  AOF( uiWidth == uiHeight );
-  
   // segmentation of texture block --> mask IDs
   Pel*  pDepthBlockStart      = pDepthPels;
@@ -748 +743 @@
     return false;
   
+  AOF(uiWidth==uiHeight);
   Int iSizeInBits = g_aucConvertToBit[uiWidth]+2;
   Int iMean = iSumDepth >> iSizeInBits*2;       // iMean /= (uiWidth*uiHeight);
-  AOF( iMean == iSumDepth/(uiWidth*uiHeight) );
-  AOF( iMean >= 0 && iMean < 256);
   
   // start again for segmentation
@@ -768 +762 @@
       // decide which segment this pixel belongs to
       Int ucSegment = (Int)(depthPel>iMean);
-      AOF( ucSegment == 0 || ucSegment == 1 );
       
       if( bInvertMask )

branches/HTM-9.3-dev1-RWTH/source/Lib/TLibDecoder/TDecCu.cpp

@@ -753 +753 @@
   AOF(!pcCU->getSlice()->isIntra());
   PartSize ePartSize = pcCU->getPartitionSize( 0 );
-  AOF( uiAbsPartIdx == pcCU->getZorderIdxInCU() );
   
   // get collocated depth block
@@ -762 +761 @@
   
   // compute mask by segmenting depth block
-  AOF( pcCU->getWidth(0) == m_ppcYuvReco[uiDepth]->getWidth() );
   Bool pMask[MAX_CU_SIZE*MAX_CU_SIZE];
   Bool bValidMask = m_pcPrediction->getSegmentMaskFromDepth(pDepthPels, uiDepthStride, pcCU->getWidth(0), pcCU->getHeight(0), pMask);

branches/HTM-9.3-dev1-RWTH/source/Lib/TLibDecoder/TDecEntropy.cpp

@@ -161 +161 @@
       
       pcCU->setPartSizeSubParts(eVirtualPartSize, uiAbsPartIdx, uiDepth);
-      AOF( pcCU->getPartitionSize(uiAbsPartIdx) == eVirtualPartSize );
     }
   }

branches/HTM-9.3-dev1-RWTH/source/Lib/TLibDecoder/TDecSbac.cpp

@@ -2153 +2153 @@
   m_pcTDecBinIf->decodeBin( uiSymbol, m_cDBBPFlagSCModel.get( 0, 0, 0 ) );
   
-  DTRACE_CABAC_VL( g_nSymbolCounter++ );
-  DTRACE_CABAC_T( "\tDBBPFlag" );
-  DTRACE_CABAC_T( "\tuiCtxDBBP: ");
-  DTRACE_CABAC_V( uiCtxDBBPFlag );
-  DTRACE_CABAC_T( "\tuiSymbol: ");
-  DTRACE_CABAC_V( uiSymbol );
-  DTRACE_CABAC_T( "\n");
-  
   if( uiSymbol )
   {

branches/HTM-9.3-dev1-RWTH/source/Lib/TLibEncoder/TEncCu.cpp

@@ -2363 +2363 @@
     {
       UChar ucSegment = (UChar)pMask[x];
-      assert( ucSegment < 2 );
+      AOF( ucSegment < 2 );
       
       piDst[x] = (ucSegment==uiValidSegment)?piSrc[x]:DBBP_INVALID_SHORT;
@@ -2387 +2387 @@
     {
       UChar ucSegment = (UChar)pMask[x*2];
-      assert( ucSegment < 2 );
+      AOF( ucSegment < 2 );
       
       piDstU[x] = (ucSegment==uiValidSegment)?piSrcU[x]:DBBP_INVALID_SHORT;
@@ -2405 +2405 @@
   AOF( !rpcTempCU->getSlice()->getIsDepth() );
   
-  
   UChar uhDepth = rpcTempCU->getDepth( 0 );
   
@@ -2425 +2424 @@
   rpcTempCU->setPartSizeSubParts( SIZE_2Nx2N,  0, uhDepth );
   
-  // get coded and reconstructed depth view
+  // fetch virtual depth block
   UInt uiDepthStride = 0;
   Pel* pDepthPels = rpcTempCU->getVirtualDepthBlock(0, uiWidth, uiHeight, uiDepthStride);
@@ -2486 +2485 @@
   }
   
+  // store final motion/disparity information in each PU using derived partitioning
   rpcTempCU->setDepthSubParts( uhDepth, 0 );
   rpcTempCU->setPartSizeSubParts  ( eVirtualPartSize,  0, uhDepth );

branches/HTM-9.3-dev1-RWTH/source/Lib/TLibEncoder/TEncEntropy.cpp

@@ -245 +245 @@
   if( pcCU->getDBBPFlag(uiAbsPartIdx) )
   {
+    AOF( pcCU->getSlice()->getVPS()->getUseDBBP(pcCU->getSlice()->getLayerIdInVps()) );
+    
     // temporarily change partition size for DBBP blocks
     pcCU->setPartSizeSubParts(RWTH_DBBP_PACK_MODE, uiAbsPartIdx, uiDepth);

branches/HTM-9.3-dev1-RWTH/source/Lib/TLibEncoder/TEncSbac.cpp

@@ -1240 +1240 @@
     m_pcBinIf->encodeBin( uiInterDir == 2 ? 1 : 0, *( pCtx + uiCtx ) );
   }
-#if H_3D_DBBP
-  else
-  {
-    // only uni-prediction is allowed for DBBP
-    AOF( uiInterDir == 0 || uiInterDir == 1 );
-  }
-#endif
   if (uiInterDir < 2)
   {

branches/HTM-9.3-dev1-RWTH/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -4657 +4657 @@
       }
       
-      // update these values to virtual partition size
+      // update values to virtual partition size
       pcCU->getPartIndexAndSize( uiPartIdx, uiPartAddr, iRoiWidth, iRoiHeight );
     }
@@ -4667 +4667 @@
     if( pcCU->getDBBPFlag(0) )
     {
-      // reset to 2Nx2N for motion search
+      // restore 2Nx2N partitioning for motion estimation
       uiPartIdx = 0;
       AOF( pcCU->getPartitionSize(0) == pDBBPTmpData->eVirtualPartSize );