Ticket #1253: getIntraDirLumaPredictor.patch

source/Lib/TLibDecoder/TDecSbac.cpp

@@ -602 +602 @@
 
 Void TDecSbac::parseIntraDirLumaAng  ( TComDataCU* pcCU, UInt absPartIdx, UInt depth )
 {
+  const int iPredNum = 3;
   PartSize mode = pcCU->getPartitionSize( absPartIdx );
   UInt partNum = mode==SIZE_NxN?4:1;
   UInt partOffset = ( pcCU->getPic()->getNumPartInCU() >> ( pcCU->getDepth(absPartIdx) << 1 ) ) >> 2;
@@ -619 +620 @@
   for (j=0;j<partNum;j++)
   {
     Int preds[3] = {-1, -1, -1};
-    Int predNum = pcCU->getIntraDirLumaPredictor(absPartIdx+partOffset*j, preds);  
+    pcCU->getIntraDirLumaPredictor(absPartIdx+partOffset*j, preds);
     if (mpmPred[j])
     {
       m_pcTDecBinIf->decodeBinEP( symbol );
@@ -648 +649 @@
       {
         std::swap(preds[1], preds[2]);
       }
-      for ( Int i = 0; i < predNum; i++ )
+      for ( Int i = 0; i < iPredNum; i++ )
       {
         intraPredMode += ( intraPredMode >= preds[i] );
       }

source/Lib/TLibEncoder/TEncSearch.cpp

@@ -2462 +2462 @@
 #if FAST_UDI_USE_MPM
       Int uiPreds[3] = {-1, -1, -1};
       Int iMode = -1;
-      Int numCand = pcCU->getIntraDirLumaPredictor( uiPartOffset, uiPreds, &iMode );
-      if( iMode >= 0 )
-      {
-        numCand = iMode;
-      }
+      pcCU->getIntraDirLumaPredictor( uiPartOffset, uiPreds, &iMode );
+      const Int iNumCand = iMode >= 0 ? iMode : 3;
       
-      for( Int j=0; j < numCand; j++)
+      for( Int j=0; j < iNumCand; j++)
       {
         Bool mostProbableModeIncluded = false;
         Int mostProbableMode = uiPreds[j];

source/Lib/TLibEncoder/TEncSbac.cpp

@@ -619 +619 @@
   for (j=0;j<partNum;j++)
   {
     dir[j] = pcCU->getLumaIntraDir( absPartIdx+partOffset*j );
-    predNum[j] = pcCU->getIntraDirLumaPredictor(absPartIdx+partOffset*j, preds[j]);  
+    predNum[j] = 3;
+    pcCU->getIntraDirLumaPredictor(absPartIdx+partOffset*j, preds[j]);
     for(UInt i = 0; i < predNum[j]; i++)
     {
       if(dir[j] == preds[j][i])

source/Lib/TLibCommon/TComDataCU.cpp

@@ -1609 +1609 @@
 *\param   piMode          it is set with MPM mode in case both MPM are equal. It is used to restrict RD search at encode side.
 *\returns Number of MPM
 */
-Int TComDataCU::getIntraDirLumaPredictor( UInt uiAbsPartIdx, Int* uiIntraDirPred, Int* piMode  )
+Void TComDataCU::getIntraDirLumaPredictor( UInt uiAbsPartIdx, Int* uiIntraDirPred, Int* piMode  )
 {
   TComDataCU* pcTempCU;
   UInt        uiTempPartIdx;
@@ -1666 +1666 @@
     }
   }
   
-  return uiPredNum;
+  return;
 }
 
 UInt TComDataCU::getCtxSplitFlag( UInt uiAbsPartIdx, UInt uiDepth )

source/Lib/TLibCommon/TComDataCU.h

@@ -435 +435 @@
   UInt          getIntraSizeIdx                 ( UInt uiAbsPartIdx                                       );
   
   Void          getAllowedChromaDir             ( UInt uiAbsPartIdx, UInt* uiModeList );
-  Int           getIntraDirLumaPredictor        ( UInt uiAbsPartIdx, Int* uiIntraDirPred, Int* piMode = NULL );
+  Void          getIntraDirLumaPredictor        ( UInt uiAbsPartIdx, Int* uiIntraDirPred, Int* piMode = NULL );
   
   // -------------------------------------------------------------------------------------------------------------------
   // member functions for SBAC context