Changeset 732 in SHVCSoftware for branches/SHM-6-dev/source/App/TAppDecoder/TAppDecTop.cpp

Timestamp:

24 Apr 2014, 02:16:43 (11 years ago)

Author:

qualcomm

Message:

JCTVC-Q0154: Remove sharing of sub-DPBs across layers

Remove sharing of sub-DPB, and the processes related to early marking of inter-layer reference pictures. This patch include, in addition to other related changes, the following:

1. Disabling macro RESOLUTION_BASED_DPB
2. Disabling macro EARLY_REF_PIC_MARKING

From: Adarsh K. Ramasubramonian <aramasub@…>

File:

• branches/SHM-6-dev/source/App/TAppDecoder/TAppDecTop.cpp (modified) (4 diffs)

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

@@ -1292 +1292 @@
   {
     targetLsIdx = vps->getOutputLayerSetIdx( getCommonDecoderParams()->getTargetOutputLayerSetIdx() );
+#if RESOLUTION_BASED_DPB
     subDpbIdx   = vps->getSubDpbAssigned( targetLsIdx, layerIdx );
+#else
+    subDpbIdx = layerIdx;
+#endif
   }
   // Assume that listOfPocs is sorted in increasing order - if not have to sort it.
@@ -1437 +1441 @@
     for(Int i = 0; i < vps->getNumLayersInIdList( targetLsIdx ); i++)
     {
+#if RESOUTION_BASED_DPB
       maxDpbLimit.m_numPicsInLayer[i] = vps->getMaxVpsLayerDecPicBuffMinus1( targetOutputLsIdx, i, highestTId ) + 1;
       maxDpbLimit.m_numPicsInSubDpb[vps->getSubDpbAssigned( targetLsIdx, i )] = vps->getMaxVpsDecPicBufferingMinus1( targetOutputLsIdx, vps->getSubDpbAssigned( targetLsIdx, i ), highestTId) + 1;
+#else
+      maxDpbLimit.m_numPicsInSubDpb[i] = vps->getMaxVpsDecPicBufferingMinus1( targetOutputLsIdx, i, highestTId) + 1;
+#endif
     }
     // -------------------------------------
@@ -1472 +1480 @@
   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;
@@ -1550 +1560 @@
   {
     dpbStatus.m_numPicsNotDisplayedInLayer[i] = listOfPocsInEachLayer[i].size();
+#if RESOLUTION_BASED_DPB
     dpbStatus.m_numPicsInSubDpb[vps->getSubDpbAssigned(targetLsIdx,i)] += dpbStatus.m_numPicsInLayer[i];
+#else
+    dpbStatus.m_numPicsInSubDpb[i] += dpbStatus.m_numPicsInLayer[i];
+#endif
   }
   assert( dpbStatus.m_numAUsNotDisplayed != -1 );