Changeset 34 in 3DVCSoftware for branches/0.3-nokia/source/Lib/TLibEncoder/TEncTop.cpp

Timestamp:

18 Mar 2012, 10:42:07 (13 years ago)

Author:

nokia

Message:

FlexCO upload

File:

• branches/0.3-nokia/source/Lib/TLibEncoder/TEncTop.cpp (modified) (2 diffs)

branches/0.3-nokia/source/Lib/TLibEncoder/TEncTop.cpp

@@ -287 +287 @@
 
   bool bSomethingCoded = false ;
-
+#if FLEX_CODING_ORDER  
+  if (TEncTop::m_bPicWaitingForCoding )
+#else
   if (m_bPicWaitingForCoding )
+#endif
   {
     std::map<Int, TComPic*>::iterator cIter = m_acInputPicMap.find( (Int)m_cSeqIter.getPoc() );
@@ -615 +618 @@
 #if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
   m_cSPS.setUseDMM( m_bUseDMM );
+#endif
+#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
+  m_cSPS.setUseDMM34( m_bUseDMM34 );
 #endif
 #if HHI_MPI