Changeset 1057 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon/TComPrediction.cpp

Timestamp:

4 Mar 2015, 09:55:40 (10 years ago)

Author:

seregin

Message:

revert back using layerIdx for m_ppcTEncTop, fix RefLayerId settings and related

File:

• branches/SHM-dev/source/Lib/TLibCommon/TComPrediction.cpp (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibCommon/TComPrediction.cpp

@@ -599 +599 @@
       // It is a requirement of bitstream conformance that when the reference picture represented by the variable refIdxLX is an inter-layer reference picture, 
       // VpsInterLayerSamplePredictionEnabled[ LayerIdxInVps[ currLayerId ] ][ LayerIdxInVps[ rLId ] ] shall be equal to 1, where rLId is set equal to nuh_layer_id of the inter-layer picture
-      assert( pcCU->getSlice()->getVPS()->isSamplePredictionType( pcCU->getLayerId(), refPic->getLayerId() ) );
+      assert( pcCU->getSlice()->getVPS()->isSamplePredictionType( pcCU->getLayerIdx(), refPic->getLayerIdx() ) );
 
 #if REF_IDX_ME_ZEROMV