Changeset 1163 in 3DVCSoftware for branches/HTM-13.1-dev0/source/Lib/TLibCommon/TComSlice.cpp

Timestamp:

16 Mar 2015, 12:40:05 (9 years ago)

Author:

tech

Message:

Merged branch 13.1-dev1-Samsung2@1162

File:

• branches/HTM-13.1-dev0/source/Lib/TLibCommon/TComSlice.cpp (modified) (4 diffs)

branches/HTM-13.1-dev0/source/Lib/TLibCommon/TComSlice.cpp

@@ -140 +140 @@
 , m_depthToDisparityF             ( NULL )
 #endif
+#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+, m_bApplyDIS                     (false)
+#else
 #if H_3D_SINGLE_DEPTH
 , m_bApplySingleDepthMode         (false)
+#endif
 #endif
 #endif
@@ -1099 +1103 @@
   }
 #endif
+#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+  m_bApplyDIS = pSrc->m_bApplyDIS;
+#else
 #if H_3D_SINGLE_DEPTH
   m_bApplySingleDepthMode = pSrc->m_bApplySingleDepthMode;
+#endif
 #endif
 #if H_3D_IC
@@ -4088 +4096 @@
   m_intraSdcWedgeFlag      = sps3dExt->getIntraSdcWedgeFlag    ( depthFlag ) && lidG0                                     ;                          
   m_qtPredFlag             = sps3dExt->getQtPredFlag           ( depthFlag ) && lidG0           &&   textOfCurViewAvailFlag;
-  m_interSdcFlag           = sps3dExt->getInterSdcFlag         ( depthFlag ) && lidG0                                    ;                               
+  m_interSdcFlag           = sps3dExt->getInterSdcFlag         ( depthFlag ) && lidG0                                    ;  
+#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+  m_depthIntraSkipFlag     = sps3dExt->getDepthIntraSkipFlag   ( depthFlag ) && lidG0                                    ;                          
+#else
   m_intraSingleFlag        = sps3dExt->getIntraSingleFlag      ( depthFlag ) && lidG0                                    ;                          
+#endif
 
   m_subPbSize              = lidG0 ? ( 1 << ( sps3dExt->getLog2SubPbSizeMinus3   ( depthFlag ) + 3 ) ) : getSPS()->getMaxCUWidth();  
@@ -4112 +4124 @@
   std::cout << "qtPredFlag              :" << m_qtPredFlag             << std::endl;
   std::cout << "interSdcFlag            :" << m_interSdcFlag           << std::endl;
+#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+  std::cout << "depthIntraSkipFlag      :" << m_depthIntraSkipFlag     << std::endl;    
+#else
   std::cout << "intraSingleFlag         :" << m_intraSingleFlag        << std::endl;    
+#endif
   std::cout << "subPbSize               :" << m_subPbSize              << std::endl;
   std::cout << "mpiSubPbSize            :" << m_mpiSubPbSize           << std::endl;