Changeset 1084 in 3DVCSoftware for trunk/source/App/TAppDecoder

Timestamp:

24 Oct 2014, 11:44:58 (10 years ago)

Author:

tech

Message:

Merged branches/HTM-12.1-dev0@1083.

Location:

trunk/source/App/TAppDecoder

Files:

• TAppDecCfg.cpp (modified) (1 diff)
• TAppDecCfg.h (modified) (1 diff)
• TAppDecTop.cpp (modified) (3 diffs)

trunk/source/App/TAppDecoder/TAppDecCfg.cpp

@@ -95 +95 @@
   ("RespectDefDispWindow,w", m_respectDefDispWindow, 0, "Only output content inside the default display window\n")
 #if H_MV
-#if H_MV_HLS10_GEN_FIX
   ("OutputVpsInfo,v", m_outputVpsInfo, false, "Output information about the layer dependencies and layer sets")
-#endif
 #endif
   ;

trunk/source/App/TAppDecoder/TAppDecCfg.h

@@ -80 +80 @@
 
 #if H_MV
-#if H_MV_HLS10_GEN_FIX
   Bool          m_outputVpsInfo;                     ///< Output VPS information 
-#endif
   Void xAppendToFileNameEnd( Char* pchInputFileName, const Char* pchStringToAppend, Char*& rpchOutputFileName); ///< create filenames
 #endif

trunk/source/App/TAppDecoder/TAppDecTop.cpp

@@ -257 +257 @@
             m_targetDecLayerIdSet = vps->getTargetDecLayerIdList( m_targetOptLayerSetIdx ); 
           }
-#if H_MV_HLS10_GEN_FIX
           if (m_outputVpsInfo )
           {
-#if H_MV_HLS10_AUX
             m_vps->printScalabilityId();
-#endif
             m_vps->printLayerDependencies();
             m_vps->printLayerSets();
             m_vps->printPTL(); 
           }
-#endif
         }
 #if H_3D
@@ -580 +576 @@
   Int dpbFullness = 0;
 #if H_MV
-#if H_MV_HLS10_ADD_LAYERSETS
   TComSPS* activeSPS = m_tDecTop[ decIdx ]->getActiveSPS();
-#else
-  // preliminary fix
-  TComSPS* activeSPS = m_tDecTop[0]->getActiveSPS();
-#endif
 #else
   TComSPS* activeSPS = m_cTDecTop.getActiveSPS();
@@ -1155 +1146 @@
     Int curLayerId = m_tDecTop[dIdx]->getLayerId();
     Int curLayerIdxInVps = m_vps->getLayerIdInNuh( curLayerId  ); 
-#if H_MV_HLS10_REF_PRED_LAYERS
     if ( m_vps->getDependencyFlag(optLayerIdxInVps, curLayerIdxInVps ) )
-#else
-    if ( m_vps->getInDirectDependencyFlag(optLayerIdxInVps, curLayerIdxInVps ) )
-#endif
     {
       TComPic* curPic = m_ivPicLists.getPic( curLayerId, pocLastPic );