Changeset 549 in SHVCSoftware for branches/SHM-5.0-dev/source/Lib/TLibDecoder

Timestamp:

21 Jan 2014, 03:57:34 (11 years ago)

Author:

seregin

Message:

set MAX_LAYERS to 8, should be lossless

Location:

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

Files:

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

branches/SHM-5.0-dev/source/Lib/TLibDecoder/TDecGop.cpp

@@ -234 +234 @@
   //-- For time output for each slice
 #if SVC_EXTENSION
-  printf("\nPOC %4d LId: %1d TId: %1d ( %c-SLICE, QP%3d ) ", pcSlice->getPOC(),
+  printf("\nPOC %4d LId: %1d TId: %1d ( %c-SLICE %s, QP%3d ) ", pcSlice->getPOC(),
                                                     rpcPic->getLayerId(),
                                                     pcSlice->getTLayer(),
                                                     c,
+                                                    NaluToStr( pcSlice->getNalUnitType() ).data(),
                                                     pcSlice->getSliceQp() );
 #else

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

@@ -196 +196 @@
     if (m_cIlpPic[0] == NULL)
     {
-      for (Int j=0; j < MAX_LAYERS /*MAX_NUM_REF*/; j++)  // consider to set to NumDirectRefLayers[LayerIdInVps[nuh_layer_id]]
+      for (Int j=0; j < m_numDirectRefLayers; j++)
       {
 
@@ -2038 +2038 @@
 {
   CommonDecoderParams* params = this->getCommonDecoderParams();
+
+  assert( params->getTargetLayerId() < vps->getMaxLayers() );
+
   if( params->getValueCheckedFlag() )
   {