Changeset 1412 in 3DVCSoftware for branches/HTM-16.2-dev/source/Lib/TLibEncoder/TEncCu.cpp

Timestamp:

12 Apr 2018, 11:12:21 (7 years ago)

Author:

tech

Message:

• Update HM-16.18
• Cleanups
• Encoder Extension

-- Representation formats
-- Parameter set sharing
-- GOP configuration

File:

• branches/HTM-16.2-dev/source/Lib/TLibEncoder/TEncCu.cpp (modified) (117 diffs)

branches/HTM-16.2-dev/source/Lib/TLibEncoder/TEncCu.cpp

@@ -4 +4 @@
  * granted under this license.
  *
- * Copyright (c) 2010-2016, ITU/ISO/IEC
+ * Copyright (c) 2010-2017, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -46 +46 @@
 using namespace std;
 
-
 //! \ingroup TLibEncoder
 //! \{
@@ -68 +67 @@
   m_ppcTempCU      = new TComDataCU*[m_uhTotalDepth-1];
 
-#if NH_3D_ARP
+#if NH_3D
   m_ppcWeightedTempCU = new TComDataCU*[m_uhTotalDepth-1];
 #endif 
@@ -79 +78 @@
   m_ppcRecoYuvTemp = new TComYuv*[m_uhTotalDepth-1];
   m_ppcOrigYuv     = new TComYuv*[m_uhTotalDepth-1];
-#if NH_3D_DBBP
+#if NH_3D
   m_ppcOrigYuvDBBP = new TComYuv*[m_uhTotalDepth-1];
 #endif
@@ -92 +91 @@
     m_ppcBestCU[i] = new TComDataCU; m_ppcBestCU[i]->create( chromaFormat, uiNumPartitions, uiWidth, uiHeight, false, uiMaxWidth >> (m_uhTotalDepth - 1) );
     m_ppcTempCU[i] = new TComDataCU; m_ppcTempCU[i]->create( chromaFormat, uiNumPartitions, uiWidth, uiHeight, false, uiMaxWidth >> (m_uhTotalDepth - 1) );
-#if NH_3D_ARP
+#if NH_3D
     m_ppcWeightedTempCU[i] = new TComDataCU; m_ppcWeightedTempCU[i]->create( chromaFormat, uiNumPartitions, uiWidth, uiHeight, false, uiMaxWidth >> (m_uhTotalDepth - 1) );
 #endif  
@@ -105 +104 @@
 
     m_ppcOrigYuv    [i] = new TComYuv; m_ppcOrigYuv    [i]->create(uiWidth, uiHeight, chromaFormat);
-#if NH_3D_DBBP
+#if NH_3D
     m_ppcOrigYuvDBBP[i] = new TComYuv; m_ppcOrigYuvDBBP[i]->create(uiWidth, uiHeight, chromaFormat);
 #endif
@@ -147 +146 @@
       m_ppcTempCU[i]->destroy();      delete m_ppcTempCU[i];      m_ppcTempCU[i] = NULL;
     }
-#if NH_3D_ARP
+#if NH_3D
     if(m_ppcWeightedTempCU[i])
     {
@@ -181 +180 @@
       m_ppcOrigYuv[i]->destroy();     delete m_ppcOrigYuv[i];     m_ppcOrigYuv[i] = NULL;
     }
-#if NH_3D_DBBP
+#if NH_3D
     if(m_ppcOrigYuvDBBP[i])
     {
@@ -199 +198 @@
   }
 
-#if NH_3D_ARP
+#if NH_3D
   if(m_ppcWeightedTempCU)
   {
@@ -241 +240 @@
     m_ppcOrigYuv = NULL;
   }
-#if NH_3D_DBBP
+#if NH_3D
   if(m_ppcOrigYuvDBBP)
   {
@@ -266 +265 @@
 
   m_pcRateCtrl         = pcEncTop->getRateCtrl();
+  m_lumaQPOffset       = 0;
+  initLumaDeltaQpLUT();
 }
 
@@ -281 +282 @@
   m_ppcTempCU[0]->initCtu( pCtu->getPic(), pCtu->getCtuRsAddr() );
 
-#if NH_3D_ARP
+#if NH_3D
   m_ppcWeightedTempCU[0]->initCtu( pCtu->getPic(), pCtu->getCtuRsAddr() );
 #endif
@@ -329 +330 @@
 // Protected member functions
 // ====================================================================================================================
+
+Void TEncCu::initLumaDeltaQpLUT()
+{
+  const LumaLevelToDeltaQPMapping &mapping=m_pcEncCfg->getLumaLevelToDeltaQPMapping();
+
+  if ( !mapping.isEnabled() )
+  {
+    return;
+  }
+
+  // map the sparse LumaLevelToDeltaQPMapping.mapping to a fully populated linear table.
+
+  Int         lastDeltaQPValue=0;
+  std::size_t nextSparseIndex=0;
+  for(Int index=0; index<LUMA_LEVEL_TO_DQP_LUT_MAXSIZE; index++)
+  {
+    while (nextSparseIndex < mapping.mapping.size() && index>=mapping.mapping[nextSparseIndex].first)
+    {
+      lastDeltaQPValue=mapping.mapping[nextSparseIndex].second;
+      nextSparseIndex++;
+    }
+    m_lumaLevelToDeltaQPLUT[index]=lastDeltaQPValue;
+  }
+}
+
+Int TEncCu::calculateLumaDQP(TComDataCU *pCU, const UInt absPartIdx, const TComYuv * pOrgYuv)
+{
+  const Pel *pY = pOrgYuv->getAddr(COMPONENT_Y, absPartIdx);
+  const Int stride  = pOrgYuv->getStride(COMPONENT_Y);
+  Int width = pCU->getWidth(absPartIdx);
+  Int height = pCU->getHeight(absPartIdx);
+  Double avg = 0;
+
+  // limit the block by picture size
+  const TComSPS* pSPS = pCU->getSlice()->getSPS();
+  if ( pCU->getCUPelX() + width > pSPS->getPicWidthInLumaSamples() )
+  {
+    width = pSPS->getPicWidthInLumaSamples() - pCU->getCUPelX();
+  }
+  if ( pCU->getCUPelY() + height > pSPS->getPicHeightInLumaSamples() )
+  {
+    height = pSPS->getPicHeightInLumaSamples() - pCU->getCUPelY();
+  }
+
+  // Get QP offset derived from Luma level
+  if ( m_pcEncCfg->getLumaLevelToDeltaQPMapping().mode == LUMALVL_TO_DQP_AVG_METHOD )
+  {
+    // Use avg method
+    Int sum = 0;
+    for (Int y = 0; y < height; y++)
+    {
+      for (Int x = 0; x < width; x++)
+      {
+        sum += pY[x];
+      }
+      pY += stride;
+    }
+    avg = (Double)sum/(width*height);
+  }
+  else
+  {
+    // Use maximum luma value
+    Int maxVal = 0;
+    for (Int y = 0; y < height; y++)
+    {
+      for (Int x = 0; x < width; x++)
+      {
+        if (pY[x] > maxVal)
+        {
+          maxVal = pY[x];
+        }
+      }
+      pY += stride;
+    }
+    // use a percentage of the maxVal
+    avg = (Double)maxVal * m_pcEncCfg->getLumaLevelToDeltaQPMapping().maxMethodWeight;
+  }
+
+  Int lumaIdx = Clip3<Int>(0, Int(LUMA_LEVEL_TO_DQP_LUT_MAXSIZE)-1, Int(avg+0.5) );
+  Int QP = m_lumaLevelToDeltaQPLUT[lumaIdx];
+  return QP;
+}
+
 //! Derive small set of test modes for AMP encoder speed-up
 #if AMP_ENC_SPEEDUP
@@ -420 +504 @@
   const UInt fastDeltaQPCuMaxSize    = Clip3(sps.getMaxCUHeight()>>sps.getLog2DiffMaxMinCodingBlockSize(), sps.getMaxCUHeight(), 32u);
 
-#if NH_3D_QTL
-#if NH_3D_QTLPC
+#if NH_3D
   Bool  bLimQtPredFalg    = pcPic->getSlice(0)->getQtPredFlag(); 
-#else
-  Bool  bLimQtPredFalg    = false;
-#endif
   TComPic *pcTexture      = rpcBestCU->getSlice()->getTexturePic();
 
@@ -440 +520 @@
   m_ppcOrigYuv[uiDepth]->copyFromPicYuv( pcPic->getPicYuvOrg(), rpcBestCU->getCtuRsAddr(), rpcBestCU->getZorderIdxInCtu() );
 
-#if NH_3D_QTL  
+#if NH_3D
   Bool    bTrySplit     = true;
   Bool    bTrySplitDQP  = true;
@@ -448 +528 @@
   Bool    earlyDetectionSkipMode = false;
 
-#if NH_3D_NBDV
+#if NH_3D
   DisInfo DvInfo; 
   DvInfo.m_acNBDV.setZero();
   DvInfo.m_aVIdxCan = 0;
-#if NH_3D_NBDV_REF
   DvInfo.m_acDoNBDV.setZero();
-#endif
 #endif
   const UInt uiLPelX   = rpcBestCU->getCUPelX();
@@ -492 +570 @@
   }
 
+  if ( m_pcEncCfg->getLumaLevelToDeltaQPMapping().isEnabled() )
+  {
+    if ( uiDepth <= pps.getMaxCuDQPDepth() )
+    {
+      // keep using the same m_QP_LUMA_OFFSET in the same CTU
+      m_lumaQPOffset = calculateLumaDQP(rpcTempCU, 0, m_ppcOrigYuv[uiDepth]);
+    }
+    iMinQP = Clip3(-sps.getQpBDOffset(CHANNEL_TYPE_LUMA), MAX_QP, iBaseQP - m_lumaQPOffset);
+    iMaxQP = iMinQP; // force encode choose the modified QO
+  }
+
   if ( m_pcEncCfg->getUseRateCtrl() )
   {
@@ -502 +591 @@
   const Int lowestQP = iMinQP; // For TQB, use this QP which is the lowest non TQB QP tested (rather than QP'=0) - that way delta QPs are smaller, and TQB can be tested at all CU levels.
 
-  if ( (pps.getTransquantBypassEnableFlag()) )
+  if ( (pps.getTransquantBypassEnabledFlag()) )
   {
     isAddLowestQP = true; // mark that the first iteration is to cost TQB mode.
@@ -512 +601 @@
   }
 
-#if NH_3D_IC
+#if NH_3D
   Bool bICEnabled = rpcTempCU->getSlice()->getViewIndex() && ( rpcTempCU->getSlice()->getSliceType() == P_SLICE || rpcTempCU->getSlice()->getSliceType() == B_SLICE ) && !rpcTempCU->getSlice()->getIsDepth();
   bICEnabled = bICEnabled && rpcTempCU->getSlice()->getApplyIC();
@@ -536 +625 @@
         iQP = lowestQP;
       }
-
-#if NH_3D_QTL
+      if ( m_pcEncCfg->getLumaLevelToDeltaQPMapping().isEnabled() && uiDepth <= pps.getMaxCuDQPDepth() )
+      {
+        getSliceEncoder()->updateLambda(pcSlice, iQP);
+      }
+
+
+
+#if NH_3D
       bTrySplit    = true;
 #endif
@@ -555 +650 @@
 
       rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode );
-#if NH_3D_QTL
+#if NH_3D
       //logic for setting bTrySplit using the partition information that is stored of the texture colocated CU
-#if H_3D_FCO
-      if(depthMapDetect && !bIntraSliceDetect && !rapPic && ( m_pcEncCfg->getUseQTL() || bLimQtPredFalg ) && pcTexture->getReconMark())
-#else
       if(depthMapDetect && !bIntraSliceDetect && !rapPic && ( m_pcEncCfg->getUseQTL() || bLimQtPredFalg ))
-#endif
       {
         TComDataCU* pcTextureCU = pcTexture->getCtu( rpcBestCU->getCtuRsAddr() ); //Corresponding texture LCU
@@ -592 +683 @@
 #endif
 
-#if NH_3D_NBDV
+#if NH_3D
       if( rpcTempCU->getSlice()->getSliceType() != I_SLICE )
       {
-#if NH_3D_ARP && NH_3D_IV_MERGE && NH_3D_VSP
         if( rpcTempCU->getSlice()->getIvResPredFlag() || rpcTempCU->getSlice()->getIvMvPredFlag() || rpcTempCU->getSlice()->getViewSynthesisPredFlag() )
-#else 
-#if NH_3D_IV_MERGE && NH_3D_VSP
-        if( rpcTempCU->getSlice()->getIvMvPredFlag() || rpcTempCU->getSlice()->getViewSynthesisPredFlag() )
-#else
-#if NH_3D_ARP && NH_3D_VSP
-        if( rpcTempCU->getSlice()->getIvResPredFlag() || rpcTempCU->getSlice()->getViewSynthesisPredFlag() )
-#else
-#if NH_3D_VSP
-        if( rpcTempCU->getSlice()->getViewSynthesisPredFlag() )
-#else
-#if NH_3D_ARP
-        if( rpcTempCU->getSlice()->getIvResPredFlag() )
-#else
-#if H_3D_IV_MERGE
-        if( rpcTempCU->getSlice()->getVPS()->getIvMvPredFlag(rpcTempCU->getSlice()->getLayerId()) )
-#else
-#if NH_3D_DBBP
-        if( rpcTempCU->getSlice()->getDepthBasedBlkPartFlag() )
-#else
-        if (0)
-#endif
-#endif
-#endif
-#endif
-#endif
-#endif
-#endif
         {
           PartSize ePartTemp = rpcTempCU->getPartitionSize(0);
           rpcTempCU->setPartSizeSubParts(SIZE_2Nx2N, 0, uiDepth);
-#if NH_3D_IV_MERGE
           if (rpcTempCU->getSlice()->getIsDepth() )
           {
@@ -634 +696 @@
           else
           {
-#endif 
-#if NH_3D_NBDV_REF
             if( rpcTempCU->getSlice()->getDepthRefinementFlag() )
             {
@@ -641 +701 @@
             }
             else
-#endif 
             {
               rpcTempCU->getDisMvpCandNBDV(&DvInfo);
             }
-#if NH_3D_IV_MERGE
-          }
-#endif
+          }
           rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
           rpcBestCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
@@ -666 +723 @@
       if( rpcBestCU->getSlice()->getSliceType() != I_SLICE )
       {
-#if NH_3D_IC
+#if NH_3D
         for( UInt uiICId = 0; uiICId < ( bICEnabled ? 2 : 1 ); uiICId++ )
         {
@@ -674 +731 @@
         if(m_pcEncCfg->getUseEarlySkipDetection())
         {
-#if NH_3D_IC
+#if NH_3D
             rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth);
 #endif
@@ -683 +740 @@
           rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode );//by Competition for inter_2Nx2N
 #endif
-#if NH_3D_VSP  || NH_3D_DBBP
+#if NH_3D
           rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
 #endif
         }
         // SKIP
-#if NH_3D_IC
+#if NH_3D
           rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth);
 #endif
@@ -697 +754 @@
 
         rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode );
-#if NH_3D_VSP  || NH_3D_DBBP
+#if NH_3D
         rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
 #endif
@@ -704 +761 @@
         {
           // 2Nx2N, NxN
-#if NH_3D_IC
+#if NH_3D
             rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth);
 #endif
@@ -714 +771 @@
           rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode );
 #endif
-#if NH_3D_VSP  || NH_3D_DBBP
+#if NH_3D
           rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
-#endif
-#if NH_3D_DBBP
             if( rpcTempCU->getSlice()->getDepthBasedBlkPartFlag() && rpcTempCU->getSlice()->getDefaultRefViewIdxAvailableFlag() )
             {
               xCheckRDCostInterDBBP( rpcBestCU, rpcTempCU DEBUG_STRING_PASS_INTO(sDebug), false );
               rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode  );
-#if NH_3D_VSP  || NH_3D_DBBP
               rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
-#endif
             }
 #endif
@@ -733 +786 @@
           }
         }
-#if NH_3D_IC
+#if NH_3D
         }
 #endif
       }
-#if NH_3D_QTL
+#if NH_3D
       if(depthMapDetect && !bIntraSliceDetect && !rapPic && ( m_pcEncCfg->getUseQTL() || bLimQtPredFalg ))
       {
@@ -757 +810 @@
     }
 #endif
-#if NH_3D_ENC_DEPTH
+#if NH_3D
     if( rpcBestCU->getSlice()->getIsDepth() && rpcBestCU->getSlice()->isIRAP() )
     {
       earlyDetectionSkipMode = false;
     }
-#endif
-#if NH_3D_DIS
+
     rpcTempCU->initEstData( uiDepth, iMinQP, isAddLowestQP  );
     if( rpcBestCU->getSlice()->getDepthIntraSkipFlag() )
@@ -792 +844 @@
           {
             if( uiDepth == sps.getLog2DiffMaxMinCodingBlockSize() && doNotBlockPu
-#if NH_3D_QTL
+#if NH_3D
                 && bTrySplit
 #endif
@@ -804 +856 @@
 #endif
               rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode );
-#if NH_3D_VSP || NH_3D_DBBP
+#if NH_3D
               rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
 #endif
@@ -812 +864 @@
 
           if(doNotBlockPu
-#if NH_3D_QTL
+#if NH_3D
             && bTryNx2N
 #endif
@@ -823 +875 @@
 #endif
             rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode );
-#if NH_3D_VSP || NH_3D_DBBP
+#if NH_3D
             rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
 #endif
@@ -833 +885 @@
           }
           if(doNotBlockPu
-#if NH_3D_QTL
+#if NH_3D
             && bTry2NxN
 #endif
@@ -846 +898 @@
 
             rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode );
-#if NH_3D_VSP || NH_3D_DBBP
+#if NH_3D
             rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
 #endif
@@ -874 +926 @@
             {
               if(doNotBlockPu
-#if NH_3D_QTL
+#if NH_3D
                 && bTry2NxN
 #endif
@@ -885 +937 @@
 #endif
                 rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode );
-#if NH_3D_VSP || NH_3D_DBBP
+#if NH_3D
                 rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
 #endif
@@ -894 +946 @@
               }
               if(doNotBlockPu
-#if NH_3D_QTL
+#if NH_3D
                 && bTry2NxN
 #endif
@@ -906 +958 @@
 
                 rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode );
-#if NH_3D_VSP || NH_3D_DBBP
+#if NH_3D
                 rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
 #endif
@@ -920 +972 @@
             {
               if(doNotBlockPu
-#if NH_3D_QTL
+#if NH_3D
                 && bTry2NxN
 #endif
@@ -933 +985 @@
 
                 rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode );
-#if NH_3D_VSP || NH_3D_DBBP
+#if NH_3D
                 rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
 #endif
@@ -942 +994 @@
               }
               if(doNotBlockPu
-#if NH_3D_QTL
+#if NH_3D
                 && bTry2NxN
 #endif
@@ -953 +1005 @@
 #endif
                 rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode );
-#if NH_3D_VSP || NH_3D_DBBP
+#if NH_3D
                 rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
 #endif
@@ -969 +1021 @@
             {
               if(doNotBlockPu
-#if NH_3D_QTL
+#if NH_3D
                 && bTryNx2N
 #endif
@@ -981 +1033 @@
 
                 rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode );
-#if NH_3D_VSP || NH_3D_DBBP
+#if NH_3D
                 rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
 #endif
@@ -990 +1042 @@
               }
               if(doNotBlockPu
-#if NH_3D_QTL
+#if NH_3D
                 && bTryNx2N
 #endif
@@ -1001 +1053 @@
 #endif
                 rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode );
-#if NH_3D_VSP || NH_3D_DBBP
+#if NH_3D
                 rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
 #endif
@@ -1010 +1062 @@
             {
               if(doNotBlockPu
-#if NH_3D_QTL
+#if NH_3D
                 && bTryNx2N
 #endif
@@ -1021 +1073 @@
 #endif
                 rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode );
-#if NH_3D_VSP || NH_3D_DBBP
+#if NH_3D
                 rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
 #endif
@@ -1030 +1082 @@
               }
               if(doNotBlockPu
-#if NH_3D_QTL
+#if NH_3D
                 && bTryNx2N
 #endif
@@ -1042 +1094 @@
 #endif
                 rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode );
-#if NH_3D_VSP || NH_3D_DBBP
+#if NH_3D
                 rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
 #endif
@@ -1051 +1103 @@
 
 #else
-#if NH_3D_QTL
+#if NH_3D
             if (bTry2NxN)
             {
 #endif
-
-            xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2NxnU );
-            rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode );
-#if NH_3D_VSP || NH_3D_DBBP
-            rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
-#endif
-            xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2NxnD );
-            rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode );
-#if NH_3D_VSP || NH_3D_DBBP
-            rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
-#endif
-#if NH_3D_QTL
+              xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2NxnU );
+              rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode );
+#if NH_3D
+              rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
+#endif
+              xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2NxnD );
+              rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode );
+#if NH_3D
+              rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
             }
             if (bTryNx2N)
             {
 #endif
-            xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_nLx2N );
-            rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode );
-#if NH_3D_VSP || NH_3D_DBBP
-            rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
-#endif
-            xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_nRx2N );
-            rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode );
-#if NH_3D_VSP || NH_3D_DBBP
-            rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
-#endif
-#if NH_3D_QTL
+              xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_nLx2N );
+              rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode );
+#if NH_3D
+              rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
+#endif
+              xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_nRx2N );
+              rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode );
+#if NH_3D
+              rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth);
             }
 #endif
@@ -1093 +1140 @@
         {
 #endif
-
         // do normal intra modes
         // speedup for inter frames
 
-        if((rpcBestCU->getSlice()->getSliceType() == I_SLICE)                                     ||
-           ((!m_pcEncCfg->getDisableIntraPUsInInterSlices()) && (
-           (rpcBestCU->getCbf( 0, COMPONENT_Y  ) != 0)                                            ||
-          ((rpcBestCU->getCbf( 0, COMPONENT_Cb ) != 0) && (numberValidComponents > COMPONENT_Cb)) ||
-          ((rpcBestCU->getCbf( 0, COMPONENT_Cr ) != 0) && (numberValidComponents > COMPONENT_Cr))   // avoid very complex intra if it is unlikely
- #if NH_3D_ENC_DEPTH
+
+#if MCTS_ENC_CHECK
+        if ( m_pcEncCfg->getTMCTSSEITileConstraint() || (rpcBestCU->getSlice()->getSliceType() == I_SLICE) ||
+             ((!m_pcEncCfg->getDisableIntraPUsInInterSlices()) && (
+             (rpcBestCU->getCbf(0, COMPONENT_Y) != 0) ||
+             ((rpcBestCU->getCbf(0, COMPONENT_Cb) != 0) && (numberValidComponents > COMPONENT_Cb)) ||
+             ((rpcBestCU->getCbf(0, COMPONENT_Cr) != 0) && (numberValidComponents > COMPONENT_Cr))  // avoid very complex intra if it is unlikely
+#else
+        if((rpcBestCU->getSlice()->getSliceType() == I_SLICE)                                        ||
+            ((!m_pcEncCfg->getDisableIntraPUsInInterSlices()) && (
+              (rpcBestCU->getCbf( 0, COMPONENT_Y  ) != 0)                                            ||
+             ((rpcBestCU->getCbf( 0, COMPONENT_Cb ) != 0) && (numberValidComponents > COMPONENT_Cb)) ||
+             ((rpcBestCU->getCbf( 0, COMPONENT_Cr ) != 0) && (numberValidComponents > COMPONENT_Cr))  // avoid very complex intra if it is unlikely
+#endif
+ #if NH_3D
             || rpcBestCU->getSlice()->getIsDepth()
 #endif
             )))
-        {
-#if NH_3D_ENC_DEPTH
-            Bool bOnlyIVP = false;
-            Bool bUseIVP = true;
-            if( (rpcBestCU->getSlice()->getSliceType() != I_SLICE) && 
-                !( (rpcBestCU->getCbf( 0, COMPONENT_Y  ) != 0)                                            ||
-                  ((rpcBestCU->getCbf( 0, COMPONENT_Cb ) != 0) && (numberValidComponents > COMPONENT_Cb)) ||
-                  ((rpcBestCU->getCbf( 0, COMPONENT_Cr ) != 0) && (numberValidComponents > COMPONENT_Cr))   ) &&
-                  (rpcBestCU->getSlice()->getIsDepth() && !(rpcBestCU->getSlice()->isIRAP())) )
-            { 
-              bOnlyIVP = true;
-              bUseIVP = rpcBestCU->getSlice()->getIntraContourFlag();
-            }
-            if( bUseIVP )
-            {
-              xCheckRDCostIntra( rpcBestCU, rpcTempCU, SIZE_2Nx2N DEBUG_STRING_PASS_INTO(sDebug), bOnlyIVP );
-#else
-          xCheckRDCostIntra( rpcBestCU, rpcTempCU, SIZE_2Nx2N DEBUG_STRING_PASS_INTO(sDebug) );
+          {
+#if NH_3D
+          Bool bOnlyIVP = false;
+          Bool bUseIVP = true;
+          if( (rpcBestCU->getSlice()->getSliceType() != I_SLICE) && 
+            !( (rpcBestCU->getCbf( 0, COMPONENT_Y  ) != 0)                                            ||
+            ((rpcBestCU->getCbf( 0, COMPONENT_Cb ) != 0) && (numberValidComponents > COMPONENT_Cb)) ||
+            ((rpcBestCU->getCbf( 0, COMPONENT_Cr ) != 0) && (numberValidComponents > COMPONENT_Cr))   ) &&
+            (rpcBestCU->getSlice()->getIsDepth() && !(rpcBestCU->getSlice()->isIRAP())) )
+          { 
+            bOnlyIVP = true;
+            bUseIVP = rpcBestCU->getSlice()->getIntraContourFlag();
+          }
+          if( bUseIVP )
+          {
+            xCheckRDCostIntra( rpcBestCU, rpcTempCU, SIZE_2Nx2N DEBUG_STRING_PASS_INTO(sDebug), bOnlyIVP );
+#else
+            xCheckRDCostIntra( rpcBestCU, rpcTempCU, SIZE_2Nx2N DEBUG_STRING_PASS_INTO(sDebug) );
 #endif
 #if KWU_RC_MADPRED_E0227
@@ -1133 +1188 @@
 #endif
 
-          rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode );
-          if( uiDepth == sps.getLog2DiffMaxMinCodingBlockSize() )
-          {
-#if NH_3D_QTL //Try IntraNxN
+            rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode );
+            if( uiDepth == sps.getLog2DiffMaxMinCodingBlockSize() )
+            {
+#if NH_3D   //Try IntraNxN
               if(bTrySplit)
               {
 #endif
-            if( rpcTempCU->getWidth(0) > ( 1 << sps.getQuadtreeTULog2MinSize() ) )
-            {
-#if NH_3D_ENC_DEPTH
-              xCheckRDCostIntra( rpcBestCU, rpcTempCU, SIZE_NxN DEBUG_STRING_PASS_INTO(sDebug), bOnlyIVP );
-#else
-              xCheckRDCostIntra( rpcBestCU, rpcTempCU, SIZE_NxN DEBUG_STRING_PASS_INTO(sDebug)   );
+                if( rpcTempCU->getWidth(0) > ( 1 << sps.getQuadtreeTULog2MinSize() ) )
+                {
+#if NH_3D
+                  xCheckRDCostIntra( rpcBestCU, rpcTempCU, SIZE_NxN DEBUG_STRING_PASS_INTO(sDebug), bOnlyIVP );
+#else
+                  xCheckRDCostIntra( rpcBestCU, rpcTempCU, SIZE_NxN DEBUG_STRING_PASS_INTO(sDebug)   );
 #endif        
-              rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode );
+                  rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode );
+                }
+#if NH_3D
+              }
+#endif
             }
-#if NH_3D_QTL
-              }
-#endif
-          }
-#if NH_3D_ENC_DEPTH
+#if NH_3D
           }
 #endif
@@ -1171 +1226 @@
           if((uiBestBits > uiRawBits) || (rpcBestCU->getTotalCost() > m_pcRdCost->calcRdCost(uiRawBits, 0)))
 #endif
-
           {
             xCheckIntraPCM (rpcBestCU, rpcTempCU);
@@ -1236 +1290 @@
   }
 
+  if ( m_pcEncCfg->getLumaLevelToDeltaQPMapping().isEnabled() )
+  {
+    iMinQP = Clip3(-sps.getQpBDOffset(CHANNEL_TYPE_LUMA), MAX_QP, iBaseQP - m_lumaQPOffset);
+    iMaxQP = iMinQP;
+  }
+
   if ( m_pcEncCfg->getUseRateCtrl() )
   {
@@ -1251 +1311 @@
   const Bool bSubBranch = bBoundary || !( m_pcEncCfg->getUseEarlyCU() && rpcBestCU->getTotalCost()!=MAX_DOUBLE && rpcBestCU->isSkipped(0) );
 #endif
-#if NH_3D_QTL
+#if NH_3D
   if( bSubBranch && uiDepth < sps.getLog2DiffMaxMinCodingBlockSize() && (!getFastDeltaQp() || uiWidth > fastDeltaQPCuMaxSize || bBoundary) && bTrySplitDQP )
 #else
@@ -1258 +1318 @@
   {
     // further split
+    Double splitTotalCost = 0;
+
     for (Int iQP=iMinQP; iQP<=iMaxQP; iQP++)
     {
@@ -1280 +1342 @@
       DEBUG_STRING_NEW(sTempDebug)
 
-#if NH_3D_ARP
+#if NH_3D
       m_ppcWeightedTempCU[uhNextDepth]->setSlice( m_ppcWeightedTempCU[ uiDepth]->getSlice()); 
       m_ppcWeightedTempCU[uhNextDepth]->setPic  ( m_ppcWeightedTempCU[ uiDepth] ); 
@@ -1318 +1380 @@
           rpcTempCU->copyPartFrom( pcSubBestPartCU, uiPartUnitIdx, uhNextDepth );         // Keep best part data to current temporary data.
           xCopyYuv2Tmp( pcSubBestPartCU->getTotalNumPart()*uiPartUnitIdx, uhNextDepth );
+          if ( m_pcEncCfg->getLumaLevelToDeltaQPMapping().isEnabled() && pps.getMaxCuDQPDepth() >= 1 )
+          {
+            splitTotalCost += pcSubBestPartCU->getTotalCost();
+          }
         }
         else
@@ -1331 +1397 @@
         m_pcEntropyCoder->resetBits();
         m_pcEntropyCoder->encodeSplitFlag( rpcTempCU, 0, uiDepth, true );
+        if ( m_pcEncCfg->getLumaLevelToDeltaQPMapping().isEnabled() && pps.getMaxCuDQPDepth() >= 1 )
+        {
+          Int splitBits = m_pcEntropyCoder->getNumberOfWrittenBits();
+          Double splitBitCost = m_pcRdCost->calcRdCost( splitBits, 0 );
+          splitTotalCost += splitBitCost;
+        }
 
         rpcTempCU->getTotalBits() += m_pcEntropyCoder->getNumberOfWrittenBits(); // split bits
         rpcTempCU->getTotalBins() += ((TEncBinCABAC *)((TEncSbac*)m_pcEntropyCoder->m_pcEntropyCoderIf)->getEncBinIf())->getBinsCoded();
       }
+      if ( m_pcEncCfg->getLumaLevelToDeltaQPMapping().isEnabled() && pps.getMaxCuDQPDepth() >= 1 )
+      {
+        rpcTempCU->getTotalCost() = splitTotalCost;
+      }
+      else
+      {
 #if NH_3D_VSO // M10
       if ( m_pcRdCost->getUseLambdaScaleVSO() )
@@ -1343 +1421 @@
 #endif
         rpcTempCU->getTotalCost()  = m_pcRdCost->calcRdCost( rpcTempCU->getTotalBits(), rpcTempCU->getTotalDistortion() );
+      }
 
       if( uiDepth == pps.getMaxCuDQPDepth() && pps.getUseDQP())
@@ -1572 +1651 @@
   }
 
-  if (pps.getTransquantBypassEnableFlag())
+  if (pps.getTransquantBypassEnabledFlag())
   {
     m_pcEntropyCoder->encodeCUTransquantBypassFlag( pcCU, uiAbsPartIdx );
@@ -1591 +1670 @@
 
     m_pcEntropyCoder->encodeMergeIndex( pcCU, uiAbsPartIdx );
-#if NH_3D_ARP
+#if NH_3D
     m_pcEntropyCoder->encodeARPW( pcCU , uiAbsPartIdx );
-#endif
-#if NH_3D_IC
     m_pcEntropyCoder->encodeICFlag  ( pcCU, uiAbsPartIdx );
 #endif
@@ -1602 +1679 @@
   }
 
-#if NH_3D_DIS
+#if NH_3D
   m_pcEntropyCoder->encodeDIS( pcCU, uiAbsPartIdx );
   if(!pcCU->getDISFlag(uiAbsPartIdx))
   {
 #endif
-  m_pcEntropyCoder->encodePredMode( pcCU, uiAbsPartIdx );
-  m_pcEntropyCoder->encodePartSize( pcCU, uiAbsPartIdx, uiDepth );
-
-  if (pcCU->isIntra( uiAbsPartIdx ) && pcCU->getPartitionSize( uiAbsPartIdx ) == SIZE_2Nx2N )
-  {
-    m_pcEntropyCoder->encodeIPCMInfo( pcCU, uiAbsPartIdx );
-
-    if(pcCU->getIPCMFlag(uiAbsPartIdx))
-    {
-#if NH_3D_SDC_INTRA
-      m_pcEntropyCoder->encodeSDCFlag( pcCU, uiAbsPartIdx );
+    m_pcEntropyCoder->encodePredMode( pcCU, uiAbsPartIdx );
+    m_pcEntropyCoder->encodePartSize( pcCU, uiAbsPartIdx, uiDepth );
+
+    if (pcCU->isIntra( uiAbsPartIdx ) && pcCU->getPartitionSize( uiAbsPartIdx ) == SIZE_2Nx2N )
+    {
+      m_pcEntropyCoder->encodeIPCMInfo( pcCU, uiAbsPartIdx );
+
+      if(pcCU->getIPCMFlag(uiAbsPartIdx))
+      {
+#if NH_3D
+        m_pcEntropyCoder->encodeSDCFlag( pcCU, uiAbsPartIdx );
 #endif  
 
-      // Encode slice finish
-      finishCU(pcCU,uiAbsPartIdx);
-      return;
-    }
-  }
-
-  // prediction Info ( Intra : direction mode, Inter : Mv, reference idx )
-  m_pcEntropyCoder->encodePredInfo( pcCU, uiAbsPartIdx );
-#if NH_3D_DBBP
-  m_pcEntropyCoder->encodeDBBPFlag( pcCU, uiAbsPartIdx );
-#endif
-#if NH_3D_SDC_INTRA
-  m_pcEntropyCoder->encodeSDCFlag( pcCU, uiAbsPartIdx );
-#endif  
-#if NH_3D_ARP
-  m_pcEntropyCoder->encodeARPW( pcCU , uiAbsPartIdx );
-#endif
-#if NH_3D_IC
-  m_pcEntropyCoder->encodeICFlag  ( pcCU, uiAbsPartIdx );
-#endif
-
-  // Encode Coefficients
-  Bool bCodeDQP = getdQPFlag();
-  Bool codeChromaQpAdj = getCodeChromaQpAdjFlag();
-  m_pcEntropyCoder->encodeCoeff( pcCU, uiAbsPartIdx, uiDepth, bCodeDQP, codeChromaQpAdj );
-  setCodeChromaQpAdjFlag( codeChromaQpAdj );
-  setdQPFlag( bCodeDQP );
-#if NH_3D_DIS
+        // Encode slice finish
+        finishCU(pcCU,uiAbsPartIdx);
+        return;
+      }
+    }
+
+    // prediction Info ( Intra : direction mode, Inter : Mv, reference idx )
+    m_pcEntropyCoder->encodePredInfo( pcCU, uiAbsPartIdx );
+#if NH_3D
+    m_pcEntropyCoder->encodeDBBPFlag( pcCU, uiAbsPartIdx );
+    m_pcEntropyCoder->encodeSDCFlag( pcCU, uiAbsPartIdx );
+    m_pcEntropyCoder->encodeARPW( pcCU , uiAbsPartIdx );
+    m_pcEntropyCoder->encodeICFlag  ( pcCU, uiAbsPartIdx );
+#endif
+
+    // Encode Coefficients
+    Bool bCodeDQP = getdQPFlag();
+    Bool codeChromaQpAdj = getCodeChromaQpAdjFlag();
+    m_pcEntropyCoder->encodeCoeff( pcCU, uiAbsPartIdx, uiDepth, bCodeDQP, codeChromaQpAdj );
+    setCodeChromaQpAdjFlag( codeChromaQpAdj );
+    setdQPFlag( bCodeDQP );
+#if NH_3D
   }
 #endif
@@ -1788 +1859 @@
 #endif
 
-#if NH_3D_MLC
+#if NH_3D
   TComMvField  cMvFieldNeighbours[MRG_MAX_NUM_CANDS_MEM << 1]; // double length for mv of both lists
   UChar uhInterDirNeighbours[MRG_MAX_NUM_CANDS_MEM];
@@ -1803 +1874 @@
   }
   UChar uhDepth = rpcTempCU->getDepth( 0 );
-#if NH_3D_IC
+#if NH_3D
   Bool bICFlag = rpcTempCU->getICFlag( 0 );
 #endif
@@ -1817 +1888 @@
 #endif
 
-#if NH_3D_ARP
+#if NH_3D  
   DisInfo cOrigDisInfo = rpcTempCU->getDvInfo(0);
-#else
 #endif
 
   rpcTempCU->setPartSizeSubParts( SIZE_2Nx2N, 0, uhDepth ); // interprets depth relative to CTU level
 
-#if NH_3D_SPIVMP
+#if NH_3D
   Bool bSPIVMPFlag[MRG_MAX_NUM_CANDS_MEM];
   memset(bSPIVMPFlag, false, sizeof(Bool)*MRG_MAX_NUM_CANDS_MEM);
@@ -1831 +1901 @@
   pcMvFieldSP = new TComMvField[rpcTempCU->getPic()->getPicSym()->getNumPartitionsInCtu()*2]; 
   puhInterDirSP = new UChar[rpcTempCU->getPic()->getPicSym()->getNumPartitionsInCtu()]; 
-#endif
-
-#if NH_3D_VSP
-#if !NH_3D_ARP
-  Int vspFlag[MRG_MAX_NUM_CANDS_MEM];
-  memset(vspFlag, 0, sizeof(Int)*MRG_MAX_NUM_CANDS_MEM);
-#if NH_3D_MLC
-  rpcTempCU->initAvailableFlags();
-#endif
-  rpcTempCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand );
-#if NH_3D_MLC
-  rpcTempCU->xGetInterMergeCandidates( 0, 0, cMvFieldNeighbours,uhInterDirNeighbours
-#if NH_3D_SPIVMP
-    , pcMvFieldSP, puhInterDirSP
-#endif
-    , numValidMergeCand 
-    );
-
-  rpcTempCU->buildMCL( cMvFieldNeighbours,uhInterDirNeighbours, vspFlag
-#if NH_3D_SPIVMP
-    , bSPIVMPFlag
-#endif
-    , numValidMergeCand 
-    );
-#endif
-#endif
-#else
-#if NH_3D_MLC
-  rpcTempCU->initAvailableFlags();
-#endif
+  Int mergeCandBuffer[MRG_MAX_NUM_CANDS_MEM];
+
+  for( UInt ui = 0; ui < rpcTempCU->getSlice()->getMaxNumMergeCand(); ++ui )
+#else
+
+#if MCTS_ENC_CHECK
+  UInt numSpatialMergeCandidates = 0;
+  rpcTempCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand, numSpatialMergeCandidates );
+#else
   rpcTempCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours,uhInterDirNeighbours, numValidMergeCand );
-#if NH_3D_MLC
-  rpcTempCU->xGetInterMergeCandidates( 0, 0, cMvFieldNeighbours,uhInterDirNeighbours
-#if H_3D_SPIVMP
-    , pcMvFieldSP, puhInterDirSP
-#endif
-    , numValidMergeCand 
-    );
-#if NH_3D_MLC
-  rpcTempCU->buildMCL( cMvFieldNeighbours,uhInterDirNeighbours
-#if H_3D_SPIVMP
-    , bSPIVMPFlag
-#endif
-    , numValidMergeCand 
-    );
-#endif
-#endif
-#endif
-
-#if NH_3D_MLC
-  Int mergeCandBuffer[MRG_MAX_NUM_CANDS_MEM];
-#else
+#endif
   Int mergeCandBuffer[MRG_MAX_NUM_CANDS];
-#endif
-#if NH_3D_MLC
-  for( UInt ui = 0; ui < rpcTempCU->getSlice()->getMaxNumMergeCand(); ++ui )
-#else
   for( UInt ui = 0; ui < numValidMergeCand; ++ui )
 #endif
@@ -1893 +1918 @@
     mergeCandBuffer[ui] = 0;
   }
+
+#if MCTS_ENC_CHECK && !NH_3D
+  if (m_pcEncCfg->getTMCTSSEITileConstraint() && rpcTempCU->isLastColumnCTUInTile())
+  {
+    numValidMergeCand = numSpatialMergeCandidates;
+  }
+#endif
 
   Bool bestIsSkip = false;
@@ -1907 +1939 @@
   DEBUG_STRING_NEW(bestStr)
 
-#if NH_3D_ARP
+#if NH_3D
   Int nARPWMax = rpcTempCU->getSlice()->getARPStepNum() - 1;
-#if NH_3D_IC
   if( nARPWMax < 0 || bICFlag )
-#else
-  if( nARPWMax < 0 )
-#endif
   {
     nARPWMax = 0;
@@ -1919 +1947 @@
   for( Int nARPW=nARPWMax; nARPW >= 0 ; nARPW-- )
   {
-#if NH_3D
 #if DEBUG_STRING
     bestStr.clear(); 
 #endif
-#endif
-#if NH_3D_IV_MERGE
     memset( mergeCandBuffer, 0, MRG_MAX_NUM_CANDS_MEM*sizeof(Int) );
-#else
-    memset( mergeCandBuffer, 0, MRG_MAX_NUM_CANDS * sizeof(Int) );
-#endif
     rpcTempCU->setPartSizeSubParts( SIZE_2Nx2N, 0, uhDepth ); // interprets depth relative to LCU level
     rpcTempCU->setARPWSubParts( (UChar)nARPW , 0 , uhDepth );
-#if NH_3D_IC
     rpcTempCU->setICFlagSubParts( bICFlag, 0, 0, uhDepth );
-#endif
     rpcTempCU->getDvInfo(0) = cOrigDisInfo;
     rpcTempCU->setDvInfoSubParts(cOrigDisInfo, 0, uhDepth );
-#if NH_3D_VSP
     Int vspFlag[MRG_MAX_NUM_CANDS_MEM];
     memset(vspFlag, 0, sizeof(Int)*MRG_MAX_NUM_CANDS_MEM);
-#endif
-#if NH_3D
-#if NH_3D_MLC
     rpcTempCU->initAvailableFlags();
-#endif
+#if MCTS_ENC_CHECK
+    UInt numSpatialMergeCandidates = 0;
+    rpcTempCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand, numSpatialMergeCandidates  );
+#else
     rpcTempCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand );
-    rpcTempCU->xGetInterMergeCandidates( 0, 0, cMvFieldNeighbours,uhInterDirNeighbours
-#if NH_3D_SPIVMP
-      , pcMvFieldSP, puhInterDirSP
-#endif
-      , numValidMergeCand 
-      );
-
-    rpcTempCU->buildMCL( cMvFieldNeighbours,uhInterDirNeighbours
-#if NH_3D_VSP
-      , vspFlag
-#endif
-#if NH_3D_SPIVMP
-      , bSPIVMPFlag
-#endif
-      , numValidMergeCand 
-      );
-
-#else
-    rpcTempCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours,uhInterDirNeighbours, numValidMergeCand );
-#endif
-
-
+#endif
+    rpcTempCU->xGetInterMergeCandidates( 0, 0, cMvFieldNeighbours,uhInterDirNeighbours, pcMvFieldSP, puhInterDirSP, numValidMergeCand );
+
+    rpcTempCU->buildMCL( cMvFieldNeighbours,uhInterDirNeighbours , vspFlag , bSPIVMPFlag, numValidMergeCand );
 #endif
 
@@ -1977 +1978 @@
     for( UInt uiMergeCand = 0; uiMergeCand < numValidMergeCand; ++uiMergeCand )
     {
-#if NH_3D_IC
+#if NH_3D
       if( rpcTempCU->getSlice()->getApplyIC() && rpcTempCU->getSlice()->getIcSkipParseFlag() )
       {
@@ -1997 +1998 @@
           // set MC parameters
           rpcTempCU->setPredModeSubParts( MODE_INTER, 0, uhDepth ); // interprets depth relative to CTU level
-#if NH_3D_IC
+#if NH_3D
           rpcTempCU->setICFlagSubParts( bICFlag, 0, 0, uhDepth );
 #endif
@@ -2005 +2006 @@
           rpcTempCU->setMergeFlagSubParts( true, 0, 0, uhDepth ); // interprets depth relative to CTU level
           rpcTempCU->setMergeIndexSubParts( uiMergeCand, 0, 0, uhDepth ); // interprets depth relative to CTU level
-#if NH_3D_ARP
+#if NH_3D
           rpcTempCU->setARPWSubParts( (UChar)nARPW , 0 , uhDepth );
-#endif
-
-#if NH_3D_VSP
           rpcTempCU->setVSPFlagSubParts( vspFlag[uiMergeCand], 0, 0, uhDepth );
-#endif
-#if NH_3D_SPIVMP
           rpcTempCU->setSPIVMPFlagSubParts(bSPIVMPFlag[uiMergeCand], 0, 0, uhDepth);
           if (bSPIVMPFlag[uiMergeCand])
@@ -2030 +2026 @@
           }
           else
-#endif
           {
-#if NH_3D_VSP
             if ( vspFlag[uiMergeCand] )
             {
@@ -2062 +2056 @@
             {
 #endif
-            rpcTempCU->setInterDirSubParts( uhInterDirNeighbours[uiMergeCand], 0, 0, uhDepth ); // interprets depth relative to CTU level
-            rpcTempCU->getCUMvField( REF_PIC_LIST_0 )->setAllMvField( cMvFieldNeighbours[0 + 2*uiMergeCand], SIZE_2Nx2N, 0, 0 ); // interprets depth relative to rpcTempCU level
-            rpcTempCU->getCUMvField( REF_PIC_LIST_1 )->setAllMvField( cMvFieldNeighbours[1 + 2*uiMergeCand], SIZE_2Nx2N, 0, 0 ); // interprets depth relative to rpcTempCU level
-#if NH_3D_VSP
+              rpcTempCU->setInterDirSubParts( uhInterDirNeighbours[uiMergeCand], 0, 0, uhDepth ); // interprets depth relative to CTU level
+              rpcTempCU->getCUMvField( REF_PIC_LIST_0 )->setAllMvField( cMvFieldNeighbours[0 + 2*uiMergeCand], SIZE_2Nx2N, 0, 0 ); // interprets depth relative to rpcTempCU level
+              rpcTempCU->getCUMvField( REF_PIC_LIST_1 )->setAllMvField( cMvFieldNeighbours[1 + 2*uiMergeCand], SIZE_2Nx2N, 0, 0 ); // interprets depth relative to rpcTempCU level
+#if NH_3D
             }
 #endif
-          }
+#if MCTS_ENC_CHECK
+            if ( m_pcEncCfg->getTMCTSSEITileConstraint () && (!(m_pcPredSearch->checkTMctsMvp(rpcTempCU))))
+            {
+              continue;
+            }
+#endif
+#if NH_3D
+          }
+#endif
           // do MC
           m_pcPredSearch->motionCompensation ( rpcTempCU, m_ppcPredYuvTemp[uhDepth] );
@@ -2099 +2101 @@
             mergeCandBuffer[uiMergeCand] = 1;
           }
-#if NH_3D_DIS
+#if NH_3D
           rpcTempCU->setDISFlagSubParts( false, 0, uhDepth );
-#endif
-#if NH_3D_VSP
           if( rpcTempCU->getSkipFlag(0) )
           {
             rpcTempCU->setTrIdxSubParts(0, 0, uhDepth);
           }
-#endif
-#if NH_3D_SDC_INTER
           TComDataCU *rpcTempCUPre = rpcTempCU;
 #endif
@@ -2114 +2112 @@
           xCheckDQP( rpcTempCU );
           xCheckBestMode(rpcBestCU, rpcTempCU, uhDepth DEBUG_STRING_PASS_INTO(bestStr) DEBUG_STRING_PASS_INTO(tmpStr));
-#if NH_3D_SDC_INTER
+#if NH_3D
           if( rpcTempCU->getSlice()->getInterSdcFlag() && !uiNoResidual )
           {
@@ -2141 +2139 @@
               }
               rpcTempCU->setSkipFlagSubParts( false, 0, uhDepth );
-#if NH_3D_DIS
               rpcTempCU->setDISFlagSubParts( false, 0, uhDepth );
-#endif
               rpcTempCU->setTrIdxSubParts( 0, 0, uhDepth );
               rpcTempCU->setCbfSubParts( 1, COMPONENT_Y, 0, uhDepth );
@@ -2187 +2183 @@
           if( m_pcEncCfg->getUseFastDecisionForMerge() && !bestIsSkip )
           {
-#if NH_3D_SDC_INTER
+#if NH_3D
             if( rpcTempCU->getSlice()->getInterSdcFlag() )
             {
@@ -2196 +2192 @@
 #endif
             bestIsSkip = rpcBestCU->getQtRootCbf(0) == 0;
-#if NH_3D_SDC_INTER
+#if NH_3D
             }
 #endif
@@ -2241 +2237 @@
   }
   DEBUG_STRING_APPEND(sDebug, bestStr)
-#if NH_3D_ARP
+
+#if NH_3D
  }
-#endif
-#if NH_3D_SPIVMP
  delete[] pcMvFieldSP;
  delete[] puhInterDirSP;
 #endif
+
 #if NH_MV
  D_DEC_INDENT( g_traceModeCheck );
@@ -2282 +2278 @@
 
   // prior to this, rpcTempCU will have just been reset using rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode );
-#if NH_3D_ARP
+#if NH_3D
   const Bool bTransquantBypassFlag = rpcTempCU->getCUTransquantBypass(0);
 #endif
@@ -2290 +2286 @@
 #endif
   UChar uhDepth = rpcTempCU->getDepth( 0 );
-#if NH_3D_ARP
+#if NH_3D
     Bool bFirstTime = true;
     Int nARPWMax    = rpcTempCU->getSlice()->getARPStepNum() - 1;
-#if NH_3D_IC
+
     if( nARPWMax < 0 || ePartSize != SIZE_2Nx2N || rpcTempCU->getICFlag(0) )
-#else
-    if( nARPWMax < 0 || ePartSize != SIZE_2Nx2N )
-#endif
     {
       nARPWMax = 0;
@@ -2323 +2316 @@
       }
 #endif
-#if NH_3D_DIS
+#if NH_3D
       rpcTempCU->setDISFlagSubParts( false, 0, uhDepth );
 #endif
@@ -2329 +2322 @@
   rpcTempCU->setPredModeSubParts  ( MODE_INTER, 0, uhDepth );
   rpcTempCU->setChromaQpAdjSubParts( rpcTempCU->getCUTransquantBypass(0) ? 0 : m_cuChromaQpOffsetIdxPlus1, 0, uhDepth );
-#if NH_3D_ARP
+
+#if MCTS_ENC_CHECK
+  rpcTempCU->setTMctsMvpIsValid(true);
+#endif
+
+#if NH_3D
       rpcTempCU->setARPWSubParts( (UChar)nARPW , 0 , uhDepth );
-#endif
-#if NH_3D_ARP
       if( bFirstTime == false && nARPWMax )
       {
@@ -2355 +2351 @@
   m_pcPredSearch->predInterSearch ( rpcTempCU, m_ppcOrigYuv[uhDepth], m_ppcPredYuvTemp[uhDepth], m_ppcResiYuvTemp[uhDepth], m_ppcRecoYuvTemp[uhDepth] );
 #endif
-#if NH_3D_ARP
+#if NH_3D
         if( nARPWMax )
         {
@@ -2366 +2362 @@
   if ( !rpcTempCU->getMergeAMP() )
   {
-#if NH_3D_ARP
+#if NH_3D
         if( nARPWMax )
         {
@@ -2391 +2387 @@
 #endif
 
+#if MCTS_ENC_CHECK
+  if (m_pcEncCfg->getTMCTSSEITileConstraint() && (!rpcTempCU->getTMctsMvpIsValid()))
+  {
+    return;
+  }
+#endif
+
+
   m_pcPredSearch->encodeResAndCalcRdInterCU( rpcTempCU, m_ppcOrigYuv[uhDepth], m_ppcPredYuvTemp[uhDepth], m_ppcResiYuvTemp[uhDepth], m_ppcResiYuvBest[uhDepth], m_ppcRecoYuvTemp[uhDepth], false DEBUG_STRING_PASS_INTO(sTest) );
-#if NH_3D_VSP
+#if NH_3D
   if( rpcTempCU->getQtRootCbf(0)==0 )
   {
@@ -2410 +2414 @@
   DebugInterPredResiReco(sTest, *(m_ppcPredYuvTemp[uhDepth]), *(m_ppcResiYuvBest[uhDepth]), *(m_ppcRecoYuvTemp[uhDepth]), DebugStringGetPredModeMask(rpcTempCU->getPredictionMode(0)));
 #endif
-#if NH_3D_SDC_INTER
+#if NH_3D
       TComDataCU *rpcTempCUPre = rpcTempCU;
 #endif
@@ -2416 +2420 @@
   xCheckDQP( rpcTempCU );
   xCheckBestMode(rpcBestCU, rpcTempCU, uhDepth DEBUG_STRING_PASS_INTO(sDebug) DEBUG_STRING_PASS_INTO(sTest));
-#if NH_3D_SDC_INTER
+#if NH_3D
       if( rpcTempCU->getSlice()->getInterSdcFlag() && ePartSize == SIZE_2Nx2N)
       {
@@ -2445 +2449 @@
           }
           rpcTempCU->setSkipFlagSubParts( false, 0, uhDepth );
-#if NH_3D_DIS
           rpcTempCU->setDISFlagSubParts( false, 0, uhDepth );
-#endif
           rpcTempCU->setTrIdxSubParts( 0, 0, uhDepth );
           rpcTempCU->setCbfSubParts( 1, COMPONENT_Y, 0, uhDepth );
@@ -2487 +2489 @@
 
       }
-#endif
-#if NH_3D_ARP
     }
 #endif
@@ -2499 +2499 @@
 }
 
-#if NH_3D_DBBP
+#if NH_3D
 Void TEncCu::xInvalidateOriginalSegments( TComYuv* pOrigYuv, TComYuv* pOrigYuvTemp, Bool* pMask, UInt uiValidSegment )
 {
@@ -2558 +2558 @@
   }
 }
-#endif
-
-#if NH_3D_DBBP
+
 Void TEncCu::xCheckRDCostInterDBBP( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU  DEBUG_STRING_FN_DECLARE(sDebug), Bool bUseMRG )
 {
@@ -2583 +2581 @@
   AOF( uiWidth == uiHeight );
   
-#if NH_3D_DBBP
   if(uiWidth <= 8)
   {
     return;
   }
-#endif
   
   rpcTempCU->setPartSizeSubParts( SIZE_2Nx2N,  0, uhDepth );
@@ -2594 +2590 @@
   // fetch virtual depth block
   UInt uiDepthStride = 0;
-#if H_3D_FCO
-  Pel* pDepthPels = rpcTempCU->getVirtualDepthBlock(rpcTempCU->getZorderIdxInCU(), uiWidth, uiHeight, uiDepthStride);
-#else
   Pel* pDepthPels = rpcTempCU->getVirtualDepthBlock(0, uiWidth, uiHeight, uiDepthStride);
-#endif
   AOF( pDepthPels != NULL );
   AOF( uiDepthStride != 0 );
@@ -2643 +2635 @@
     pDBBPTmpData->auhMergeIndex[uiSegment] = rpcTempCU->getMergeIndex(0);
     
-#if NH_3D_VSP
     AOF( rpcTempCU->getSPIVMPFlag(0) == false );
     AOF( rpcTempCU->getVSPFlag(0) == 0 );
-#endif
     
     for ( UInt uiRefListIdx = 0; uiRefListIdx < 2; uiRefListIdx++ )
@@ -2698 +2688 @@
   xCheckBestMode(rpcBestCU, rpcTempCU, uhDepth  DEBUG_STRING_PASS_INTO(sDebug) DEBUG_STRING_PASS_INTO(sTest) );
 }
-#endif
-#if NH_3D_DIS
+
 Void TEncCu::xCheckRDCostDIS( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU, PartSize eSize DEBUG_STRING_FN_DECLARE(sDebug) )
 {
@@ -2733 +2722 @@
   rpcTempCU->setDISFlagSubParts(true, 0, uiDepth);
   rpcTempCU->setIntraDirSubParts(CHANNEL_TYPE_LUMA, DC_IDX, 0, uiDepth);
-#if NH_3D_SDC_INTRA
   rpcTempCU->setSDCFlagSubParts( false, 0, uiDepth);
-#endif
 
   UInt uiPreCalcDistC;
@@ -2750 +2737 @@
 
   m_pcEntropyCoder->resetBits();
-  if ( rpcTempCU->getSlice()->getPPS()->getTransquantBypassEnableFlag())
+  if ( rpcTempCU->getSlice()->getPPS()->getTransquantBypassEnabledFlag())
   {
     m_pcEntropyCoder->encodeCUTransquantBypassFlag( rpcTempCU, 0,          true );
@@ -2782 +2769 @@
                                 PartSize     eSize
                                 DEBUG_STRING_FN_DECLARE(sDebug)
-#if NH_3D_ENC_DEPTH
+#if NH_3D
                               , Bool bOnlyIVP
 #endif
@@ -2798 +2785 @@
     }
   }
+
 #if NH_MV
   D_PRINT_INC_INDENT (g_traceModeCheck, "xCheckRDCostIntra; eSize: " + n2s(eSize) );
@@ -2815 +2803 @@
 
   rpcTempCU->setSkipFlagSubParts( false, 0, uiDepth );
-#if NH_3D_DIS
+#if NH_3D
   rpcTempCU->setDISFlagSubParts( false, 0, uiDepth );
 #endif
@@ -2827 +2815 @@
 
   m_pcPredSearch->estIntraPredLumaQT( rpcTempCU, m_ppcOrigYuv[uiDepth], m_ppcPredYuvTemp[uiDepth], m_ppcResiYuvTemp[uiDepth], m_ppcRecoYuvTemp[uiDepth], resiLuma DEBUG_STRING_PASS_INTO(sTest) 
-#if NH_3D_ENC_DEPTH
+#if NH_3D
                                     , bOnlyIVP
 #endif
@@ -2839 +2827 @@
   }
   
-#if NH_3D_SDC_INTRA
+#if NH_3D
   if( rpcTempCU->getSDCFlag( 0 ) )
   {
@@ -2849 +2837 @@
   m_pcEntropyCoder->resetBits();
 
-  if ( rpcTempCU->getSlice()->getPPS()->getTransquantBypassEnableFlag())
+  if ( rpcTempCU->getSlice()->getPPS()->getTransquantBypassEnabledFlag())
   {
     m_pcEntropyCoder->encodeCUTransquantBypassFlag( rpcTempCU, 0,          true );
   }
   m_pcEntropyCoder->encodeSkipFlag ( rpcTempCU, 0,          true );
-#if NH_3D_DIS
+#if NH_3D
   m_pcEntropyCoder->encodeDIS( rpcTempCU, 0,          true );
   if(!rpcTempCU->getDISFlag(0))
@@ -2863 +2851 @@
     m_pcEntropyCoder->encodePredInfo( rpcTempCU, 0 );
     m_pcEntropyCoder->encodeIPCMInfo(rpcTempCU, 0, true );
-#if NH_3D_SDC_INTRA
+#if NH_3D
     m_pcEntropyCoder->encodeSDCFlag( rpcTempCU, 0, true );
 #endif
@@ -2873 +2861 @@
     setCodeChromaQpAdjFlag( codeChromaQpAdjFlag );
     setdQPFlag( bCodeDQP );
-#if NH_3D_DIS
+#if NH_3D
   }
 #endif
@@ -2931 +2919 @@
 #endif
   rpcTempCU->setSkipFlagSubParts( false, 0, uiDepth );
-#if NH_3D_DIS
+#if NH_3D
   rpcTempCU->setDISFlagSubParts( false, 0, uiDepth );
 #endif
@@ -2947 +2935 @@
   m_pcEntropyCoder->resetBits();
 
-  if ( rpcTempCU->getSlice()->getPPS()->getTransquantBypassEnableFlag())
+  if ( rpcTempCU->getSlice()->getPPS()->getTransquantBypassEnabledFlag())
   {
     m_pcEntropyCoder->encodeCUTransquantBypassFlag( rpcTempCU, 0,          true );
@@ -2953 +2941 @@
 
   m_pcEntropyCoder->encodeSkipFlag ( rpcTempCU, 0,          true );
-#if NH_3D_DIS
+#if NH_3D
   m_pcEntropyCoder->encodeDIS( rpcTempCU, 0,          true );
 #endif
@@ -2959 +2947 @@
   m_pcEntropyCoder->encodePartSize ( rpcTempCU, 0, uiDepth, true );
   m_pcEntropyCoder->encodeIPCMInfo ( rpcTempCU, 0, true );
-#if NH_3D_SDC_INTRA
+#if NH_3D
   m_pcEntropyCoder->encodeSDCFlag( rpcTempCU, 0, true );
 #endif