Changeset 1029 in 3DVCSoftware for branches/HTM-11.2-dev0/source/Lib/TLibEncoder/TEncCu.cpp

Timestamp:

30 Jul 2014, 18:43:21 (10 years ago)

Author:

tech

Message:

Merged 11.2-dev1-MediaTek@1004.

File:

• branches/HTM-11.2-dev0/source/Lib/TLibEncoder/TEncCu.cpp (modified) (2 diffs)

branches/HTM-11.2-dev0/source/Lib/TLibEncoder/TEncCu.cpp

@@ -2545 +2545 @@
   AOF( uiWidth == uiHeight );
   
+#if SEC_DBBP_DISALLOW_8x8_I0078
+  if(uiWidth <= 8)
+  {
+    return;
+  }
+#endif
+  
   rpcTempCU->setPartSizeSubParts( SIZE_2Nx2N,  0, uhDepth );
   
@@ -2641 +2648 @@
   
   // reconstruct final prediction signal by combining both segments
+#if SHARP_DBBP_SIMPLE_FLTER_I0109
+  m_pcPredSearch->combineSegmentsWithMask(apPredYuv, m_ppcPredYuvTemp[uhDepth], pMask, uiWidth, uiHeight, 0, eVirtualPartSize);
+#else
   m_pcPredSearch->combineSegmentsWithMask(apPredYuv, m_ppcPredYuvTemp[uhDepth], pMask, uiWidth, uiHeight);
+#endif
   
   m_pcPredSearch->encodeResAndCalcRdInterCU( rpcTempCU, m_ppcOrigYuv[uhDepth], m_ppcPredYuvTemp[uhDepth], m_ppcResiYuvTemp[uhDepth], m_ppcResiYuvBest[uhDepth], m_ppcRecoYuvTemp[uhDepth], false );