Changeset 1100 in SHVCSoftware for branches/SHM-dev/source/App/TAppDecoder

Timestamp:

6 Jul 2015, 20:20:51 (10 years ago)

Author:

seregin

Message:

macro cleanup: RESOLUTION_BASED_DPB

Location:

branches/SHM-dev/source/App/TAppDecoder

Files:

• TAppDecTop.cpp (modified) (7 diffs)
• TAppDecTop.h (modified) (2 diffs)

branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp

@@ -1387 +1387 @@
     pic->getPicYuvRec()->setBorderExtension( false );
 
-#if RESOLUTION_BASED_DPB
-    dpbStatus.m_numPicsInLayer[layerIdx]--;
-#endif
 #if FIX_ALIGN_BUMPING
     dpbStatus.m_numPicsInSubDpb[dpbStatus.m_layerIdToSubDpbIdMap[layerId]]--;
@@ -1532 +1529 @@
   // Find DPB-information from the VPS
   DpbStatus maxDpbLimit;
-#if RESOLUTION_BASED_DPB
-  Int targetLsIdx, subDpbIdx;
-  TComVPS *vps = findDpbParametersFromVps(listOfPocs, listOfPocsInEachLayer, listOfPocsPositionInEachLayer, maxDpbLimit);
-
-  if( getCommonDecoderParams()->getTargetOutputLayerSetIdx() == 0 )
-  {
-    targetLsIdx = 0;
-    subDpbIdx   = 0; 
-  }
-  else
-  {
-    targetLsIdx = vps->getOutputLayerSetIdx( getCommonDecoderParams()->getTargetOutputLayerSetIdx() );
-    subDpbIdx   = vps->getSubDpbAssigned( targetLsIdx, layerIdx );
-  }
-#else
 #if FIX_ALIGN_BUMPING
   Int subDpbIdx = getCommonDecoderParams()->getTargetOutputLayerSetIdx() == 0 
@@ -1555 +1537 @@
 #endif
   findDpbParametersFromVps(listOfPocs, listOfPocsInEachLayer, listOfPocsPositionInEachLayer, maxDpbLimit);
-#endif
   // Assume that listOfPocs is sorted in increasing order - if not have to sort it.
   while( ifInvokeBumpingBeforeDecoding(dpbStatus, maxDpbLimit, layerIdx, subDpbIdx) )
@@ -1747 +1728 @@
       maxDpbLimit.m_maxLatencyPictures = sps->getMaxLatencyIncrease( highestTId ) + sps->getNumReorderPics( highestTId ) - 1;
     }
-#if RESOLUTION_BASED_DPB
-    maxDpbLimit.m_numPicsInLayer[0] = sps->getMaxDecPicBuffering( highestTId );
-#endif
     maxDpbLimit.m_numPicsInSubDpb[0] = sps->getMaxDecPicBuffering( highestTId );
   }
@@ -1838 +1816 @@
   // Number of pictures in each sub-DPB
   retVal |= ( dpbStatus.m_numPicsInSubDpb[subDpbIdx] >= dpbLimit.m_numPicsInSubDpb[subDpbIdx] );
-  
-#if RESOLUTION_BASED_DPB
-  // Number of pictures in each layer
-  retVal |= ( dpbStatus.m_numPicsInLayer[layerIdx] >= dpbLimit.m_numPicsInLayer[layerIdx]);
-#endif
 
   return retVal;
@@ -1909 +1882 @@
           if( pic->getSlice(0)->isReferenced() || pic->getOutputMark() )
           {
-#if RESOLUTION_BASED_DPB
-            dpbStatus.m_numPicsInLayer[i]++;  // Count pictures that are "used for reference" or "needed for output"
-#else
             dpbStatus.m_numPicsInSubDpb[i]++;  // Count pictures that are "used for reference" or "needed for output"
-#endif
           }
 #if POC_RESET_IDC_DECODER
@@ -1949 +1918 @@
   {
     dpbStatus.m_numPicsNotDisplayedInLayer[i] = (Int)listOfPocsInEachLayer[i].size();
-#if RESOLUTION_BASED_DPB
-    dpbStatus.m_numPicsInSubDpb[vps->getSubDpbAssigned(targetLsIdx,i)] += dpbStatus.m_numPicsInLayer[i];
-    dpbStatus.m_numPicsInSubDpb[i] += dpbStatus.m_numPicsInLayer[i];
-#endif
   }
   assert( dpbStatus.m_numAUsNotDisplayed != -1 );

branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.h

@@ -139 +139 @@
   Int m_numAUsNotDisplayed;
   Int m_numPicsNotDisplayedInLayer[MAX_LAYERS];
-#if RESOLUTION_BASED_DPB
-  Int m_numPicsInLayer[MAX_LAYERS];   // Pictures marked as used_for_reference or needed for output in the layer
-#endif
   Int m_numPicsInSubDpb[MAX_LAYERS];  // Pictures marked as used_for_reference or needed for output in the sub-DPB
 #if FIX_ALIGN_BUMPING
@@ -162 +159 @@
     m_maxLatencyIncrease  = false;
     m_maxLatencyPictures  = 0;
-#if RESOLUTION_BASED_DPB
-    ::memset( m_numPicsInLayer,  0, sizeof(m_numPicsInLayer)  );
-#endif
     ::memset( m_numPicsInSubDpb, 0, sizeof(m_numPicsInSubDpb) );
     ::memset(m_numPicsNotDisplayedInLayer, 0, sizeof(m_numPicsNotDisplayedInLayer) );