Changeset 1047 in SHVCSoftware

Timestamp:

3 Mar 2015, 02:47:33 (10 years ago)

Author:

interdigital

Message:

1. change MAX_VPS_LAYER_ID_PLUS1 to MAX_VPS_LAYER_IDX_PLUS1
2. change layerId to layerIdx whenever layer index is used
3. replace mistakenly used layer ID with layer index

Location:

branches/SHM-dev/source/Lib/TLibDecoder

Files:

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

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

@@ -1070 +1070 @@
 #if SVC_EXTENSION
   assert( pcVPS->getNumHrdParameters() < MAX_VPS_LAYER_SETS_PLUS1 );
-  assert( pcVPS->getMaxLayerId()       < MAX_VPS_LAYER_ID_PLUS1 );
+  assert( pcVPS->getMaxLayerId()       < MAX_VPS_LAYER_IDX_PLUS1 );
   READ_CODE( 6, uiCode, "vps_max_layer_id" );           pcVPS->setMaxLayerId( uiCode );
 #if Q0078_ADD_LAYER_SETS
@@ -1660 +1660 @@
       Int   numRefLayerPics = 0;
       Int   i = 0;
-      Int   refLayerPicIdc  [MAX_VPS_LAYER_ID_PLUS1];
+      Int   refLayerPicIdc  [MAX_VPS_LAYER_IDX_PLUS1];
       for(i = 0, numRefLayerPics = 0;  i < pcSlice->getNumILRRefIdx(); i++ ) 
       {

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

@@ -1174 +1174 @@
 
 #if P0297_VPS_POC_LSB_ALIGNED_FLAG
-  UInt affectedLayerList[MAX_NUM_LAYER_IDS];
+  UInt affectedLayerList[MAX_LAYERS];
   Int  numAffectedLayers;
 
@@ -2870 +2870 @@
     decTop->setNumMotionPredRefLayers(0);
     decTop->setNumDirectRefLayers(0);
-    for(Int i = 0; i < MAX_VPS_LAYER_ID_PLUS1; i++)
+    for(Int i = 0; i < MAX_VPS_LAYER_IDX_PLUS1; i++)
     {
       decTop->setSamplePredEnabledFlag(i, false);
@@ -3298 +3298 @@
   }
 
-  for (UInt layer = 0; layer <= MAX_VPS_LAYER_ID_PLUS1 - 1; layer++)
+  for (UInt layer = 0; layer <= MAX_VPS_LAYER_IDX_PLUS1 - 1; layer++)
   {
     m_ppcTDecTop[layer]->m_smallestLayerId = smallestLayerId;

branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.h

@@ -149 +149 @@
 #if VPS_EXTN_DIRECT_REF_LAYERS
   Int                     m_numDirectRefLayers;
-  Int                     m_refLayerId[MAX_VPS_LAYER_ID_PLUS1];
+  Int                     m_refLayerId[MAX_VPS_LAYER_IDX_PLUS1];
   Int                     m_numSamplePredRefLayers;
-  Int                     m_samplePredRefLayerId[MAX_VPS_LAYER_ID_PLUS1];
+  Int                     m_samplePredRefLayerId[MAX_VPS_LAYER_IDX_PLUS1];
   Int                     m_numMotionPredRefLayers;
-  Int                     m_motionPredRefLayerId[MAX_VPS_LAYER_ID_PLUS1];
-  Bool                    m_samplePredEnabledFlag[MAX_VPS_LAYER_ID_PLUS1];
-  Bool                    m_motionPredEnabledFlag[MAX_VPS_LAYER_ID_PLUS1];
+  Int                     m_motionPredRefLayerId[MAX_VPS_LAYER_IDX_PLUS1];
+  Bool                    m_samplePredEnabledFlag[MAX_VPS_LAYER_IDX_PLUS1];
+  Bool                    m_motionPredEnabledFlag[MAX_VPS_LAYER_IDX_PLUS1];
 #endif
   TComPic*                m_cIlpPic[MAX_NUM_REF];                    ///<  Inter layer Prediction picture =  upsampled picture