Changeset 1008 in SHVCSoftware

Timestamp:

28 Jan 2015, 19:12:58 (10 years ago)

Author:

seregin

Message:

port the fix for the ticket #58 (rev 1007)

Location:

branches/SHM-upgrade/source

Files:

• App/TAppDecoder/TAppDecCfg.cpp (modified) (1 diff)
• Lib/TLibDecoder/TDecTop.cpp (modified) (6 diffs)

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

@@ -206 +206 @@
   }
 #endif
-  this->getCommonDecoderParams()->setTargetOutputLayerSetIdx( olsIdx       );
-  this->getCommonDecoderParams()->setTargetLayerId    ( m_tgtLayerId );
+  m_commonDecoderParams.setTargetOutputLayerSetIdx( olsIdx );
+  m_commonDecoderParams.setTargetLayerId( m_tgtLayerId );
 #endif
 #if FIX_CONF_MODE

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

@@ -851 +851 @@
       assert(layerIdx > m_apcSlicePilot->getVPS()->getVpsNumLayerSetsMinus1());
     }
-  }
-  if (m_apcSlicePilot->getVPS()->getNumAddLayerSets() == 0)
-  {
-    checkValueOfTargetOutputLayerSetIdx(m_apcSlicePilot->getVPS());
-  }
+  }  
 #else
   checkValueOfTargetOutputLayerSetIdx( m_apcSlicePilot->getVPS());
@@ -2304 +2300 @@
   m_cEntropyDecoder.decodeVPS( vps );
   m_parameterSetManagerDecoder.storePrefetchedVPS(vps);
+#if R0235_SMALLEST_LAYER_ID
+  checkValueOfTargetOutputLayerSetIdx(vps);
+#endif
 }
 
@@ -3031 +3030 @@
   {
     // Check if the target decoded layer is the highest layer in the list
+#if R0235_SMALLEST_LAYER_ID
+    assert( params->getTargetOutputLayerSetIdx() < vps->getNumOutputLayerSets() );
+#endif
 #if !CONFORMANCE_BITSTREAM_MODE
     assert( params->getTargetOutputLayerSetIdx() < vps->getNumLayerSets() );
@@ -3038 +3040 @@
     assert( params->getTargetLayerId() == vps->getNumLayersInIdList( layerSetIdx ) - 1);
 #endif
-
+    
+#if !R0235_SMALLEST_LAYER_ID
     Bool layerSetMatchFlag = true;
     for(Int j = 0; j < vps->getNumLayersInIdList( layerSetIdx ); j++)
@@ -3050 +3053 @@
 
     assert(layerSetMatchFlag);    // Signaled output layer set index does not match targetOutputLayerId.
+#endif
     
     // Check if the targetdeclayerIdlist matches the output layer set
@@ -3239 +3243 @@
 {
   UInt smallestLayerId;
-  UInt targetOlsIdx = getCommonDecoderParams()->getTargetOutputLayerSetIdx();
+  Int  targetOlsIdx = m_commonDecoderParams->getTargetOutputLayerSetIdx();
+  assert( targetOlsIdx >= 0 );
+
   UInt targetDecLayerSetIdx = vps->getOutputLayerSetIdx(targetOlsIdx);
   UInt lsIdx = targetDecLayerSetIdx;