Changeset 755 in 3DVCSoftware for branches/HTM-9.1-dev0-MediaTek/source/Lib/TLibEncoder/TEncTop.cpp

Timestamp:

27 Dec 2013, 10:54:03 (10 years ago)

Author:

chang

Message:

Integrate

• JCT3V-F0136/F0045: view order index based camera parameter signaling
• JCT3V-F0082: the cp_in_slice_segment_layer_flag to be view specific and used as a condition of the presence of slice header level camera parameters
• JCT3V-F0044: move camera parameter from slice header extension to slice header

File:

• branches/HTM-9.1-dev0-MediaTek/source/Lib/TLibEncoder/TEncTop.cpp (modified) (3 diffs)

branches/HTM-9.1-dev0-MediaTek/source/Lib/TLibEncoder/TEncTop.cpp

@@ -854 +854 @@
   }
 #if H_3D
+#if !CAM_HLS_F0136_F0045_F0082
 #if !QC_DEPTH_IV_MRG_F0125
   if ( !m_isDepth )
@@ -860 +861 @@
     m_cSPS.initCamParaSPS           ( m_viewIndex, m_uiCamParPrecision, m_bCamParInSliceHeader, m_aaiCodedScale, m_aaiCodedOffset );
   }
+#endif
 #endif
 }
@@ -1010 +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 );