Changeset 758 in 3DVCSoftware for trunk/source/Lib/TLibEncoder/TEncTop.cpp

Timestamp:

3 Jan 2014, 17:43:40 (10 years ago)

Author:

tech

Message:

Merged HTM-9.1-dev0-MediaTek@757. (3D-HEVC HLS)

File:

• trunk/source/Lib/TLibEncoder/TEncTop.cpp (modified) (5 diffs)

trunk/source/Lib/TLibEncoder/TEncTop.cpp

@@ -299 +299 @@
 {
   // initialize SPS
+#if DLT_DIFF_CODING_IN_PPS
+  // Assuming that all PPS indirectly refer to the same VPS via different SPS
+  m_cSPS.setVPS(m_cVPS);
+#endif
   xInitSPS();
   
@@ -850 +854 @@
   }
 #if H_3D
+#if !CAM_HLS_F0136_F0045_F0082
 #if !QC_DEPTH_IV_MRG_F0125
   if ( !m_isDepth )
@@ -857 +862 @@
   }
 #endif
+#endif
 }
 
@@ -870 +876 @@
   m_cPPS.setSPSId( getLayerIdInVps() );
 #endif
+
+#if DLT_DIFF_CODING_IN_PPS
+  m_cPPS.setDLT( getDLT() );
+#endif
+
   m_cPPS.setConstrainedIntraPred( m_bUseConstrainedIntraPred );
   Bool bUseDQP = (getMaxCuDQPDepth() > 0)? true : false;
@@ -1001 +1012 @@
   }
 #if H_3D
+#if CAM_HLS_F0136_F0045_F0082
+  if( m_cVPS->hasCamParInSliceHeader( getViewIndex() ) )
+#else
   if( m_cSPS.hasCamParInSliceHeader() )
+#endif
   {
     m_cPPS.setSliceHeaderExtensionPresentFlag( true );