Changeset 973 in 3DVCSoftware for branches/HTM-11.1-dev0/source/App/TAppEncoder

Timestamp:

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

Author:

tech

Message:

Cleanup part 7.

Location:

branches/HTM-11.1-dev0/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (3 diffs)
• TAppEncCfg.h (modified) (1 diff)
• TAppEncTop.cpp (modified) (4 diffs)
• TAppEncTop.h (modified) (1 diff)

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

@@ -393 +393 @@
   ("LayerIdsInAddOutputLayerSet_%d", m_layerIdsInAddOutputLayerSet      , std::vector<Int>(0,0), MAX_VPS_ADD_OUTPUT_LAYER_SETS, "Indices in VPS of output layers in additional output layer set")  
   ("LayerIdsInDefOutputLayerSet_%d", m_layerIdsInDefOutputLayerSet      , std::vector<Int>(0,0), MAX_VPS_OP_SETS_PLUS1, "Indices in VPS of output layers in layer set")  
-#if H_MV_HLS_7_VPS_P0300_27
   ("AltOutputLayerFlag",    m_altOutputLayerFlag , std::vector<Bool>(1,0), "Alt output layer flag")
-#endif
   ("ProfileLevelTierIdx",   m_profileLevelTierIdx, std::vector<Int>(1,0), "Indices to profile level tier")
   
@@ -1056 +1054 @@
   xResizeVector( m_wppInUseFlag ); 
 
-#if H_MV_HLS_7_VPS_P0300_27
   for (Int olsIdx = 0; olsIdx < m_vpsNumLayerSets + (Int) m_outputLayerSetIdx.size(); olsIdx++)
   {    
     m_altOutputLayerFlag.push_back( false );      
   }
-#endif
 #else
   m_aidQP = new Int[ m_framesToBeEncoded + m_iGOPSize + 1 ];
@@ -1463 +1459 @@
   }
 
-#if H_MV_HLS_7_VPS_P0300_27
   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
   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" );
 

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

@@ -94 +94 @@
   std::vector< std::vector<Int> > m_layerIdsInDefOutputLayerSet; ///< Indices in vps of output layers in layer sets
   std::vector<Int>       m_profileLevelTierIdx;               ///< Indices of of profile level tier
-  #if H_MV_HLS_7_VPS_P0300_27
   std::vector<Bool>      m_altOutputLayerFlag;                ///< Alt output layer flag
-#endif
 
   // Dependencies

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

@@ -1280 +1280 @@
 
   Int  defaultDirectDependencyType = -1; 
-#if MV_FIX_DEP_TYPES
   Bool defaultDirectDependencyFlag = false; 
-#else
-  Bool defaultDirectDependencyFlag = true; 
-#endif
 
   for( Int depLayer = 1; depLayer < m_numberOfLayers; depLayer++ )
@@ -1303 +1299 @@
       {
         defaultDirectDependencyType = curDirectDependencyType; 
-#if MV_FIX_DEP_TYPES
         defaultDirectDependencyFlag = true; 
-#endif
       }
       
@@ -1644 +1638 @@
       vps.setProfileLevelTierIdx( olsIdx, m_profileLevelTierIdx[ olsIdx ] ); 
     }
-#if H_MV_HLS_7_VPS_P0300_27
+   
     if ( vps.getNumOutputLayersInOutputLayerSet( olsIdx ) == 1 && 
         vps.getNumDirectRefLayers( vps.getOlsHighestOutputLayerId( olsIdx ) ) )
@@ -1658 +1652 @@
       }
     }
-#else
-    vps.setAltOutputLayerFlag( olsIdx , false);     
-#endif
   }
 }

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

@@ -75 +75 @@
 
   TComPicLists               m_ivPicLists;                  ///< picture buffers of encoder instances
-#if H_MV_HLS_8
+#if H_MV
   TComVPS*                   m_vps;                         ///< vps
 #else