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

Timestamp:

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

Author:

seregin

Message:

port rev 4236

File:

• branches/SHM-dev/source/Lib/TLibDecoder/TDecSbac.cpp (modified) (3 diffs)

branches/SHM-dev/source/Lib/TLibDecoder/TDecSbac.cpp

@@ -655 +655 @@
   {
     Int preds[NUM_MOST_PROBABLE_MODES] = {-1, -1, -1};
-    Int predNum = pcCU->getIntraDirPredictor(absPartIdx+partOffset*j, preds, COMPONENT_Y);
+    pcCU->getIntraDirPredictor(absPartIdx+partOffset*j, preds, COMPONENT_Y);
     if (mpmPred[j])
     {
@@ -672 +672 @@
 
       //postponed sorting of MPMs (only in remaining branch)
-      assert(predNum>=3); // It is currently always 3!
       if (preds[0] > preds[1])
       {
@@ -685 +684 @@
         std::swap(preds[1], preds[2]);
       }
-      for ( Int i = 0; i < predNum; i++ )
+      for ( UInt i = 0; i < NUM_MOST_PROBABLE_MODES; i++ )
       {
         intraPredMode += ( intraPredMode >= preds[i] );