Changeset 973 in 3DVCSoftware for branches/HTM-11.1-dev0/source/App/TAppDecoder/TAppDecTop.h

Timestamp:

6 Jul 2014, 04:44:14 (10 years ago)

Author:

tech

Message:

Cleanup part 7.

File:

• branches/HTM-11.1-dev0/source/App/TAppDecoder/TAppDecTop.h (modified) (3 diffs)

branches/HTM-11.1-dev0/source/App/TAppDecoder/TAppDecTop.h

@@ -68 +68 @@
   TComPicLists                    m_ivPicLists;                                ///< picture buffers of decoder instances
   Bool                            m_layerInitilizedFlags[ MAX_NUM_LAYER_IDS ]; ///< for layerwise startup 
-#if H_MV_HLS_7_VPS_P0300_27
   TComVPS*                        m_vps;                                ///< active VPS
-#endif
 #else
   TDecTop                         m_cTDecTop;                     ///< decoder class
@@ -79 +77 @@
   Int                             m_pocLastDisplay      [ MAX_NUM_LAYERS ]; ///< last POC in display order
   Bool                            m_reconOpen           [ MAX_NUM_LAYERS ]; ///< reconstruction file opened
+  Bool                            m_markedForOutput; 
 #else
   Int                             m_iPOCLastDisplay;              ///< last POC in display order
 #endif
-#if H_MV_HLS_7_VPS_P0300_27
-  Bool                            m_markedForOutput; 
-#endif
-
 
 #if H_3D
@@ -107 +102 @@
   Void  xWriteOutput      ( TComList<TComPic*>* pcListPic, Int layerId, Int tId ); ///< write YUV to file
 
-#if H_MV_HLS_7_VPS_P0300_27
   Void  xMarkForOutput   ( Bool allLayersDecoded, Int pocLastPic, Int layerIdLastPic );         
-  Void  xMarkAltOutPic    ( Int targetOutputLayer, Int pocLastPic )
-  {
-    Int optLayerIdxInVps = m_vps->getLayerIdInNuh( targetOutputLayer ); 
-    Int highestNuhLayerId = -1; 
-    TComPic* picWithHighestNuhLayerId = NULL; 
-    for (Int dIdx = 0; dIdx < m_numDecoders; dIdx++)
-    {
-      Int curLayerId = m_tDecTop[dIdx]->getLayerId();
-      Int curLayerIdxInVps = m_vps->getLayerIdInNuh( curLayerId  ); 
-      if ( m_vps->getInDirectDependencyFlag(optLayerIdxInVps, curLayerIdxInVps ) )
-      {
-        TComPic* curPic = m_ivPicLists.getPic( curLayerId, pocLastPic ); 
-        if (curPic != NULL)
-        {
-          if (curPic->getReconMark() && curPic->getPicOutputFlag() )
-          {
-            curPic->setOutputMark   ( false ); 
-            curPic->setPicOutputFlag( false ); 
-            if ( curLayerId > highestNuhLayerId)
-            {
-              highestNuhLayerId = curLayerId ; 
-              picWithHighestNuhLayerId = curPic; 
-            }            
-          }
-        }
-      }
-    }
-    if ( picWithHighestNuhLayerId != NULL )
-    {
-      picWithHighestNuhLayerId->setPicOutputFlag(true); 
-      picWithHighestNuhLayerId->setOutputMark   (true); 
-    }
-  }
-#endif
+  Void  xMarkAltOutPic    ( Int targetOutputLayer, Int pocLastPic );
 
   Void  xFlushOutput      ( TComList<TComPic*>* pcListPic, Int layerId ); ///< flush all remaining decoded pictures to file