Changeset 767 in 3DVCSoftware for branches/HTM-9.2-dev0/source/Lib/TLibEncoder/TEncTop.cpp

Timestamp:

12 Jan 2014, 04:39:11 (10 years ago)

Author:

tech

Message:

Cleanup part 4

File:

• branches/HTM-9.2-dev0/source/Lib/TLibEncoder/TEncTop.cpp (modified) (4 diffs)

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

@@ -299 +299 @@
 {
   // initialize SPS
-#if DLT_DIFF_CODING_IN_PPS
+#if H_3D
   // Assuming that all PPS indirectly refer to the same VPS via different SPS
   m_cSPS.setVPS(m_cVPS);
@@ -843 +843 @@
     pcVUI->setLog2MaxMvLengthVertical(getLog2MaxMvLengthVertical());
   }
-#if H_3D
-#if !CAM_HLS_F0136_F0045_F0082
-  {
-    m_cSPS.initCamParaSPS           ( m_viewIndex, m_uiCamParPrecision, m_bCamParInSliceHeader, m_aaiCodedScale, m_aaiCodedOffset );
-  }
-#endif
-#endif
 }
 
@@ -864 +857 @@
 #endif
 
-#if DLT_DIFF_CODING_IN_PPS
+#if H_3D
   m_cPPS.setDLT( getDLT() );
 #endif
@@ -995 +988 @@
   }
 #if H_3D
-#if CAM_HLS_F0136_F0045_F0082
   if( m_cVPS->hasCamParInSliceHeader( getViewIndex() ) )
-#else
-  if( m_cSPS.hasCamParInSliceHeader() )
-#endif
   {
     m_cPPS.setSliceHeaderExtensionPresentFlag( true );