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

Timestamp:

28 Jul 2014, 21:49:13 (10 years ago)

Author:

qualcomm

Message:

Bug-fix in DPB operation for decoding single layer bitstream.

From: Adarsh K. Ramasubramonian <aramasub@…>

Location:

branches/SHM-dev/source/App/TAppDecoder

Files:

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

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

@@ -1160 +1160 @@
     pic->getPicYuvRec()->setBorderExtension( false );
 
+#if RESOLUTION_BASED_DPB
     dpbStatus.m_numPicsInLayer[layerIdx]--;
+#endif
+    dpbStatus.m_numPicsInSubDpb[layerIdx]--;
   }
 }
@@ -1393 +1396 @@
       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 );
   }
@@ -1541 +1546 @@
           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
@@ -1566 +1575 @@
 #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

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

@@ -135 +135 @@
   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
   Bool m_maxLatencyIncrease;
@@ -152 +154 @@
     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) );