The code under ALIGNED_BUMPING macro assumes that layer ID and layer index (within layer set) are identical. The code does not work when this assumption does not hold.

HM decoder needs VPS to decode the single layer stream.

1. add patch to support base layer bitstream extraction
2. add patch to keep VPS for output bitstream of rewriting process.

In SHM-5.1-dev r614, the DPB-parameters in SPS are inferred when they are not signalled for nuh_layer_id greater than 0. The following inference in TDecCavlc.cpp:parseSPS() is incorrect because the inference rule is dependent on which layer accesses the SPS; that information will be unavailable at the point of parsing the SPS and hence the following should not be included in parseSPS().

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);

}