Changeset 613 in SHVCSoftware for branches/SHM-5.1-dev/source/Lib/TLibDecoder

Timestamp:

12 Feb 2014, 02:02:26 (12 years ago)

Author:

sharp

Message:

19. Deshpande (Sharp) <sdeshpande@…>

JCTVC-P0155 signaling & inferrence for sps dpb parameters for nuh_layer_id > 0

Location:

branches/SHM-5.1-dev/source/Lib/TLibDecoder

Files:

• TDecCAVLC.cpp (modified) (2 diffs)
• TDecTop.cpp (modified) (1 diff)

branches/SHM-5.1-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -644 +644 @@
   assert(uiCode <= 12);
 
-  UInt subLayerOrderingInfoPresentFlag;
+#if SPS_DPB_PARAMS
+    if( pcSPS->getLayerId() == 0 )  {
+#endif
+    UInt subLayerOrderingInfoPresentFlag;
   READ_FLAG(subLayerOrderingInfoPresentFlag, "sps_sub_layer_ordering_info_present_flag");
 
@@ -667 +670 @@
     }
   }
-
+#if SPS_DPB_PARAMS
+    }
+    else
+    {
+        for(UInt i=0; i <= pcSPS->getMaxTLayers()-1; i++)
+        {
+            pcSPS->setMaxDecPicBuffering( parameterSetManager->getPrefetchedVPS(pcSPS->getVPSId())->getMaxVpsDecPicBufferingMinus1(  parameterSetManager->getPrefetchedVPS(pcSPS->getVPSId())->getTolsIdx(), pcSPS->getLayerId(), i)+1, i);
+        }
+    }
+#endif
   READ_UVLC( uiCode, "log2_min_coding_block_size_minus3" );
   Int log2MinCUSize = uiCode + 3;

branches/SHM-5.1-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -315 +315 @@
 #else
     m_iMaxRefPicNum = pcSlice->getVPS()->getMaxVpsDecPicBufferingMinus1( getCommonDecoderParams()->getTargetOutputLayerSetIdx(), pcSlice->getLayerId(), pcSlice->getTLayer() ) + 1; // m_uiMaxDecPicBuffering has the space for the picture currently being decoded
+#endif
+#if SPS_DPB_PARAMS
+      pcSlice->getVPS()->setTolsIdx(getCommonDecoderParams()->getTargetOutputLayerSetIdx());
 #endif
   }