Changeset 973 in 3DVCSoftware for branches/HTM-11.1-dev0/source/Lib/TLibEncoder

Timestamp:

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

Author:

tech

Message:

Cleanup part 7.

Location:

branches/HTM-11.1-dev0/source/Lib/TLibEncoder

Files:

• TEncGOP.cpp (modified) (1 diff)
• TEncTop.cpp (modified) (4 diffs)

branches/HTM-11.1-dev0/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -2325 +2325 @@
       std::vector<Int> temp; 
       TComSlice::markCurrPic( pcPic ); 
-#if !H_MV_HLS_8_DBP_NODOC_42
-      TComSlice::markIvRefPicsAsUnused   ( m_ivPicLists, temp, pcPic->getSlice(0)->getVPS(), m_layerId, pcPic->getPOC() ); 
-#endif
 #endif
       m_bFirst = false;

branches/HTM-11.1-dev0/source/Lib/TLibEncoder/TEncTop.cpp

@@ -698 +698 @@
   m_cSPS.setSpsScalingListRefLayerId      ( 0              ); 
   m_cSPS.setSpsExtensionPresentFlag              ( true ); 
-#if H_MV_HLS_8_SPS_NODOC_48
   m_cSPS.setSpsMultilayerExtensionFlag    ( true ); 
-#else
-  m_cSPS.setSpsExtensionTypeFlag          ( PS_EX_T_MV ,true ); 
-#endif
 #if H_3D
-#if H_MV_HLS_8_SPS_NODOC_48
   m_cSPS.setSps3dExtensionFlag            ( true ); 
-#else
-  m_cSPS.setSpsExtensionTypeFlag          ( PS_EX_T_3D ,true ); 
-#endif
 #endif
 #endif
@@ -777 +769 @@
     m_cSPS.setNumReorderPics(m_numReorderPics[i], i);
   }
-#if H_MV_HLS_8_HRD_Q0102_08
+#if H_MV
   for ( Int ols = 0; ols < m_cVPS->getNumOutputLayerSets(); ols++)
   {
@@ -788 +780 @@
   }
 
-#if H_MV_HLS_8_RPS_Q0100_36
   m_cVPS->inferDbpSizeLayerSetZero( &m_cSPS, true ); 
-#endif
-
 #endif
   m_cSPS.setPCMBitDepthLuma (g_uiPCMBitDepthLuma);
@@ -853 +842 @@
   m_cPPS.setPPSId( getLayerIdInVps() );
   m_cPPS.setSPSId( getLayerIdInVps() );
-#if H_MV_HLS_8_SPS_NODOC_48
   m_cPPS.setPpsMultilayerExtensionFlag    ( true ); 
 #if H_3D
   m_cPPS.setPps3dExtensionFlag            ( true ); 
-#endif
-#else
-  m_cPPS.setPpsExtensionTypeFlag          ( PPS_EX_T_MV ,true ); 
-#if H_3D
-  m_cPPS.setPpsExtensionTypeFlag          ( PPS_EX_T_3D ,true ); 
-#endif
 #endif
 #endif