Changeset 1524 in SHVCSoftware for branches/SHM-dev/source/App/TAppDecoder

Timestamp:

3 Feb 2016, 23:00:44 (9 years ago)

Author:

seregin

Message:

fix target layer Id assignment, ticket #97

Location:

branches/SHM-dev/source/App/TAppDecoder

Files:

• TAppDecCfg.cpp (modified) (1 diff)
• TAppDecTop.cpp (modified) (9 diffs)

branches/SHM-dev/source/App/TAppDecoder/TAppDecCfg.cpp

@@ -170 +170 @@
   if( targetLayerId < 0 )
   {
-    targetLayerId = layerNum - 1;
+    targetLayerId = MAX_VPS_LAYER_IDX_PLUS1 - 1;
   }
 

branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp

@@ -91 +91 @@
   for(Int i = 0; i < MAX_VPS_LAYER_IDX_PLUS1; i++ )
 #else
-  for( Int i = 0; i <= m_tgtLayerId; i++ )
+  for( Int i = 0; i <= m_commonDecoderParams.getTargetLayerId(); i++ )
 #endif
   {
@@ -179 +179 @@
   for(UInt layer = 0; layer < MAX_VPS_LAYER_IDX_PLUS1; layer++)
 #else
-  for(UInt layer=0; layer<=m_tgtLayerId; layer++)
+  for(UInt layer=0; layer <= m_commonDecoderParams.getTargetLayerId(); layer++)
 #endif
   {
@@ -234 +234 @@
       read(nalu);
 
-#if SVC_EXTENSION
       // ignore any NAL units with nuh_layer_id == 63
       if( nalu.m_nuhLayerId == 63 )
@@ -241 +240 @@
         continue;
       }
-#endif
-
-      if( (m_iMaxTemporalLayer >= 0 && nalu.m_temporalId > m_iMaxTemporalLayer) || !isNaluWithinTargetDecLayerIdSet(&nalu)  ||
-#if CONFORMANCE_BITSTREAM_MODE
-        (nalu.m_nuhLayerId > m_commonDecoderParams.getTargetLayerId()) )
-#else
-        (nalu.m_nuhLayerId > m_tgtLayerId) )
-#endif
+
+      if( (m_iMaxTemporalLayer >= 0 && nalu.m_temporalId > m_iMaxTemporalLayer) || !isNaluWithinTargetDecLayerIdSet(&nalu) || nalu.m_nuhLayerId > m_commonDecoderParams.getTargetLayerId() )
       {
         bNewPicture = false;
@@ -422 +415 @@
   for(UInt layer = layerIdxmin; layer < MAX_VPS_LAYER_IDX_PLUS1; layer++)
 #else
-  for(UInt layer = layerIdxmin; layer <= m_tgtLayerId; layer++)
-#endif
-#else
-  for(UInt layer = 0; layer <= m_tgtLayerId; layer++)
+  for(UInt layer = layerIdxmin; layer <= m_commonDecoderParams.getTargetLayerId(); layer++)
+#endif
+#else
+  for(UInt layer = 0; layer <= m_commonDecoderParams.getTargetLayerId(); layer++)
 #endif
   {
@@ -583 +576 @@
   for(UInt layer = 0; layer < MAX_VPS_LAYER_IDX_PLUS1; layer++)
 #else
-  for(UInt layer = 0; layer <= m_tgtLayerId; layer++)
+  for(UInt layer = 0; layer <= m_commonDecoderParams.getTargetLayerId(); layer++)
 #endif
   {
@@ -612 +605 @@
   for(UInt layer = 0; layer < MAX_VPS_LAYER_IDX_PLUS1; layer++)
 #else
-  for(UInt layer = 0; layer <= m_tgtLayerId; layer++)
+  for(UInt layer = 0; layer <= m_commonDecoderParams.getTargetLayerId(); layer++)
 #endif
   {
@@ -646 +639 @@
   for(UInt layer = 0; layer < MAX_VPS_LAYER_IDX_PLUS1; layer++)
 #else
-  for(UInt layer = 0; layer <= m_tgtLayerId; layer++)
+  for(UInt layer = 0; layer <= m_commonDecoderParams.getTargetLayerId(); layer++)
 #endif
   {
@@ -665 +658 @@
 #if SVC_EXTENSION  
 #if CONFORMANCE_BITSTREAM_MODE
-    m_cTDecTop.setNumLayer( MAX_LAYERS );
-#else
-    m_cTDecTop.setNumLayer( m_tgtLayerId + 1 );
+    m_cTDecTop.setConfModeFlag( m_confModeFlag );
 #endif
     m_cTDecTop.setCommonDecoderParams( &m_commonDecoderParams );
-    m_cTDecTop.setConfModeFlag( m_confModeFlag );
   }
 #endif