Changeset 622 in 3DVCSoftware for trunk/source/Lib/TLibDecoder/TDecTop.cpp

Timestamp:

11 Sep 2013, 14:40:25 (12 years ago)

Author:

tech

Message:

Merged 8.0-dev0@621 (MV-HEVC 5 HLS).

File:

• trunk/source/Lib/TLibDecoder/TDecTop.cpp (modified) (15 diffs)

trunk/source/Lib/TLibDecoder/TDecTop.cpp

@@ -436 +436 @@
   Window defaultDisplayWindow = pcSlice->getSPS()->getVuiParametersPresentFlag() ? pcSlice->getSPS()->getVuiParameters()->getDefaultDisplayWindow() : Window();
 
+#if H_MV5
+#if H_MV
+    assert( conformanceWindow   .getScaledFlag() ); 
+    assert( defaultDisplayWindow.getScaledFlag() );
+#endif
+#endif
   for( Int temporalLayer=0; temporalLayer < MAX_TLAYER; temporalLayer++) 
   {
@@ -512 +518 @@
   m_cCuDecoder.destroy();        
 #if H_MV 
+#if H_MV5
+  TComSlice::markIvRefPicsAsShortTerm( m_refPicSetInterLayer0, m_refPicSetInterLayer1 );  
+#else
   TComSlice::markIvRefPicsAsShortTerm( m_refPicSetInterLayer );  
+#endif
   TComSlice::markCurrPic( pcPic ); 
   TComSlice::markIvRefPicsAsUnused   ( m_ivPicLists, targetDecLayerIdSet, m_parameterSetManagerDecoder.getActiveVPS(), m_layerId, poc ); 
@@ -581 +591 @@
   assert (sps != 0);
 
+#if H_MV5
+#if H_MV
+  TComVPS* vps = m_parameterSetManagerDecoder.getVPS(sps->getVPSId());
+  assert (vps != 0); 
+  if (false == m_parameterSetManagerDecoder.activatePPS(m_apcSlicePilot->getPPSId(),m_apcSlicePilot->isIRAP(), m_layerId ) )
+#else
   if (false == m_parameterSetManagerDecoder.activatePPS(m_apcSlicePilot->getPPSId(),m_apcSlicePilot->isIRAP()))
+#endif
+#else
+  if (false == m_parameterSetManagerDecoder.activatePPS(m_apcSlicePilot->getPPSId(),m_apcSlicePilot->isIRAP()))
+#endif
   {
     printf ("Parameter set activation failed!");
@@ -607 +627 @@
   m_apcSlicePilot->setSPS(sps);
 #if H_MV
+#if H_MV5
+  m_apcSlicePilot->setVPS(vps);  
+  sps->inferRepFormat  ( vps , m_layerId ); 
+  sps->inferScalingList( m_parameterSetManagerDecoder.getActiveSPS( sps->getSpsScalingListRefLayerId() ) ); 
+#else
   m_apcSlicePilot->setVPS( m_parameterSetManagerDecoder.getActiveVPS() );
+#endif
 #endif
   pps->setSPS(sps);
@@ -669 +695 @@
 
 #if H_MV
+#if H_MV5
+  m_apcSlicePilot->setRefPicSetInterLayer( & m_refPicSetInterLayer0, &m_refPicSetInterLayer1 ); 
+#else
   m_apcSlicePilot->setRefPicSetInterLayer( & m_refPicSetInterLayer ); 
+#endif
   m_apcSlicePilot->setLayerId( nalu.m_layerId );
 #endif
@@ -676 +706 @@
 #if H_MV  
   TComVPS* vps     = m_apcSlicePilot->getVPS();
+#if H_MV5
+  Int layerId  = nalu.m_layerId;   
+  setViewId   ( vps->getViewId   ( layerId )      );  
+#if H_3D
+  setViewIndex( vps->getViewIndex( layerId )      );  
+  setIsDepth  ( vps->getDepthId  ( layerId ) == 1 );  
+  m_ivPicLists->setVPS( vps ); 
+#endif
+#else
   Int layerIdInVps = vps->getLayerIdInVps( nalu.m_layerId );  
   setViewId   ( vps->getViewId   ( layerIdInVps )      );  
@@ -684 +723 @@
 #endif
 #endif
+#endif
     // Skip pictures due to random access
     if (isRandomAccessSkipPicture(iSkipFrame, iPOCLastDisplay))
@@ -723 +763 @@
 #endif
   // actual decoding starts here
+#if H_MV5
+#if H_MV
+   // This part needs further testing !
+   if ( m_apcSlicePilot->getPocResetFlag() )
+   {   
+     xResetPocInPicBuffer();
+   }
+#endif
+#endif
   xActivateParameterSets();
 
@@ -742 +791 @@
     m_apcSlicePilot->applyReferencePictureSet(m_cListPic, m_apcSlicePilot->getRPS());
 #if H_MV
+#if H_MV5
+    m_apcSlicePilot->createInterLayerReferencePictureSet( m_ivPicLists, m_refPicSetInterLayer0, m_refPicSetInterLayer1 ); 
+#else
     m_apcSlicePilot->createAndApplyIvReferencePictureSet( m_ivPicLists, m_refPicSetInterLayer ); 
+#endif
 #endif
     //  Get a new picture buffer
@@ -888 +941 @@
     // Set reference list
 #if H_MV    
+#if H_MV5
+    std::vector< TComPic* > tempRefPicLists[2];
+    std::vector< Bool     > usedAsLongTerm [2];
+    Int       numPocTotalCurr;
+
+    pcSlice->getTempRefPicLists( m_cListPic, m_refPicSetInterLayer0, m_refPicSetInterLayer1, tempRefPicLists, usedAsLongTerm, numPocTotalCurr);
+    pcSlice->setRefPicList     ( tempRefPicLists, usedAsLongTerm, numPocTotalCurr, true ); 
+#else
     pcSlice->setRefPicList( m_cListPic, m_refPicSetInterLayer, true );    
+#endif
 #if H_3D_ARP
     pcSlice->setARPStepNum();
     if( pcSlice->getARPStepNum() > 1 )
     {
+      // GT: This seems to be broken, not all nuh_layer_ids are necessarily present
       for(Int iLayerId = 0; iLayerId < nalu.m_layerId; iLayerId ++ )
       {
@@ -1021 +1084 @@
   TComVPS* vps = m_parameterSetManagerDecoder.getPrefetchedVPS( 0 ); 
   assert( vps != 0 ); 
+#if H_MV5
+  m_cEntropyDecoder.decodeSPS( sps, vps->getViewIndex( m_layerId ), ( vps->getDepthId( m_layerId ) == 1 ) );
+#else
   Int layerIdInVPS = vps->getLayerIdInVps( m_layerId ); 
   m_cEntropyDecoder.decodeSPS( sps, vps->getViewIndex( layerIdInVPS ), ( vps->getDepthId( layerIdInVPS ) == 1 ) );
+#endif
 #else
   m_cEntropyDecoder.decodeSPS( sps );
@@ -1032 +1099 @@
 {
   TComPPS* pps = new TComPPS();
+#if H_MV5
+#if H_MV
+  pps->setLayerId( getLayerId() ); 
+#endif
+#endif
   m_cEntropyDecoder.decodePPS( pps );
   m_parameterSetManagerDecoder.storePrefetchedPPS( pps );
@@ -1040 +1112 @@
   if(nalUnitType == NAL_UNIT_SUFFIX_SEI)
   {
+#if H_MV5
+#if H_MV
+    m_seiReader.parseSEImessage( bs, m_pcPic->getSEIs(), nalUnitType, m_parameterSetManagerDecoder.getActiveSPS( m_layerId ) );
+#else
     m_seiReader.parseSEImessage( bs, m_pcPic->getSEIs(), nalUnitType, m_parameterSetManagerDecoder.getActiveSPS() );
+#endif
+#else
+    m_seiReader.parseSEImessage( bs, m_pcPic->getSEIs(), nalUnitType, m_parameterSetManagerDecoder.getActiveSPS() );  
+#endif
   }
   else
   {
+#if H_MV5
+#if H_MV
+    m_seiReader.parseSEImessage( bs, m_SEIs, nalUnitType, m_parameterSetManagerDecoder.getActiveSPS( m_layerId ) );
+#else
     m_seiReader.parseSEImessage( bs, m_SEIs, nalUnitType, m_parameterSetManagerDecoder.getActiveSPS() );
+#endif
+#else
+    m_seiReader.parseSEImessage( bs, m_SEIs, nalUnitType, m_parameterSetManagerDecoder.getActiveSPS() );
+#endif
     SEIMessages activeParamSets = getSeisByType(m_SEIs, SEI::ACTIVE_PARAMETER_SETS);
     if (activeParamSets.size()>0)
@@ -1051 +1139 @@
       m_parameterSetManagerDecoder.applyPrefetchedPS();
       assert(seiAps->activeSeqParamSetId.size()>0);
+#if H_MV5
+#if H_MV
+      if (! m_parameterSetManagerDecoder.activateSPSWithSEI(seiAps->activeSeqParamSetId[0], m_layerId ))
+#else
       if (! m_parameterSetManagerDecoder.activateSPSWithSEI(seiAps->activeSeqParamSetId[0] ))
+#endif
+#else
+      if (! m_parameterSetManagerDecoder.activateSPSWithSEI(seiAps->activeSeqParamSetId[0] ))
+#endif
       {
         printf ("Warning SPS activation with Active parameter set SEI failed");
@@ -1210 +1306 @@
 }
 
+#if H_MV5
+Void TDecTop::xResetPocInPicBuffer()
+{
+  TComList<TComPic*>::iterator  iterPic   = m_cListPic.begin();
+  while (iterPic != m_cListPic.end())
+  {
+    TComPic* pic = *(iterPic++);
+    if ( pic->getReconMark() )
+    {
+      for( Int i = 0; i < pic->getNumAllocatedSlice(); i++)
+      {
+        TComSlice* slice = pic->getSlice( i ); 
+        slice->setPOC ( slice->getPOC() - m_apcSlicePilot->getPocBeforeReset() );            
+      }         
+    }     
+  }
+}
+#endif
 #endif
 //! \}