Changeset 579 in SHVCSoftware for branches/SHM-5.0-dev/source/App

Timestamp:

29 Jan 2014, 02:55:53 (11 years ago)

Author:

qualcomm

Message:

Change indexing of NumSubDpbs (Macro: CHANGE_NUMSUBDPB_IDX)

Change indexing of NumSubDpbs from output layer set to layer set, to be aligned with the Spec.

From: Adarsh K. Ramasubramonian <aramasub@…>

File:

• branches/SHM-5.0-dev/source/App/TAppEncoder/TAppEncTop.cpp (modified) (3 diffs)

branches/SHM-5.0-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -1181 +1181 @@
   for(i = 1; i < vps->getNumOutputLayerSets(); i++)
   {
+#if CHANGE_NUMSUBDPB_IDX
+    Int layerSetIdxForOutputLayerSet = vps->getOutputLayerSetIdx( i );
+#endif
     Int layerSetId = vps->getOutputLayerSetIdx(i);
 
@@ -1191 +1194 @@
 
       Int maxNumReorderPics = -1;
+#if CHANGE_NUMSUBDPB_IDX
+      for(Int k = 0; k < vps->getNumSubDpbs(layerSetIdxForOutputLayerSet); k++)
+#else
       for(Int k = 0; k < vps->getNumSubDpbs(i); k++)
+#endif
       {
         Int layerId = vps->getLayerSetLayerIdList(layerSetId, k); // k-th layer in the output layer set
@@ -1208 +1215 @@
                                       // then will be continue to be false - i.e. the j-th sub-layer DPB info is not signaled
         checkFlagInner[j] |= ( maxNumReorderPics != vps->getMaxVpsNumReorderPics(i, j - 1) );
+#if CHANGE_NUMSUBDPB_IDX
+        for(Int k = 0; k < vps->getNumSubDpbs(layerSetIdxForOutputLayerSet) && !checkFlagInner[j]; k++)  // If checkFlagInner[j] is true, break and signal the values
+#else
         for(Int k = 0; k < vps->getNumSubDpbs(i) && !checkFlagInner[j]; k++)  // If checkFlagInner[j] is true, break and signal the values
+#endif
         {
           checkFlagInner[j] |= ( vps->getMaxVpsDecPicBufferingMinus1(i, k, j - 1) != vps->getMaxVpsDecPicBufferingMinus1(i, k, j) );