Changeset 20 in 3DVCSoftware for branches/0.2-HHI/source/Lib/TLibCommon/TComSlice.cpp

Timestamp:

15 Feb 2012, 18:58:36 (13 years ago)

Author:

hschwarz

Message:

HHI+Sony modifications

File:

• branches/0.2-HHI/source/Lib/TLibCommon/TComSlice.cpp (modified) (3 diffs)

branches/0.2-HHI/source/Lib/TLibCommon/TComSlice.cpp

@@ -66 +66 @@
   m_iViewIdx = 0 ;
 
+#if SONY_COLPIC_AVAILABILITY
+  m_iViewOrderIdx = 0;
+#endif
+
   initEqualRef();
   m_bNoBackPredFlag = false;
@@ -440 +444 @@
   m_iPOC                 = pSrc->m_iPOC;
   m_iViewIdx             = pSrc->m_iViewIdx;
+#if SONY_COLPIC_AVAILABILITY
+  m_iViewOrderIdx        = pSrc->m_iViewOrderIdx;
+#endif
 #if DCM_DECODING_REFRESH
   m_eNalUnitType         = pSrc->m_eNalUnitType;
@@ -676 +683 @@
   // AMVP parameter
   ::memset( m_aeAMVPMode, 0, sizeof( m_aeAMVPMode ) );
+
+#if ( HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX )
   m_bUseDMM = false;
+#endif
 }