Changeset 101 in 3DVCSoftware for trunk/source/Lib/TLibEncoder

Timestamp:

10 Aug 2012, 17:56:17 (13 years ago)

Author:

tech

Message:

• Added POZNAN_CABAC_INIT_FLAG_FIX bug
• Fixed CTC cfg-file bug
• Changed define name

Location:

trunk/source/Lib/TLibEncoder

Files:

• TEncGOP.cpp (modified) (1 diff)
• TEncGOP.h (modified) (1 diff)
• TEncSbac.cpp (modified) (1 diff)
• TEncSlice.cpp (modified) (4 diffs)

trunk/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -448 +448 @@
 #endif
 
-#if HHI_VSO_SPEEDUP_A033
+#if HHI_VSO_SPEEDUP_A0033
 #else
     if ( iVSOMode == 4 )

trunk/source/Lib/TLibEncoder/TEncGOP.h

@@ -137 +137 @@
   
   Void  preLoopFilterPicAll  ( TComPic* pcPic, UInt64& ruiDist, UInt64& ruiBits );
-#if HHI_VSO_SPEEDUP_A033
+#if HHI_VSO_SPEEDUP_A0033
   TEncTop* getEncTop() { return m_pcEncTop; }
 #endif

trunk/source/Lib/TLibEncoder/TEncSbac.cpp

@@ -278 +278 @@
     m_pcSlice->getPPS()->setEncCABACTableIdx( I_SLICE );
   }  
+
+  #if CABAC_INIT_FLAG && POZNAN_CABAC_INIT_FLAG_FIX
+    m_pcSlice->getPPS()->setEncPrevPOC( m_pcSlice->getPOC() );
+  #endif
 }
 #endif

trunk/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -38 +38 @@
 #include "TEncTop.h"
 #include "TEncSlice.h"
-#if HHI_VSO_SPEEDUP_A033
+#if HHI_VSO_SPEEDUP_A0033
 #include "../../App/TAppEncoder/TAppEncTop.h"
 #endif
@@ -642 +642 @@
   m_uiPicDist       = 0;
   
+#if CABAC_INIT_FLAG && POZNAN_CABAC_INIT_FLAG_FIX
+  Bool bReset =(pcSlice->getPOC() == 0) || 
+    (pcSlice->getPOC() % m_pcCfg->getIntraPeriod() == 0) ||
+    (pcSlice->getPPS()->getEncPrevPOC() % m_pcCfg->getIntraPeriod() == 0) ||
+    (pcSlice->getPOC()/m_pcCfg->getIntraPeriod() > pcSlice->getPPS()->getEncPrevPOC()/m_pcCfg->getIntraPeriod()) ||
+    (m_pcGOPEncoder->getGOPSize() == 0);
+
+  if ( bReset && pcSlice->getPPS()->getCabacInitPresentFlag())
+  {
+    pcSlice->getPPS()->setEncCABACTableIdx(pcSlice->getSliceType()); // reset cabac initialization table index
+  };
+#endif
+
   // set entropy coder
   if( m_pcCfg->getUseSBACRD() )
@@ -787 +800 @@
   UInt uiTileLCUX     = 0;
 
-#if HHI_VSO_SPEEDUP_A033
+#if HHI_VSO_SPEEDUP_A0033
   Int iLastPosY = -1;
 #endif
@@ -802 +815 @@
     pcCU->initCU( rpcPic, uiCUAddr );
 
-#if HHI_VSO_SPEEDUP_A033
+#if HHI_VSO_SPEEDUP_A0033
     if ( m_pcRdCost->getUseRenModel() )
     {