Changeset 743 in SHVCSoftware for branches

Timestamp:

25 Apr 2014, 18:23:25 (11 years ago)

Author:

seregin

Message:

fix compiler warning

File:

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

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

@@ -1282 +1282 @@
   // 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 )
   {
@@ -1292 +1294 @@
   {
     targetLsIdx = vps->getOutputLayerSetIdx( getCommonDecoderParams()->getTargetOutputLayerSetIdx() );
-#if RESOLUTION_BASED_DPB
     subDpbIdx   = vps->getSubDpbAssigned( targetLsIdx, layerIdx );
-#else
-    subDpbIdx = layerIdx;
-#endif
-  }
+  }
+#else
+  Int subDpbIdx = getCommonDecoderParams()->getTargetOutputLayerSetIdx() == 0 ? 0 : layerIdx;
+  TComVPS *vps = 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) )