Changeset 1076 in 3DVCSoftware for branches/HTM-12.1-dev0/source/App

Timestamp:

21 Oct 2014, 21:25:42 (10 years ago)

Author:

tech

Message:

Removed MV-HEVC related macros part 2.

Location:

branches/HTM-12.1-dev0/source/App

Files:

• TAppDecoder/TAppDecCfg.cpp (modified) (1 diff)
• TAppDecoder/TAppDecCfg.h (modified) (1 diff)
• TAppDecoder/TAppDecTop.cpp (modified) (3 diffs)
• TAppEncoder/TAppEncCfg.cpp (modified) (26 diffs)
• TAppEncoder/TAppEncCfg.h (modified) (8 diffs)
• TAppEncoder/TAppEncTop.cpp (modified) (31 diffs)
• TAppEncoder/TAppEncTop.h (modified) (3 diffs)

branches/HTM-12.1-dev0/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
   ;

branches/HTM-12.1-dev0/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

branches/HTM-12.1-dev0/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 ); 

branches/HTM-12.1-dev0/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -241 +241 @@
   {"main-still-picture", Profile::MAINSTILLPICTURE},
 #if H_MV
-#if H_MV_HLS10_PTL
   {"multiview-main", Profile::MULTIVIEWMAIN},
 #if H_3D
@@ -247 +246 @@
 #endif
 
-#else
-  {"main-stereo",    Profile::MAINSTEREO},
-  {"main-multiview", Profile::MAINMULTIVIEW},
-#if H_3D
-  {"main-3d"    , Profile::MAIN3D},
-#endif
-#endif
 #endif
 };
@@ -341 +333 @@
 #if H_MV
   vector<Int>   cfg_dimensionLength; 
-#if H_MV_HLS10_PTL
   string        cfg_profiles;
   string        cfg_levels; 
   string        cfg_tiers; 
-#endif
 #if H_3D 
   cfg_dimensionLength.push_back( 2  );  // depth
@@ -380 +370 @@
   ("NumberOfLayers",        m_numberOfLayers     , 1,                     "Number of layers")
 #if !H_3D
-#if H_MV_HLS10_AUX
   ("ScalabilityMask",       m_scalabilityMask    , 2                    , "Scalability Mask: 2: Multiview, 8: Auxiliary, 10: Multiview + Auxiliary")    
-#else
-  ("ScalabilityMask",       m_scalabilityMask    , 2                    , "Scalability Mask")    
-#endif
 #else
   ("ScalabilityMask",       m_scalabilityMask    , 3                    , "Scalability Mask, 1: Texture 3: Texture + Depth ")    
@@ -391 +377 @@
   ("ViewOrderIndex",        m_viewOrderIndex     , std::vector<Int>(1,0), "View Order Index per layer")
   ("ViewId",                m_viewId             , std::vector<Int>(1,0), "View Id per View Order Index")
-#if H_MV_HLS10_AUX
   ("AuxId",                 m_auxId              , std::vector<Int>(1,0), "AuxId per layer")
-#endif
 #if H_3D
   ("DepthFlag",             m_depthFlag          , std::vector<Int>(1,0), "Depth Flag")
@@ -406 +390 @@
 #endif
 #endif
-#if H_MV_HLS10_GEN_FIX
   ("TargetEncLayerIdList",  m_targetEncLayerIdList, std::vector<Int>(0,0), "LayerIds in Nuh to be encoded")  
-#endif
   ("LayerIdInNuh",          m_layerIdInNuh       , std::vector<Int>(1,0), "LayerId in Nuh")  
   ("SplittingFlag",         m_splittingFlag      , false                , "Splitting Flag")    
@@ -415 +397 @@
   ("VpsNumLayerSets",       m_vpsNumLayerSets    , 1                    , "Number of layer sets")    
   ("LayerIdsInSet_%d",      m_layerIdsInSets     , std::vector<Int>(1,0), MAX_VPS_OP_SETS_PLUS1 ,"LayerIds of Layer set")  
-#if H_MV_HLS10_ADD_LAYERSETS
   ("NumAddLayerSets"     , m_numAddLayerSets     , 0                                              , "NumAddLayerSets     ")
   ("HighestLayerIdxPlus1_%d", m_highestLayerIdxPlus1, std::vector< Int  >(0,0)  ,MAX_VPS_NUM_ADD_LAYER_SETS, "HighestLayerIdxPlus1")
-#endif
   ("DefaultTargetOutputLayerIdc"     , m_defaultOutputLayerIdc     , 0, "Specifies output layers of layer sets, 0: output all layers, 1: output highest layer, 2: specified by LayerIdsInDefOutputLayerSet")
   ("OutputLayerSetIdx",     m_outputLayerSetIdx  , std::vector<Int>(0,0), "Indices of layer sets used as additional output layer sets")  
@@ -426 +406 @@
   ("AltOutputLayerFlag",    m_altOutputLayerFlag , std::vector<Bool>(1,0), "Alt output layer flag")
   
-#if H_MV_HLS10_PTL
   ("ProfileTierLevelIdx_%d",  m_profileTierLevelIdx, std::vector<Int>(0), MAX_NUM_LAYERS, "Indices to profile level tier for ols")
-#else
-  ("ProfileLevelTierIdx",   m_profileLevelTierIdx, std::vector<Int>(1,0), "Indices to profile level tier")
-#endif
   // Layer dependencies
   ("DirectRefLayers_%d",    m_directRefLayers    , std::vector<Int>(0,0), MAX_NUM_LAYERS, "LayerIds of direct reference layers")
@@ -460 +436 @@
   
   // Profile and level
-#if H_MV_HLS10_PTL
   ("Profile", cfg_profiles,   string(""),           "Profile in VpsProfileTierLevel (Indication only)")
   ("Level",   cfg_levels ,    string(""),           "Level indication in VpsProfileTierLevel (Indication only)")
   ("Tier",    cfg_tiers  ,    string(""),           "Tier indication in VpsProfileTierLevel (Indication only)")
   ("InblFlag",m_inblFlag ,    std::vector<Bool>(0), "InblFlags in VpsProfileTierLevel (Indication only)" )
-#else
-  ("Profile", m_profile,   Profile::NONE, "Profile to be used when encoding (Incomplete)")
-  ("Level",   m_level,     Level::NONE,   "Level limit to be used, eg 5.1 (Incomplete)")
-  ("Tier",    m_levelTier, Level::MAIN,   "Tier to use for interpretation of --Level")
-#endif
   ("ProgressiveSource", m_progressiveSourceFlag, false, "Indicate that source is progressive")
   ("InterlacedSource",  m_interlacedSourceFlag,  false, "Indicate that source is interlaced")
@@ -648 +618 @@
 #endif
 #if H_MV
-#if H_MV_HLS10_GEN_FIX
 // A lot of this stuff could should actually be derived by the encoder.
-#endif // H_MV_HLS10_GEN
   // VPS VUI
   ("VpsVuiPresentFlag"           , m_vpsVuiPresentFlag           , false                                           , "VpsVuiPresentFlag           ")
@@ -674 +642 @@
   ("CtuBasedOffsetEnabledFlag"   , m_ctuBasedOffsetEnabledFlag   , std::vector< Bool >(1,0)  ,MAX_NUM_LAYERS       , "CtuBasedOffsetEnabledFlag    per direct reference for the N-th layer")
   ("MinHorizontalCtuOffsetPlus1" , m_minHorizontalCtuOffsetPlus1 , std::vector< Int  >(1,0)  ,MAX_NUM_LAYERS       , "MinHorizontalCtuOffsetPlus1  per direct reference for the N-th layer")
-#if H_MV_HLS10_VPS_VUI
   ("SingleLayerForNonIrapFlag", m_singleLayerForNonIrapFlag, false                                          , "SingleLayerForNonIrapFlag")
   ("HigherLayerIrapSkipFlag"  , m_higherLayerIrapSkipFlag  , false                                          , "HigherLayerIrapSkipFlag  ")
-#endif
 #endif
 
@@ -784 +750 @@
   ("SEISubBitstreamMaxBitRate",               m_sbPropMaxBitRate,             std::vector< Int  >(1,0)  ,"Specifies maximum bit rate of the i-th sub-bitstream")
 
-#if H_MV_HLS10_GEN_FIX
   ("OutputVpsInfo",                           m_outputVpsInfo,                false                     ,"Output information about the layer dependencies and layer sets")
-#endif
 #endif
 #if H_3D
@@ -1073 +1037 @@
   }
   m_iNumberOfViews = (Int) uniqueViewOrderIndices.size(); 
-#if H_MV_HLS10_AUX
   xResizeVector( m_auxId );
-#endif
 
 #if H_3D
@@ -1109 +1071 @@
   xResizeVector( m_wppInUseFlag ); 
 
-#if H_MV_HLS10_ADD_LAYERSETS
   for (Int olsIdx = 0; olsIdx < m_vpsNumLayerSets + m_numAddLayerSets + (Int) m_outputLayerSetIdx.size(); olsIdx++)
-#else
-  for (Int olsIdx = 0; olsIdx < m_vpsNumLayerSets + (Int) m_outputLayerSetIdx.size(); olsIdx++)
-#endif
   {    
     m_altOutputLayerFlag.push_back( false );      
@@ -1225 +1183 @@
 
 #if H_MV
-#if H_MV_HLS10_PTL
   // parse PTL
   Bool anyEmpty = false; 
@@ -1272 +1229 @@
   xReadStrToEnum( cfg_levels,   m_level     ); 
   xReadStrToEnum( cfg_tiers ,   m_levelTier ); 
-#endif
 #endif
 #if H_3D
@@ -1390 +1346 @@
 
 
-#if !H_MV_HLS10_PTL
-  if( m_profile==Profile::NONE )
-  {
-    fprintf(stderr, "***************************************************************************\n");
-    fprintf(stderr, "** WARNING: For conforming bitstreams a valid Profile value must be set! **\n");
-    fprintf(stderr, "***************************************************************************\n");
-  }
-  if( m_level==Level::NONE )
-  {
-    fprintf(stderr, "***************************************************************************\n");
-    fprintf(stderr, "** WARNING: For conforming bitstreams a valid Level value must be set!   **\n");
-    fprintf(stderr, "***************************************************************************\n");
-  }
-#endif
 
   Bool check_failed = false; /* abort if there is a fatal configuration problem */
@@ -1422 +1364 @@
   xConfirmPara( m_scalabilityMask != 2 && m_scalabilityMask != 3, "Scalability Mask must be equal to 2 or 3. ");
 #else
-#if H_MV_HLS10_AUX
   xConfirmPara( m_scalabilityMask != 2 && m_scalabilityMask != 8 && m_scalabilityMask != 10, "Scalability Mask must be equal to 2, 8 or 10");
-#else
-  xConfirmPara( m_scalabilityMask != 2 , "Scalability Mask must be equal to 2. ");
-#endif
 #endif
 
@@ -1437 +1375 @@
 
   m_dimIds.push_back( m_viewOrderIndex );   
-#if H_MV_HLS10_AUX
   for (Int i = 0; i < m_auxId.size(); i++)
   {
@@ -1446 +1383 @@
     m_dimIds.push_back ( m_auxId );
   }
-#endif  
   xConfirmPara(  m_dimensionIdLen.size() < m_dimIds.size(), "DimensionIdLen must be given for all dimensions. "   );
   Int dimBitOffset[MAX_NUM_SCALABILITY_TYPES+1]; 
@@ -1540 +1476 @@
   {   
     Int refLayerSetIdx = m_outputLayerSetIdx[ lsIdx ]; 
-#if H_MV_HLS10_ADD_LAYERSETS
     xConfirmPara(  refLayerSetIdx < 0 || refLayerSetIdx >= m_vpsNumLayerSets + m_numAddLayerSets, "Output layer set idx must be greater or equal to 0 and less than the VpsNumLayerSets plus NumAddLayerSets." );
-#else
-    xConfirmPara(  refLayerSetIdx < 0 || refLayerSetIdx >= m_vpsNumLayerSets, "Output layer set idx must be greater or equal to 0 and less than the VpsNumLayerSets." );
-#endif
-#if !H_MV_HLS10_ADD_LAYERSETS
-    for (Int i = 0; i < m_layerIdsInAddOutputLayerSet[ lsIdx ].size(); i++)
-    {
-      Bool isAlsoInLayerSet = false; 
-      for (Int j = 0; j < m_layerIdsInSets[ refLayerSetIdx ].size(); j++ )
-      {
-        if ( m_layerIdsInSets[ refLayerSetIdx ][ j ] == m_layerIdsInAddOutputLayerSet[ lsIdx ][ i ] )
-        {
-          isAlsoInLayerSet = true; 
-          break; 
-        }        
-      }
-      xConfirmPara( !isAlsoInLayerSet, "All output layers of a output layer set be included in corresponding layer set.");
-    }
-#endif
   }
 
@@ -1571 +1488 @@
       anyDefaultOutputFlag = anyDefaultOutputFlag || ( m_layerIdsInDefOutputLayerSet[lsIdx].size() != 0 );
     }    
-#if H_MV_HLS10_ADD_LAYERSETS
     if ( anyDefaultOutputFlag )
     {    
       printf( "\nWarning: Ignoring LayerIdsInDefOutputLayerSet parameters, since defaultTargetOuputLayerIdc is not equal 2.\n" );    
     }
-#else
-    printf( "\nWarning: Ignoring LayerIdsInDefOutputLayerSet parameters, since defaultTargetOuputLayerIdc is not equal 2.\n" );    
-#endif
   }
   else  
@@ -1600 +1513 @@
   }
 
-#if H_MV_HLS10_ADD_LAYERSETS
   xConfirmPara( m_altOutputLayerFlag.size() < m_vpsNumLayerSets + m_numAddLayerSets + m_outputLayerSetIdx.size(), "The number of alt output layer flags must be equal to the number of layer set additional output layer sets plus the number of output layer set indices" );
-#else
-  xConfirmPara( m_altOutputLayerFlag.size() < m_vpsNumLayerSets + m_outputLayerSetIdx.size(), "The number of Profile Level Tier indices must be equal to the number of layer set plus the number of output layer set indices" );
-#endif
 
   // PTL
-#if H_MV_HLS10_PTL
     xConfirmPara( ( m_profile.size() != m_inblFlag.size() || m_profile.size() != m_level.size()  ||  m_profile.size() != m_levelTier.size() ), "The number of Profiles, Levels, Tiers and InblFlags must be equal." ); 
 
@@ -1620 +1528 @@
       }
     }
-#else
-    xConfirmPara( m_profileLevelTierIdx.size() < m_vpsNumLayerSets + m_outputLayerSetIdx.size(), "The number of Profile Level Tier indices must be equal to the number of layer set plus the number of output layer set indices" );
-#endif
 
     // Layer Dependencies  
@@ -2486 +2391 @@
 #endif
 #if H_MV
-#if H_MV_HLS10_GEN_FIX
   xPrintParaVector( "NuhLayerId"     , m_layerIdInNuh ); 
   if ( m_targetEncLayerIdList.size() > 0)
@@ -2492 +2396 @@
     xPrintParaVector( "TargetEncLayerIdList"     , m_targetEncLayerIdList ); 
   }
-#endif
   xPrintParaVector( "ViewIdVal"     , m_viewId ); 
   xPrintParaVector( "ViewOrderIndex", m_viewOrderIndex ); 
-#if H_MV_HLS10_AUX
   xPrintParaVector( "AuxId", m_auxId );
-#endif
 #endif
 #if H_3D

branches/HTM-12.1-dev0/source/App/TAppEncoder/TAppEncCfg.h

@@ -78 +78 @@
   std::vector<Int>       m_viewId;                            ///< view id
   std::vector<Int>       m_viewOrderIndex;                    ///< view order index  
-#if H_MV_HLS10_AUX
   std::vector<Int>       m_auxId;                             ///< auxiliary id
-#endif
 #if H_3D
   std::vector<Int>       m_depthFlag;                         ///< depth flag
 #endif
-#if H_MV_HLS10_GEN_FIX
   std::vector<Int>       m_targetEncLayerIdList;              ///< layer Ids in Nuh to be encoded
-#endif
   std::vector<Int>       m_layerIdInNuh;                      ///< layer Id in Nuh for each layer 
   Bool                   m_splittingFlag;                     ///< Splitting Flag
@@ -95 +91 @@
   Int                    m_vpsNumLayerSets;                   ///< Number of layer sets
   std::vector< std::vector<Int> > m_layerIdsInSets;           ///< LayerIds in vps of layer set 
-#if H_MV_HLS10_ADD_LAYERSETS
   Int                    m_numAddLayerSets;                    ///< Number of additional layer sets
   std::vector< std::vector<Int> > m_highestLayerIdxPlus1;      ///< HighestLayerIdxPlus1 for each additional layer set and each independent layer (value with index 0 will be ignored)
-#endif
   Int                    m_defaultOutputLayerIdc;             ///< Specifies output layers of layer sets, 0: output all layers, 1: output highest layers, 2: specified by LayerIdsInDefOuputLayerSet
   std::vector<Int>       m_outputLayerSetIdx;                 ///< Indices of layer sets used as additional output layer sets  
   std::vector< std::vector<Int> > m_layerIdsInAddOutputLayerSet; ///< LayerIds in vps of additional output layers
   std::vector< std::vector<Int> > m_layerIdsInDefOutputLayerSet; ///< Indices in vps of output layers in layer sets
-#if H_MV_HLS10_ADD_LAYERSETS
   std::vector< std::vector< Int > > m_profileTierLevelIdx;      ///< Indices of of profile, per layer in layer set
-#else
-  std::vector<Int>       m_profileLevelTierIdx;               ///< Indices of of profile level tier
-#endif
   std::vector<Bool>      m_altOutputLayerFlag;                ///< Alt output layer flag
 
@@ -138 +128 @@
   std::vector< std::vector<Bool > > m_ctuBasedOffsetEnabledFlag;
   std::vector< std::vector<Int  > > m_minHorizontalCtuOffsetPlus1;
-#if H_MV_HLS10_VPS_VUI
   Bool m_singleLayerForNonIrapFlag;
   Bool m_higherLayerIrapSkipFlag;
-#endif // H_MV_HLS10_VPS_VUI
 
 
@@ -193 +181 @@
   
   // profile/level
-#if H_MV_HLS10_PTL
 #if H_MV
   std::vector< Profile::Name > m_profile;
@@ -203 +190 @@
   Level::Tier   m_levelTier;
   Level::Name   m_level;
-#endif
 #endif
 
@@ -468 +454 @@
   std::vector<Int>  m_sbPropAvgBitRate;
   std::vector<Int>  m_sbPropMaxBitRate;
-#if H_MV_HLS10_GEN_FIX
   Bool              m_outputVpsInfo;
-#endif
 #endif
 #if H_3D
@@ -531 +515 @@
 #if H_MV
 
-#if H_MV_HLS10_PTL
   template<typename T>
   Void xReadStrToEnum(string in, std::vector<T> &val)
@@ -552 +535 @@
     delete[] cString;
   }
-#endif
 
 

branches/HTM-12.1-dev0/source/App/TAppEncoder/TAppEncTop.cpp

@@ -144 +144 @@
   xDeriveDltArray          ( vps, dlt );
 #endif
-#if H_MV_HLS10_GEN_FIX
   if ( m_targetEncLayerIdList.size() == 0 )
   {
@@ -166 +165 @@
     }
   }
-#endif
-
-#if H_MV_HLS10_ADD_LAYERSETS
+
   if ( m_outputVpsInfo )
   {  
-#if H_MV_HLS10_AUX
     vps.printScalabilityId();
-#endif
     vps.printLayerDependencies();
     vps.printLayerSets(); 
     vps.printPTL(); 
   }
-#endif
 
   for(Int layerIdInVps = 0; layerIdInVps < m_numberOfLayers; layerIdInVps++)
@@ -829 +823 @@
   
 #if H_MV
-#if H_MV_HLS10_GEN_FIX
   while ( (m_targetEncLayerIdList.size() != 0 ) && !allEos )
-#else
-  while ( !allEos )
-#endif
   {
     for(Int layer=0; layer < m_numberOfLayers; layer++ )
     {
-#if H_MV_HLS10_GEN_FIX
       if (!xLayerIdInTargetEncLayerIdList( m_vps->getLayerIdInNuh( layer ) ))
       {
         continue; 
       }
-#endif
 
       Int frmCnt = 0;
@@ -883 +871 @@
       for(Int layer=0; layer < m_numberOfLayers; layer++ )
       {
-#if H_MV_HLS10_GEN_FIX
         if (!xLayerIdInTargetEncLayerIdList( m_vps->getLayerIdInNuh( layer ) ))
         {
           continue; 
         }
-#endif
 
 #if H_3D_VSO        
@@ -916 +902 @@
   for(Int layer=0; layer < m_numberOfLayers; layer++ )
   {
-#if H_MV_HLS10_GEN_FIX
     if (!xLayerIdInTargetEncLayerIdList( m_vps->getLayerIdInNuh( layer ) ))
     {
       continue; 
     }
-#endif
     m_acTEncTopList[layer]->printSummary( m_acTEncTopList[layer]->getNumAllPicCoded(), m_isField );
   }
@@ -1385 +1369 @@
   // Max sub layers, + presence flag
   Bool subLayersMaxMinus1PresentFlag = false; 
-#if !H_MV_FIX_SUB_LAYERS_MAX_MINUS1
-  Int  subLayersMaxMinus1 = -1; 
-#endif
   for (Int curLayerIdInVps = 0; curLayerIdInVps < m_numberOfLayers; curLayerIdInVps++ )
   {    
@@ -1398 +1379 @@
 
     vps.setSubLayersVpsMaxMinus1( curLayerIdInVps, curSubLayersMaxMinus1 ); 
-#if !H_MV_FIX_SUB_LAYERS_MAX_MINUS1
-    if ( subLayersMaxMinus1 == -1 )
-    {
-      subLayersMaxMinus1 = curSubLayersMaxMinus1; 
-    }
-    else
-    {
-      subLayersMaxMinus1PresentFlag = subLayersMaxMinus1PresentFlag || ( curSubLayersMaxMinus1 != subLayersMaxMinus1 ); 
-    }
-#else
     subLayersMaxMinus1PresentFlag = subLayersMaxMinus1PresentFlag || ( curSubLayersMaxMinus1 != vps.getMaxSubLayersMinus1() );
-#endif
   }
 
@@ -1422 +1392 @@
     {
       Int maxTid = -1; 
-#if H_MV_FIX_LOOP_GOPSIZE
       for( Int i = 0; i < ( getGOPSize() + 1); i++ ) 
       {        
         GOPEntry geCur =  m_GOPListMvc[curLayerIdInVps][( i < getGOPSize()  ? i : MAX_GOP )];
         GOPEntry geRef =  m_GOPListMvc[refLayerIdInVps][( i < getGOPSize()  ? i : MAX_GOP )];
-#else
-      for( Int i = 0; i < getGOPSize(); i++ ) 
-      {        
-        GOPEntry geCur =  m_GOPListMvc[curLayerIdInVps][i];
-        GOPEntry geRef =  m_GOPListMvc[refLayerIdInVps][i];     
-#endif
         for (Int j = 0; j < geCur.m_numActiveRefLayerPics; j++)
         {        
           if ( m_directRefLayers[ curLayerIdInVps ][ geCur.m_interLayerPredLayerIdc[ j ]] == refLayerIdInVps )
           {
-#if H_MV_FIX_LOOP_GOPSIZE
             Bool refAlwaysIntra = ( i == getGOPSize() ) && ( m_iIntraPeriod[ curLayerIdInVps ] % m_iIntraPeriod[ refLayerIdInVps ] == 0 );
             Bool refLayerZero   = ( i == getGOPSize() ) && ( refLayerIdInVps == 0 );
             maxTid = std::max( maxTid, ( refAlwaysIntra || refLayerZero ) ? 0 : geRef.m_temporalId ); 
-#else
-            maxTid = std::max( maxTid, geRef.m_temporalId ); 
-#endif
           }
         }
@@ -1569 +1528 @@
 Void TAppEncTop::xSetProfileTierLevel( TComVPS& vps )
 { 
-#if H_MV_HLS10_PTL
 
   // SET PTL
@@ -1587 +1545 @@
       m_nonPackedConstraintFlag, m_frameOnlyConstraintFlag,  m_inblFlag[ptlIdx] );     
   }  
-#else
-  const Int vpsNumProfileTierLevelMinus1 = 0; //TBD
-  vps.setVpsNumProfileTierLevelMinus1( vpsNumProfileTierLevelMinus1 ); 
-  
-  for (Int i = 0; i <= vps.getVpsNumProfileTierLevelMinus1(); i++ )
-  {
-    vps.setVpsProfilePresentFlag( i, true ); 
-  }
-#endif
-}
-
-#if H_MV_HLS10_PTL
+}
+
 Void TAppEncTop::xSetProfileTierLevel(TComVPS& vps, Int profileTierLevelIdx, Int subLayer, Profile::Name profile, Level::Name level, Level::Tier tier, Bool progressiveSourceFlag, Bool interlacedSourceFlag, Bool nonPackedConstraintFlag, Bool frameOnlyConstraintFlag, Bool inbldFlag)
 {
@@ -1620 +1568 @@
   ptl->setLevelIdc  ( level   );
   ptl->setProfileCompatibilityFlag( profile, true );
-#if H_MV_HLS10_PTL_INBL_FIX
   ptl->setInbldFlag( inbldFlag );
-#endif
 
   switch ( profile )
@@ -1648 +1594 @@
   }
 }
-#endif
 
 Void TAppEncTop::xSetRepFormat( TComVPS& vps )
@@ -1666 +1611 @@
   //repFormat->setSeparateColourPlaneVpsFlag( );
 
-#if H_MV_HLS10_GEN_VSP_CONF_WIN
   repFormat->setConformanceWindowVpsFlag( true );
   repFormat->setConfWinVpsLeftOffset    ( m_confLeft   / TComSPS::getWinUnitX( repFormat->getChromaFormatVpsIdc() ) );
@@ -1672 +1616 @@
   repFormat->setConfWinVpsTopOffset     ( m_confTop    / TComSPS::getWinUnitY( repFormat->getChromaFormatVpsIdc() )  );
   repFormat->setConfWinVpsBottomOffset  ( m_confBottom / TComSPS::getWinUnitY( repFormat->getChromaFormatVpsIdc() ) ); 
-#endif
 
   assert( vps.getRepFormat( 0 ) == NULL ); 
@@ -1689 +1632 @@
   {  
     Int currLsIdx = vps.olsIdxToLsIdx( i ); 
-#if !H_MV_HLS10_ADD_LAYERSETS
-    std::vector<Int> targetDecLayerIdList = vps.getTargetDecLayerIdList( i ); 
-#endif
     Bool subLayerFlagInfoPresentFlag = false; 
 
@@ -1697 +1637 @@
     {   
       Bool subLayerDpbInfoPresentFlag = false; 
-#if !H_MV_HLS10_ADD_LAYERSETS
-      assert( vps.getNumLayersInIdList( currLsIdx ) == targetDecLayerIdList.size() ); 
-#endif
       for( Int k = 0; k < vps.getNumLayersInIdList( currLsIdx ); k++ )   
       {
-#if H_MV_HLS10_DBP_SIZE
         Int layerIdInVps = vps.getLayerIdInVps( vps.getLayerSetLayerIdList( currLsIdx, k ) );
         if ( vps.getNecessaryLayerFlag( i,k ) && ( vps.getVpsBaseLayerInternalFlag() || vps.getLayerSetLayerIdList( currLsIdx, k ) != 0 ) )
@@ -1719 +1655 @@
           }
         }
-#else
-        Int layerIdInVps = vps.getLayerIdInVps( targetDecLayerIdList[k] );           
-        dpbSize->setMaxVpsDecPicBufferingMinus1( i, k, j, m_maxDecPicBufferingMvc[ layerIdInVps ][ j ] - 1 );
-
-        if ( j > 0 )
-        {
-          subLayerDpbInfoPresentFlag = subLayerDpbInfoPresentFlag || ( dpbSize->getMaxVpsDecPicBufferingMinus1( i, k, j ) != dpbSize->getMaxVpsDecPicBufferingMinus1( i, k, j - 1 ) );
-        }
-#endif
       }        
 
       Int maxNumReorderPics = MIN_INT;
-#if H_MV_HLS10_DBP_SIZE
       for ( Int idx = 0; idx < vps.getNumLayersInIdList( currLsIdx ); idx++ )
       {
@@ -1740 +1666 @@
         }
       }
-#else
-      for ( Int idx = 0; idx < targetDecLayerIdList.size(); idx++ )
-      {
-        Int layerIdInVps = vps.getLayerIdInVps( targetDecLayerIdList[ idx ] ); 
-        maxNumReorderPics = std::max( maxNumReorderPics, m_numReorderPicsMvc[ layerIdInVps ][ j ] ); 
-      }
-#endif
       assert( maxNumReorderPics != MIN_INT ); 
 
@@ -1793 +1712 @@
   // Additional output layer sets + profileLevelTierIdx
   vps.setDefaultOutputLayerIdc      ( m_defaultOutputLayerIdc );   
-#if H_MV_HLS10_ADD_LAYERSETS
   if( vps.getNumIndependentLayers() == 0 && m_numAddLayerSets > 0  )
   {
@@ -1827 +1745 @@
     }        
   }  
-#else
-  vps.setNumAddLayerSets            ( 0                             );  
-#endif
   vps.setNumAddOlss                 ( numAddOuputLayerSets          ); 
   vps.initTargetLayerIdLists(); 
 
-#if H_MV_HLS10_ADD_LAYERSETS
   for (Int olsIdx = 0; olsIdx < vps.getNumLayerSets() + numAddOuputLayerSets; olsIdx++)
   {
     Int addOutLsIdx = olsIdx - vps.getNumLayerSets();     
-#else
-  for (Int olsIdx = 0; olsIdx < m_vpsNumLayerSets + numAddOuputLayerSets; olsIdx++)
-  {
-    Int addOutLsIdx = olsIdx - m_vpsNumLayerSets;     
-#endif    
     vps.setLayerSetIdxForOlsMinus1( olsIdx, ( ( addOutLsIdx < 0 ) ?  olsIdx  : m_outputLayerSetIdx[ addOutLsIdx ] ) - 1 ); 
 
-#if H_MV_HLS10_ADD_LAYERSETS
     Int lsIdx = vps.olsIdxToLsIdx( olsIdx );
-#else
-    std::vector<Int>& layerIdList    = m_layerIdsInSets[ vps.olsIdxToLsIdx( olsIdx ) ];
-#endif
     if (vps.getDefaultOutputLayerIdc() == 2 || addOutLsIdx >= 0 )
     { 
-#if H_MV_HLS10_ADD_LAYERSETS
       for ( Int i = 0; i < vps.getNumLayersInIdList( lsIdx ); i++)
-#else
-      for ( Int i = 0; i < layerIdList.size(); i++)
-#endif
       {
         vps.setOutputLayerFlag( olsIdx, i, ( olsIdx == 0 && i == 0 ) ? vps.inferOutputLayerFlag(olsIdx, i ) : false ); // This is a software only fix for a bug in the spec. In spec outputLayerFlag neither present nor inferred for this case !
@@ -1865 +1766 @@
       for (Int j = 0; j < outLayerIdList.size(); j++)
       {   
-#if H_MV_HLS10_ADD_LAYERSETS
         for ( Int i = 0; i < vps.getNumLayersInIdList( lsIdx ); i++)
         {
           if ( vps.getLayerSetLayerIdList( lsIdx, i ) == outLayerIdList[ j ] )
-#else
-        for (Int i = 0; i < layerIdList.size(); i++ )
-        {
-          if ( layerIdList[ i ] == outLayerIdList[ j ] )
-#endif
           {
             vps.setOutputLayerFlag( olsIdx, i, true );       
@@ -1880 +1775 @@
           }
         }
-#if H_MV_HLS10_ADD_LAYERSETS
         if ( !outputLayerInLayerSetFlag )
         {
@@ -1886 +1780 @@
           exit(EXIT_FAILURE);
         }
-#else
-        assert( outputLayerInLayerSetFlag ); // The output layer is not in the layer set.
-#endif
       }
     }
     else
     {
-#if H_MV_HLS10_ADD_LAYERSETS
       for ( Int i = 0; i < vps.getNumLayersInIdList( lsIdx ); i++)
-#else
-      for ( Int i = 0; i < layerIdList.size(); i++)
-#endif
       {
         vps.setOutputLayerFlag( olsIdx, i, vps.inferOutputLayerFlag( olsIdx, i ) );       
@@ -1903 +1790 @@
     }
 
-#if H_MV_HLS10_NESSECARY_LAYER
     vps.deriveNecessaryLayerFlags( olsIdx ); 
-#endif
     vps.deriveTargetLayerIdList(  olsIdx ); 
 
-#if H_MV_HLS10_PTL
     // SET profile_tier_level_index. 
     if ( olsIdx == 0 )
@@ -1925 +1809 @@
         {
           vps.setProfileTierLevelIdx(olsIdx, j, m_profileTierLevelIdx[olsIdx][j] );
-#if H_MV_HLS10_PTL_FIX
           if( !vps.getNecessaryLayerFlag(olsIdx,j) && m_profileTierLevelIdx[ olsIdx ][ j ] != -1 )
           {
@@ -1932 +1815 @@
         }
         else if ( vps.getNecessaryLayerFlag(olsIdx,j) )
-#else
-        }
-        else
-#endif
         {
           // setting default values
@@ -1951 +1830 @@
       }
     }
-#else
-    if ( olsIdx > 0 ) 
-    {
-      vps.setProfileLevelTierIdx( olsIdx, m_profileLevelTierIdx[ olsIdx ] ); 
-    }
-#endif
    
     if ( vps.getNumOutputLayersInOutputLayerSet( olsIdx ) == 1 && 
@@ -1994 +1867 @@
     if( pcVPSVUI->getBitRatePresentVpsFlag( )  ||  pcVPSVUI->getPicRatePresentVpsFlag( ) )
     {
-#if H_MV_HLS10_VPS_VUI
       for( Int i = 0; i  <  vps.getNumLayerSets(); i++ )
-#else
-      for( Int i = 0; i  <=  vps.getVpsNumLayerSetsMinus1(); i++ )
-#endif
       {
         for( Int j = 0; j  <=  vps.getMaxTLayers(); j++ ) 
@@ -2047 +1916 @@
         for( Int j = 0; j < vps.getNumDirectRefLayers( vps.getLayerIdInNuh( i ) ) ; j++ )
         {  
-#if H_MV_HLS10_REF_PRED_LAYERS
           Int layerIdx = vps.getLayerIdInVps( vps.getIdDirectRefLayer(vps.getLayerIdInNuh( i ) , j  ));  
-#else
-          Int layerIdx = vps.getLayerIdInVps( vps.getRefLayerId(vps.getLayerIdInNuh( i ) , j  ));  
-#endif
           if( pcVPSVUI->getTilesInUseFlag( i )  &&  pcVPSVUI->getTilesInUseFlag( layerIdx ) )  
           {
@@ -2070 +1935 @@
     }
 
-#if H_MV_HLS10_VPS_VUI
   pcVPSVUI->setSingleLayerForNonIrapFlag( m_singleLayerForNonIrapFlag );
   pcVPSVUI->setHigherLayerIrapSkipFlag( m_higherLayerIrapSkipFlag );
-#endif
 
     pcVPSVUI->setIlpRestrictedRefLayersFlag( m_ilpRestrictedRefLayersFlag );
@@ -2130 +1993 @@
   }
 }
-#if H_MV_HLS10_GEN_FIX
 Bool TAppEncTop::xLayerIdInTargetEncLayerIdList(Int nuhLayerId)
 {
   return  ( std::find(m_targetEncLayerIdList.begin(), m_targetEncLayerIdList.end(), nuhLayerId) != m_targetEncLayerIdList.end()) ;
 }
-#endif
 
 

branches/HTM-12.1-dev0/source/App/TAppEncoder/TAppEncTop.h

@@ -133 +133 @@
   Void xSetProfileTierLevel       ( TComVPS& vps );
 
-#if H_MV_HLS10_PTL
   Void xSetProfileTierLevel( TComVPS& vps, Int profileTierLevelIdx, Int subLayer,                              
                              Profile::Name profile, Level::Name level, Level::Tier tier, 
@@ -139 +138 @@
                              Bool nonPackedConstraintFlag, Bool frameOnlyConstraintFlag, 
                              Bool inbldFlag );
-#endif
   Void xSetRepFormat              ( TComVPS& vps );
   Void xSetDpbSize                ( TComVPS& vps );
@@ -145 +143 @@
   GOPEntry* xGetGopEntry( Int layerIdInVps, Int poc );
   Int  xGetMax( std::vector<Int>& vec);
-#if H_MV_HLS10_GEN_FIX
   Bool xLayerIdInTargetEncLayerIdList( Int nuhLayerId );
-#endif
 #endif
 #if H_3D