Changeset 1244 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon

Timestamp:

13 Jul 2015, 22:58:16 (10 years ago)

Author:

seregin

Message:

port rev 4236

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• TComDataCU.cpp (modified) (4 diffs)
• TComDataCU.h (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibCommon/TComDataCU.cpp

@@ -1434 +1434 @@
 *\returns Number of MPM
 */
-Int TComDataCU::getIntraDirPredictor( UInt uiAbsPartIdx, Int uiIntraDirPred[NUM_MOST_PROBABLE_MODES], const ComponentID compID, Int* piMode  )
+Void TComDataCU::getIntraDirPredictor( UInt uiAbsPartIdx, Int uiIntraDirPred[NUM_MOST_PROBABLE_MODES], const ComponentID compID, Int* piMode  )
 {
   TComDataCU* pcCULeft, *pcCUAbove;
@@ -1440 +1440 @@
   UInt        AbovePartIdx = MAX_UINT;
   Int         iLeftIntraDir, iAboveIntraDir;
-  Int         uiPredNum = 0;
 
   const ChannelType chType = toChannelType(compID);
@@ -1463 +1462 @@
 
   assert (2<NUM_MOST_PROBABLE_MODES);
-  uiPredNum = NUM_MOST_PROBABLE_MODES;
   if(iLeftIntraDir == iAboveIntraDir)
   {
@@ -1502 +1500 @@
     }
   }
-  for (Int i=0; i<uiPredNum; i++)
+  for (UInt i=0; i<NUM_MOST_PROBABLE_MODES; i++)
     assert(uiIntraDirPred[i] < 35);
-
-  return uiPredNum;
 }
 

branches/SHM-dev/source/Lib/TLibCommon/TComDataCU.h

@@ -459 +459 @@
 
   Void          getAllowedChromaDir             ( UInt uiAbsPartIdx, UInt* uiModeList );
-  Int           getIntraDirPredictor            ( UInt uiAbsPartIdx, Int uiIntraDirPred[NUM_MOST_PROBABLE_MODES], const ComponentID compID, Int* piMode = NULL );
+  Void          getIntraDirPredictor            ( UInt uiAbsPartIdx, Int uiIntraDirPred[NUM_MOST_PROBABLE_MODES], const ComponentID compID, Int* piMode = NULL );
 
   // -------------------------------------------------------------------------------------------------------------------