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

Timestamp:

26 Mar 2015, 01:03:53 (10 years ago)

Author:

seregin

Message:

fix for the sample and motion prediction flags, problem was reported by Yong He <Yong.He@…>

Location:

branches/SHM-dev/source/Lib/TLibDecoder

Files:

• TDecTop.cpp (modified) (4 diffs)
• TDecTop.h (modified) (2 diffs)

branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp ¶

@@ -1995 +1995 @@
         {
           // check for the sample prediction picture type
-          if( m_ppcTDecTop[m_layerId]->getSamplePredEnabledFlag(pcSlice->getVPS()->getLayerIdxInVps(refLayerId)))
+          if( pcSlice->getVPS()->isSamplePredictionType( pcSlice->getVPS()->getLayerIdxInVps(m_layerId), pcSlice->getVPS()->getLayerIdxInVps(refLayerId) ) )
           {
 #if O0215_PHASE_ALIGNMENT_REMOVAL
@@ -2144 +2144 @@
       if( refPic->isILR(pcSlice->getLayerId()) )
       {
-        assert( m_ppcTDecTop[m_layerId]->getMotionPredEnabledFlag( refPic->getLayerIdx() ) );
+        assert( pcSlice->getVPS()->isMotionPredictionType( pcSlice->getVPS()->getLayerIdxInVps(m_layerId), refPic->getLayerIdx() ) );
       }
     }
@@ -2785 +2785 @@
     decTop->setNumMotionPredRefLayers(0);
     decTop->setNumDirectRefLayers(0);
-    for(Int i = 0; i < MAX_VPS_LAYER_IDX_PLUS1; i++)
-    {
-      decTop->setSamplePredEnabledFlag(i, false);
-      decTop->setMotionPredEnabledFlag(i, false);
-      decTop->setSamplePredRefLayerId(i, 0);
-      decTop->setMotionPredRefLayerId(i, 0);
-    }
+
     for(Int j = 0; j < layerIdx; j++)
     {
@@ -2800 +2794 @@
 
         Int samplePredEnabledFlag = (vps->getDirectDependencyType(layerIdx, j) + 1) & 1;
-        decTop->setSamplePredEnabledFlag(j, samplePredEnabledFlag == 1 ? true : false);
         decTop->setNumSamplePredRefLayers(decTop->getNumSamplePredRefLayers() + samplePredEnabledFlag);
 
         Int motionPredEnabledFlag = ((vps->getDirectDependencyType(layerIdx, j) + 1) & 2) >> 1;
-        decTop->setMotionPredEnabledFlag(j, motionPredEnabledFlag == 1 ? true : false);
         decTop->setNumMotionPredRefLayers(decTop->getNumMotionPredRefLayers() + motionPredEnabledFlag);
-      }
-    }
-  }
-  for( Int i = 1; i < m_numLayer; i++ )
-  {
-    Int mIdx = 0, sIdx = 0;
-    TDecTop *decTop = (TDecTop *)getLayerDec(vps->getLayerIdInNuh(i));
-    for ( Int j = 0; j < i; j++ )
-    {
-      if (decTop->getMotionPredEnabledFlag(j))
-      {
-        decTop->setMotionPredRefLayerId(mIdx++, vps->getLayerIdInNuh(j));
-      }
-      if (decTop->getSamplePredEnabledFlag(j))
-      {
-        decTop->setSamplePredRefLayerId(sIdx++, vps->getLayerIdInNuh(j));
       }
     }

branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.h ¶

@@ -151 +151 @@
   Int                     m_refLayerId[MAX_VPS_LAYER_IDX_PLUS1];
   Int                     m_numSamplePredRefLayers;
-  Int                     m_samplePredRefLayerId[MAX_VPS_LAYER_IDX_PLUS1];
   Int                     m_numMotionPredRefLayers;
-  Int                     m_motionPredRefLayerId[MAX_VPS_LAYER_IDX_PLUS1];
-  Bool                    m_samplePredEnabledFlag[MAX_VPS_LAYER_IDX_PLUS1];
-  Bool                    m_motionPredEnabledFlag[MAX_VPS_LAYER_IDX_PLUS1];
 #endif
   TComPic*                m_cIlpPic[MAX_NUM_REF];                    ///<  Inter layer Prediction picture =  upsampled picture
@@ -273 +269 @@
   Void      setNumSamplePredRefLayers       (Int num)                       { m_numSamplePredRefLayers = num;   }
 
-  Int       getSamplePredRefLayerId         (Int layerIdc)                  { return m_samplePredRefLayerId[layerIdc];       }
-  Void      setSamplePredRefLayerId         (Int layerIdc, Int refLayerId)  { m_samplePredRefLayerId[layerIdc] = refLayerId; }
-
   Int       getNumMotionPredRefLayers       ()                              { return m_numMotionPredRefLayers;  }
   Void      setNumMotionPredRefLayers       (Int num)                       { m_numMotionPredRefLayers = num;   }
-
-  Int       getMotionPredRefLayerId         (Int layerIdc)                  { return m_motionPredRefLayerId[layerIdc];       }
-  Void      setMotionPredRefLayerId         (Int layerIdc, Int refLayerId)  { m_motionPredRefLayerId[layerIdc] = refLayerId; }
-
-  Bool      getSamplePredEnabledFlag        (Int layerIdx)                  { return m_samplePredEnabledFlag[layerIdx];  }
-  Void      setSamplePredEnabledFlag        (Int layerIdx, Bool flag)       { m_samplePredEnabledFlag[layerIdx] = flag;  }
-
-  Bool      getMotionPredEnabledFlag        (Int layerIdx)                  { return m_motionPredEnabledFlag[layerIdx];  }
-  Void      setMotionPredEnabledFlag        (Int layerIdx, Bool flag)       { m_motionPredEnabledFlag[layerIdx] = flag;  }
 
   Void      setRefLayerParams( TComVPS* vps );