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

Timestamp:

4 Mar 2015, 09:55:40 (11 years ago)

Author:

seregin

Message:

revert back using layerIdx for m_ppcTEncTop, fix RefLayerId settings and related

Location:

branches/SHM-dev/source/Lib/TLibDecoder

Files:

• TDecCAVLC.cpp (modified) (1 diff)
• TDecTop.cpp (modified) (2 diffs)
• TDecTop.h (modified) (1 diff)

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

@@ -3034 +3034 @@
 #endif
 #if LIST_OF_PTL
-  for(Int idx = vps->getBaseLayerInternalFlag() ? 2 : 1; idx <= vps->getNumProfileTierLevel() - 1; idx++)
+  for(Int idx = vps->getBaseLayerInternalFlag() ? 2 : 1; idx < vps->getNumProfileTierLevel(); idx++)
 #else
   for(Int idx = 1; idx <= vps->getNumProfileTierLevel() - 1; idx++)

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

@@ -2229 +2229 @@
       if( refPic->isILR(pcSlice->getLayerId()) )
       {
-        assert( m_ppcTDecTop[m_layerId]->getMotionPredEnabledFlag(pcSlice->getVPS()->getLayerIdxInVps(refPic->getLayerId())) );
+        assert( m_ppcTDecTop[m_layerId]->getMotionPredEnabledFlag( refPic->getLayerIdx() ) );
       }
     }
@@ -3008 +3008 @@
     for(Int i = 0; i < vps->getNumOutputLayerSets(); i++)
     {
-      Bool layerSetMatchFlag = true;
+      Bool layerSetMatchFlag = false;
       Int layerSetIdx = vps->getOutputLayerSetIdx( i );
-      if( vps->getNumLayersInIdList( layerSetIdx ) == params->getTargetLayerId() + 1 )
-      {
-        for(Int j = 0; j < vps->getNumLayersInIdList( layerSetIdx ); j++)
-        {
-          if( vps->getLayerSetLayerIdList( layerSetIdx, j ) != j )
-          {
-            layerSetMatchFlag = false;
-            break;
-          }
-        }
-      }
-      else
-      {
-        layerSetMatchFlag = false;
+
+      for(Int j = 0; j < vps->getNumLayersInIdList( layerSetIdx ); j++)
+      {
+        if( vps->getLayerSetLayerIdList( layerSetIdx, j ) == params->getTargetLayerId() )
+        {
+          layerSetMatchFlag = true;
+          break;
+        }
       }
       

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

@@ -273 +273 @@
   Void      setNumSamplePredRefLayers       (Int num)                       { m_numSamplePredRefLayers = num;   }
 
-  Int       getSamplePredRefLayerId         (Int i)                         { return m_samplePredRefLayerId[i];       }
-  Void      setSamplePredRefLayerId         (Int i, Int refLayerId)         { m_samplePredRefLayerId[i] = refLayerId; }
+  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 i)                         { return m_motionPredRefLayerId[i];       }
-  Void      setMotionPredRefLayerId         (Int i, Int refLayerId)         { m_motionPredRefLayerId[i] = refLayerId; }
-
-  Bool      getSamplePredEnabledFlag        (Int i)                         { return m_samplePredEnabledFlag[i];  }
-  Void      setSamplePredEnabledFlag        (Int i,Bool flag)               { m_samplePredEnabledFlag[i] = flag;  }
-
-  Bool      getMotionPredEnabledFlag        (Int i)                         { return m_motionPredEnabledFlag[i];  }
-  Void      setMotionPredEnabledFlag        (Int i,Bool flag)               { m_motionPredEnabledFlag[i] = flag;  }
-
-  TDecTop*  getSamplePredRefLayerDec        ( UInt layerId );
-  TDecTop*  getMotionPredRefLayerDec        ( UInt layerId );
+  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 );