Changeset 820 in 3DVCSoftware for branches/HTM-9.3-dev1-RWTH/source/Lib/TLibEncoder

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/TLibEncoder

Files:

• TEncCu.cpp (modified) (5 diffs)
• TEncEntropy.cpp (modified) (1 diff)
• TEncSbac.cpp (modified) (1 diff)
• TEncSearch.cpp (modified) (2 diffs)

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