Changeset 1049 in 3DVCSoftware for branches/HTM-12.0-dev1/source/Lib/TLibEncoder

Timestamp:

20 Aug 2014, 08:01:43 (11 years ago)

Author:

mediatek-htm

Message:

Fix of the Ticket #63. The MACRO is "MTK_LOW_LATENCY_IC_ENCODING_H0086_FIX".

By Yi-Wen Chen (yiwen.chen@…)

Location:

branches/HTM-12.0-dev1/source/Lib/TLibEncoder

Files:

• TEncEntropy.cpp (modified) (2 diffs)
• TEncGOP.cpp (modified) (2 diffs)
• TEncGOP.h (modified) (1 diff)
• TEncTop.cpp (modified) (2 diffs)
• TEncTop.h (modified) (3 diffs)

branches/HTM-12.0-dev1/source/Lib/TLibEncoder/TEncEntropy.cpp

@@ -185 +185 @@
   else
   {
+#if MTK_LOW_LATENCY_IC_ENCODING_H0086_FIX
+    Int ICEnableCandidate = pcCU->getSlice()->getICEnableCandidate(pcCU->getSlice()->getDepth());
+    Int ICEnableNum = pcCU->getSlice()->getICEnableNum(pcCU->getSlice()->getDepth());
+    ICEnableCandidate++;
+    if(pcCU->getICFlag(uiAbsPartIdx))
+    {
+      ICEnableNum++;
+    }
+    pcCU->getSlice()->setICEnableCandidate(pcCU->getSlice()->getDepth(), ICEnableCandidate);
+    pcCU->getSlice()->setICEnableNum(pcCU->getSlice()->getDepth(), ICEnableNum);
+#else
     g_aICEnableCANDIDATE[pcCU->getSlice()->getDepth()]++;
     if(pcCU->getICFlag(uiAbsPartIdx))
@@ -190 +201 @@
       g_aICEnableNUM[pcCU->getSlice()->getDepth()]++;
     }
+#endif
   }
   if( pcCU->isICFlagRequired( uiAbsPartIdx ) )

branches/HTM-12.0-dev1/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -160 +160 @@
 #endif
 #endif
-
+#if MTK_LOW_LATENCY_IC_ENCODING_H0086_FIX
+  m_aICEnableCandidate           = pcTEncTop->getICEnableCandidate(); 
+  m_aICEnableNum           = pcTEncTop->getICEnableNum(); 
+#endif
 #if KWU_FIX_URQ
   m_pcRateCtrl           = pcTEncTop->getRateCtrl();
@@ -968 +971 @@
 #endif    
 #endif
+#if MTK_LOW_LATENCY_IC_ENCODING_H0086_FIX
+    pcSlice->setICEnableCandidate( m_aICEnableCandidate );         
+    pcSlice->setICEnableNum( m_aICEnableNum );         
+#endif
     //  Slice info. refinement
 #if H_MV

branches/HTM-12.0-dev1/source/Lib/TLibEncoder/TEncGOP.h

@@ -116 +116 @@
 #endif
 #endif
+#if MTK_LOW_LATENCY_IC_ENCODING_H0086_FIX
+  Int *m_aICEnableCandidate; 
+  Int *m_aICEnableNum; 
+#endif
   //--Adaptive Loop filter
   TEncSampleAdaptiveOffset*  m_pcSAO;

branches/HTM-12.0-dev1/source/Lib/TLibEncoder/TEncTop.cpp

@@ -84 +84 @@
   m_ivPicLists = NULL;
 #endif
+#if MTK_LOW_LATENCY_IC_ENCODING_H0086_FIX
+  m_aICEnableCandidate = NULL;
+  m_aICEnableNum = NULL;
+#endif
 }
 
@@ -305 +309 @@
 
   xInitPPSforTiles();
-
+#if MTK_LOW_LATENCY_IC_ENCODING_H0086_FIX
+  m_aICEnableCandidate = new Int[ 10 ];
+  m_aICEnableNum = new Int[ 10 ];
+
+  for(int i=0;i<10;i++)
+  {
+    m_aICEnableCandidate[i]=0;
+    m_aICEnableNum[i]=0;
+  }
+#endif
   // initialize processing unit classes
   m_cGOPEncoder.  init( this );

branches/HTM-12.0-dev1/source/Lib/TLibEncoder/TEncTop.h

@@ -79 +79 @@
 #if H_MV
   TComPicLists*           m_ivPicLists;                   ///< access to picture lists of other layers 
+#endif
+#if MTK_LOW_LATENCY_IC_ENCODING_H0086_FIX
+  Int *m_aICEnableCandidate;
+  Int *m_aICEnableNum;
 #endif
   // encoder search
@@ -162 +166 @@
   TComPicLists* getIvPicLists() { return m_ivPicLists; }
 #endif
+#if MTK_LOW_LATENCY_IC_ENCODING_H0086_FIX
+  Int *getICEnableCandidate() { return m_aICEnableCandidate; }
+  Int *getICEnableNum() { return m_aICEnableNum; }
+#endif
   Void      deletePicBuffer ();
 
@@ -221 +229 @@
   Void                    setIvPicLists         ( TComPicLists* picLists) { m_ivPicLists = picLists; }
 #endif
+#if MTK_LOW_LATENCY_IC_ENCODING_H0086_FIX
+  Void                    setICEnableCandidate         ( Int* ICEnableCandidate) { m_aICEnableCandidate = ICEnableCandidate; }
+  Void                    setICEnableNum         ( Int* ICEnableNum) { m_aICEnableNum = ICEnableNum; }
+#endif
   // -------------------------------------------------------------------------------------------------------------------
   // encoder function