Changeset 939 in 3DVCSoftware for branches/HTM-10.2-dev0/source/Lib/TLibCommon/TComDataCU.cpp

Timestamp:

22 Apr 2014, 17:08:54 (10 years ago)

Author:

tech

Message:

Merged 10.2-dev3-HiSilicon@928.

File:

• branches/HTM-10.2-dev0/source/Lib/TLibCommon/TComDataCU.cpp (modified) (5 diffs)

branches/HTM-10.2-dev0/source/Lib/TLibCommon/TComDataCU.cpp

@@ -610 +610 @@
     memset( m_apSegmentDCOffset[1]  + firstElement,     0,                numElements * sizeof( *m_apSegmentDCOffset[1] ) );
 #endif
+#if HS_DMM_SDC_PREDICTOR_UNIFY_H0108
+    m_apDmmPredictor[0] = 0;
+    m_apDmmPredictor[1] = 0;
+#endif
 #endif
 #if H_3D_DBBP
@@ -784 +788 @@
       m_apSegmentDCOffset[1][ui] = 0;
 #endif
+#if HS_DMM_SDC_PREDICTOR_UNIFY_H0108
+      m_apDmmPredictor[0] = 0;
+      m_apDmmPredictor[1] = 0;
+#endif
 #endif
 #if H_3D_DBBP
@@ -898 +906 @@
   memset( m_apSegmentDCOffset[0], 0, sizeof(Pel) * m_uiNumPartition   );
   memset( m_apSegmentDCOffset[1], 0, sizeof(Pel) * m_uiNumPartition   );
+#endif
+#if HS_DMM_SDC_PREDICTOR_UNIFY_H0108
+  m_apDmmPredictor[0] = 0;
+  m_apDmmPredictor[1] = 0;
 #endif
 #endif
@@ -2389 +2401 @@
 UInt TComDataCU::getCtxAngleFlag( UInt uiAbsPartIdx )
 {
+#if LGE_SIMP_DIM_NOT_PRESENT_FLAG_CODING_H0119_H0135
+  return 0;
+#else
   TComDataCU* pcTempCU;
   UInt        uiTempPartIdx;
@@ -2402 +2417 @@
 
   return uiCtx;
+#endif
 }
 #endif