Changeset 1049 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp

Timestamp:

3 Mar 2015, 23:36:18 (10 years ago)

Author:

seregin

Message:

fix the index for m_ppcTEncTop to be layerId

File:

• branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp (modified) (7 diffs)

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

@@ -483 +483 @@
 
 #if FIX_NON_OUTPUT_LAYER
-  if( this->getLayerDec(pcPic->getLayerIdx())->m_isOutputLayerFlag == false )
+  if( this->getLayerDec(pcPic->getLayerId())->m_isOutputLayerFlag == false )
   {
     pcPic->setOutputMark( false );
@@ -1096 +1096 @@
       resetPocRestrictionCheckParameters();
 #endif
-      markAllPicsAsNoCurrAu();
+      markAllPicsAsNoCurrAu(m_apcSlicePilot->getVPS());
 #if P0297_VPS_POC_LSB_ALIGNED_FLAG
       for (UInt i = 0; i < MAX_LAYERS; i++)
       {
-        m_ppcTDecTop[i]->m_pocDecrementedInDPBFlag = false;
+        m_ppcTDecTop[m_apcSlicePilot->getVPS()->getLayerIdInNuh(i)]->m_pocDecrementedInDPBFlag = false;
       }
 #endif
@@ -2857 +2857 @@
   }
   
-  return (TDecTop *)getLayerDec( vps->getLayerIdxInVps( vps->getRefLayerId( m_layerId, refLayerIdx ) ) );
+  return (TDecTop *)getLayerDec( vps->getRefLayerId( m_layerId, refLayerIdx ) );
 }
 #endif
@@ -2864 +2864 @@
 Void TDecTop::setRefLayerParams( TComVPS* vps )
 {
-  for(UInt layer = 0; layer < m_numLayer; layer++)
-  {
-    TDecTop *decTop = (TDecTop *)getLayerDec(layer);
+  for(UInt layerIdx = 0; layerIdx < m_numLayer; layerIdx++)
+  {
+    TDecTop *decTop = (TDecTop *)getLayerDec(vps->getLayerIdInNuh(layerIdx));
     decTop->setNumSamplePredRefLayers(0);
     decTop->setNumMotionPredRefLayers(0);
@@ -2877 +2877 @@
       decTop->setMotionPredRefLayerId(i, 0);
     }
-    for(Int j = 0; j < layer; j++)
-    {
-      if (vps->getDirectDependencyFlag(layer, j))
-      {
-        decTop->setRefLayerId(decTop->getNumDirectRefLayers(), vps->getLayerIdInNuh(layer));
+    for(Int j = 0; j < layerIdx; j++)
+    {
+      if (vps->getDirectDependencyFlag(layerIdx, j))
+      {
+        decTop->setRefLayerId(decTop->getNumDirectRefLayers(), vps->getLayerIdInNuh(layerIdx));
         decTop->setNumDirectRefLayers(decTop->getNumDirectRefLayers() + 1);
 
-        Int samplePredEnabledFlag = (vps->getDirectDependencyType(layer, j) + 1) & 1;
+        Int samplePredEnabledFlag = (vps->getDirectDependencyType(layerIdx, j) + 1) & 1;
         decTop->setSamplePredEnabledFlag(j, samplePredEnabledFlag == 1 ? true : false);
         decTop->setNumSamplePredRefLayers(decTop->getNumSamplePredRefLayers() + samplePredEnabledFlag);
 
-        Int motionPredEnabledFlag = ((vps->getDirectDependencyType(layer, j) + 1) & 2) >> 1;
+        Int motionPredEnabledFlag = ((vps->getDirectDependencyType(layerIdx, j) + 1) & 2) >> 1;
         decTop->setMotionPredEnabledFlag(j, motionPredEnabledFlag == 1 ? true : false);
         decTop->setNumMotionPredRefLayers(decTop->getNumMotionPredRefLayers() + motionPredEnabledFlag);
@@ -3108 +3108 @@
     if( vps->getOutputLayerFlag( targetOlsIdx, i ) )
     {
-      this->getLayerDec( vps->getLayerIdxInVps( vps->getLayerSetLayerIdList( targetLsIdx, i ) ) )->m_isOutputLayerFlag = true;
+      this->getLayerDec( vps->getLayerSetLayerIdList( targetLsIdx, i ) )->m_isOutputLayerFlag = true;
     }
   }
@@ -3130 +3130 @@
 #endif
 #if POC_RESET_IDC_DECODER
-Void TDecTop::markAllPicsAsNoCurrAu()
+Void TDecTop::markAllPicsAsNoCurrAu(TComVPS *vps)
 {
   for(Int i = 0; i < MAX_LAYERS; i++)
   {
-    TComList<TComPic*>* listPic = this->getLayerDec(i)->getListPic();
+    TComList<TComPic*>* listPic = this->getLayerDec(vps->getLayerIdInNuh(i))->getListPic();
     TComList<TComPic*>::iterator  iterPic = listPic->begin();
     while ( iterPic != listPic->end() )