Changeset 280 in 3DVCSoftware for branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComResidualGenerator.cpp

Timestamp:

14 Feb 2013, 23:41:41 (12 years ago)

Author:

tech

Message:

Integration of branch dev 2.

File:

• branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComResidualGenerator.cpp (modified) (6 diffs)

branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComResidualGenerator.cpp

@@ -184 +184 @@
   AOF  ( pcPic );
 
+#if MTK_MDIVRP_C0138
+  if (pcPic->getSPS()->getViewId() != 0)
+  {
+    return;
+  }
+#endif
+
   if( pcPic->getPOC() == 0 )
   {
@@ -300 +307 @@
 #endif
 {
+#if MTK_C0138_FIXED
+  UInt  uiBaseViewId  = 0;
+#else
   UInt  uiBaseViewId  = m_pcDepthMapGenerator->getBaseViewId( 0 );
-
+#endif
   if( !pcYuv )
   {
@@ -330 +340 @@
     );
 #endif
+#if MTK_MDIVRP_C0138
+  return true;
+#else
 #if QC_SIMPLIFIEDIVRP_M24938
   return xIsNonZeroByCBF( uiBaseViewId , uiXPosInRefView , uiYPosInRefView , uiBlkWidth , uiBlkHeight );
 #else
   return xIsNonZero( pcYuv, uiBlkWidth, uiBlkHeight );
+#endif
 #endif
 }
@@ -453 +467 @@
   Pel*    pRes      = pcCUResidual->getLumaAddr();
   UInt    uiLumaTrMode, uiChromaTrMode;
-#if LG_RESTRICTEDRESPRED_M24766
+#if LG_RESTRICTEDRESPRED_M24766  && !MTK_MDIVRP_C0138
   Int     iPUPredResiShift[4];
 #endif
@@ -479 +493 @@
   m_pcTrQuant->invRecurTransformNxN ( pcCU, 0, TEXT_CHROMA_V, pRes, 0, pcCUResidual->getCStride(), uiWidth, uiHeight, uiChromaTrMode, 0, piCoeff );
 
+#if !MTK_MDIVRP_C0138
   if( pcCU->getResPredFlag( 0 ) )
   {
@@ -495 +510 @@
 #endif
   }
+#endif
 
   //===== clear inter-view predicted parts =====