Changeset 294 in 3DVCSoftware for branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncCu.cpp

Timestamp:

19 Feb 2013, 20:33:52 (12 years ago)

Author:

tech

Message:

Removed HM-6.1 related guard macros.

File:

• branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncCu.cpp (modified) (23 diffs)

branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncCu.cpp

@@ -107 +107 @@
   
   m_bEncodeDQP = false;
-#if BURST_IPCM
   m_checkBurstIPCMFlag = false;
-#endif
 
   // initialize partition order.
@@ -285 +283 @@
   }
 
-#if BURST_IPCM
   TComPic* pcPic = pcCU->getPic();
   Bool checkBurstIPCMFlag = (pcPic->getSlice(0)->getSPS()->getUsePCM())? true : false;
@@ -293 +290 @@
   pcCU->setNumSucIPCM(0);
   pcCU->setLastCUSucIPCMFlag(false);
-#endif
 
   // Encode CU data
   xEncodeCU( pcCU, 0, 0 );
   
-#if OL_FLUSH
   bool bTerminateSlice = bForceTerminate;
   UInt uiCUAddr = pcCU->getAddr();
     /* If at the end of an LCU line but not at the end of a substream, perform CABAC flush */
-#if WPP_SIMPLIFICATION
     if (!bTerminateSlice && pcCU->getSlice()->getPPS()->getNumSubstreams() > 1)
-#else
-    if (!bTerminateSlice && pcCU->getSlice()->getPPS()->getCabacIstateReset())
-#endif
     {
       Int iNumSubstreams = pcCU->getSlice()->getPPS()->getNumSubstreams();
@@ -312 +303 @@
       UInt uiCol     = uiCUAddr % uiWidthInLCUs;
       UInt uiLin     = uiCUAddr / uiWidthInLCUs;
-#if !REMOVE_TILE_DEPENDENCE
-      Int iBreakDep = pcCU->getPic()->getPicSym()->getTileBoundaryIndependenceIdr();
-#endif
       UInt uiTileStartLCU = pcCU->getPic()->getPicSym()->getTComTile(pcCU->getPic()->getPicSym()->getTileIdxMap(uiCUAddr))->getFirstCUAddr();
       UInt uiTileLCUX = uiTileStartLCU % uiWidthInLCUs;
@@ -321 +309 @@
       UInt uiTileHeight = pcCU->getPic()->getPicSym()->getTComTile(pcCU->getPic()->getPicSym()->getTileIdxMap(uiCUAddr))->getTileHeight();
       Int iNumSubstreamsPerTile = iNumSubstreams;
-#if !REMOVE_TILE_DEPENDENCE
-#if WPP_SIMPLIFICATION
-      if (iBreakDep && pcCU->getSlice()->getPPS()->getNumSubstreams() > 1)
-#else
-      if (iBreakDep && pcCU->getSlice()->getPPS()->getEntropyCodingSynchro())
-#endif
+      if (pcCU->getSlice()->getPPS()->getNumSubstreams() > 1)
+      {
         iNumSubstreamsPerTile /= pcCU->getPic()->getPicSym()->getNumTiles();
-      if ((iBreakDep && (uiCol == uiTileLCUX+uiTileWidth-1) && (uiLin+iNumSubstreamsPerTile < uiTileLCUY+uiTileHeight))
-          || (!iBreakDep && (uiCol == uiWidthInLCUs-1) && (uiLin+iNumSubstreams < pcCU->getPic()->getFrameHeightInCU())))
+      }
+      if ((uiCol == uiTileLCUX+uiTileWidth-1) && (uiLin+iNumSubstreamsPerTile < uiTileLCUY+uiTileHeight))
       {
         m_pcEntropyCoder->encodeFlush();
       }
-#else
-#if WPP_SIMPLIFICATION
-      if (pcCU->getSlice()->getPPS()->getNumSubstreams() > 1)
-#else
-      if (pcCU->getSlice()->getPPS()->getEntropyCodingSynchro())
-#endif
-      {
-        iNumSubstreamsPerTile /= pcCU->getPic()->getPicSym()->getNumTiles();
-      }
-      if ((uiCol == uiTileLCUX+uiTileWidth-1) && (uiLin+iNumSubstreamsPerTile < uiTileLCUY+uiTileHeight))
-      {
-        m_pcEntropyCoder->encodeFlush();
-      }
-#endif
-    }
-#endif // OL_FLUSH
+    }
 }
 
@@ -556 +525 @@
 #if LOSSLESS_CODING
   Bool isAddLowestQP = false;
-#if H0736_AVC_STYLE_QP_RANGE
   Int lowestQP = -rpcTempCU->getSlice()->getSPS()->getQpBDOffsetY();
-#else
-  Int lowestQP = 0;
-#endif
 #endif
 
@@ -566 +531 @@
   {
     Int idQP = m_pcEncCfg->getMaxDeltaQP();
-#if H0736_AVC_STYLE_QP_RANGE
     iMinQP = Clip3( -rpcTempCU->getSlice()->getSPS()->getQpBDOffsetY(), MAX_QP, iBaseQP-idQP );
     iMaxQP = Clip3( -rpcTempCU->getSlice()->getSPS()->getQpBDOffsetY(), MAX_QP, iBaseQP+idQP );
@@ -576 +540 @@
 
     }
-#endif
-#else
-    iMinQP = Clip3( MIN_QP, MAX_QP, iBaseQP-idQP );
-    iMaxQP = Clip3( MIN_QP, MAX_QP, iBaseQP+idQP );
-#if LOSSLESS_CODING
-    if ( (rpcTempCU->getSlice()->getSPS()->getUseLossless()) && (lowestQP < iMinQP) && rpcTempCU->getSlice()->getPPS()->getUseDQP() )
-    {
-      isAddLowestQP = true;
-      iMinQP = iMinQP - 1;
-    }
-#endif
 #endif
   }
@@ -1317 +1270 @@
   {
     Int idQP = m_pcEncCfg->getMaxDeltaQP();
-#if H0736_AVC_STYLE_QP_RANGE
     iMinQP = Clip3( -rpcTempCU->getSlice()->getSPS()->getQpBDOffsetY(), MAX_QP, iBaseQP-idQP );
     iMaxQP = Clip3( -rpcTempCU->getSlice()->getSPS()->getQpBDOffsetY(), MAX_QP, iBaseQP+idQP );
@@ -1326 +1278 @@
       iMinQP = iMinQP - 1;      
     }
-#endif
-#else
-    iMinQP = Clip3( MIN_QP, MAX_QP, iBaseQP-idQP );
-    iMaxQP = Clip3( MIN_QP, MAX_QP, iBaseQP+idQP );
-#if LOSSLESS_CODING
-    if ( (rpcTempCU->getSlice()->getSPS()->getUseLossless()) && (lowestQP < iMinQP) && rpcTempCU->getSlice()->getPPS()->getUseDQP() )
-    {
-      isAddLowestQP = true;
-      iMinQP = iMinQP - 1;
-    }
-#endif
 #endif
   }
@@ -1635 +1576 @@
     &&((uiPosY+pcCU->getHeight(uiAbsPartIdx))%uiGranularityWidth==0||(uiPosY+pcCU->getHeight(uiAbsPartIdx)==uiHeight));
   
-#if BURST_IPCM
   if(granularityBoundary && (!(pcCU->getIPCMFlag(uiAbsPartIdx) && ( pcCU->getNumSucIPCM() > 1 ))))
-#else
-  if(granularityBoundary)
-#endif
   {
     // The 1-terminating bit is added to all streams, so don't add it here when it's 1.
@@ -1731 +1668 @@
     iQpOffset = Int(floor( dQpOffset + 0.49999 ));
   }
-#if H0736_AVC_STYLE_QP_RANGE
   return Clip3(-pcCU->getSlice()->getSPS()->getQpBDOffsetY(), MAX_QP, iBaseQp+iQpOffset );
-#else
-  return Clip3( MIN_QP, MAX_QP, iBaseQp+iQpOffset );
-#endif
 }
 
@@ -1754 +1687 @@
   UInt uiBPelY   = uiTPelY + (g_uiMaxCUHeight>>uiDepth) - 1;
   
-#if BURST_IPCM
   if( getCheckBurstIPCMFlag() )
   {
@@ -1760 +1692 @@
     pcCU->setNumSucIPCM( countNumSucIPCM ( pcCU, uiAbsPartIdx ) );
   }
-#endif
 
   TComSlice * pcSlice = pcCU->getPic()->getSlice(pcCU->getPic()->getCurrSliceIdx());
@@ -1833 +1764 @@
       setdQPFlag(true);
     }
-#if BURST_IPCM
     pcCU->setNumSucIPCM(0);
     pcCU->setLastCUSucIPCMFlag(false);
-#endif
     for ( UInt uiPartUnitIdx = 0; uiPartUnitIdx < 4; uiPartUnitIdx++, uiAbsPartIdx+=uiQNumParts )
     {
@@ -1991 +1920 @@
 #endif
 
-#if FAST_DECISION_FOR_MRG_RD_COST
   Bool bestIsSkip = false;
-#endif
   
   for( UInt uiMergeCand = 0; uiMergeCand < numValidMergeCand; ++uiMergeCand )
@@ -2023 +1950 @@
 #endif
       {
-#if FAST_DECISION_FOR_MRG_RD_COST
         if( !(bestIsSkip && uiNoResidual == 0) )
         {
-#endif
           // set MC parameters
           rpcTempCU->setPredModeSubParts( MODE_SKIP, 0, uhDepth ); // interprets depth relative to LCU level
@@ -2088 +2013 @@
           else
           {
-#if FAST_DECISION_FOR_MRG_RD_COST
             if( bestIsSkip)
             {
@@ -2107 +2031 @@
             else
             {
-#endif
               if ( pcPredYuvTemp != m_ppcPredYuvTemp[uhDepth])
               {
@@ -2113 +2036 @@
                 pcPredYuvTemp = m_ppcPredYuvBest[uhDepth];
               }
-#if FAST_DECISION_FOR_MRG_RD_COST
             }
-#endif
           }
 #if HHI_VSO
@@ -2140 +2061 @@
           Bool bQtRootCbf = rpcTempCU->getQtRootCbf(0) == 1;
 
-#if H0736_AVC_STYLE_QP_RANGE
           Int orgQP = rpcTempCU->getQP( 0 );
           xCheckDQP( rpcTempCU );
           xCheckBestMode(rpcBestCU, rpcTempCU, uhDepth);
           rpcTempCU->initEstData( uhDepth, orgQP );
-#else
-          UInt uiOrgQP = rpcTempCU->getQP( 0 );
-          xCheckDQP( rpcTempCU );
-          xCheckBestMode(rpcBestCU, rpcTempCU, uhDepth);
-          rpcTempCU->initEstData( uhDepth, uiOrgQP );
-#endif
-
-#if FAST_DECISION_FOR_MRG_RD_COST
+
           if( m_pcEncCfg->getUseFastDecisionForMerge() && !bestIsSkip )
           {
             bestIsSkip = rpcBestCU->getQtRootCbf(0) == 0;
           }
-#endif
 
           if (!bQtRootCbf)
             break;
-#if FAST_DECISION_FOR_MRG_RD_COST
         }
-#endif
       }
     }
@@ -2515 +2425 @@
 }
 
-#if BURST_IPCM
 /** Check whether the last CU shares the same root as the current CU and is IPCM or not.  
  * \param pcCU
@@ -2607 +2516 @@
   return numSucIPCM;
 }
-#endif
 
 Void TEncCu::xCopyAMVPInfo (AMVPInfo* pSrc, AMVPInfo* pDst)