Changeset 494 in SHVCSoftware for trunk/source/Lib/TLibEncoder/TEncSearch.cpp

Timestamp:

16 Nov 2013, 22:09:25 (11 years ago)

Author:

seregin

Message:

reintegrate branch SHM-4.0-dev

Location:

trunk

Files:

• . (modified) (1 prop)
• source (modified) (1 prop)
• source/Lib/TLibEncoder/TEncSearch.cpp (modified) (8 diffs)

trunk/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -3092 +3092 @@
     {
 #endif
+#if N0383_IL_CONSTRAINED_TILE_SETS_SEI
+    if (!(pcCU->isInterLayerReference(uhInterDirNeighbours[uiMergeCand], cMvFieldNeighbours[0 + 2*uiMergeCand], cMvFieldNeighbours[1 + 2*uiMergeCand]) && m_disableILP))
+    {
+#endif
       UInt uiCostCand = MAX_UINT;
       UInt uiBitsCand = 0;
@@ -3115 +3119 @@
         uiMergeIndex = uiMergeCand;
       }
+#if N0383_IL_CONSTRAINED_TILE_SETS_SEI
+    }
+#endif
 #if REF_IDX_ME_ZEROMV
     }
@@ -3221 +3228 @@
   Int numValidMergeCand = 0 ;
 
-#if N0383_IL_CONSTRAINED_TILE_SETS_SEI
-  Bool disableILP = false;
-  if (pcCU->getPic()->getLayerId() == (m_pcEncCfg->getNumLayer() - 1)  && m_pcEncCfg->getInterLayerConstrainedTileSetsSEIEnabled() && pcCU->getPic()->getPicSym()->getTileSetIdxMap(pcCU->getAddr()) >= 0)
-  {
-    if (pcCU->getPic()->getPicSym()->getTileSetType(pcCU->getAddr()) == 2)
-    {
-      disableILP = true;
-    }
-    if (pcCU->getPic()->getPicSym()->getTileSetType(pcCU->getAddr()) == 1)
-    {
-      Int currCUaddr = pcCU->getAddr();
-      Int frameWitdhInCU  = pcCU->getPic()->getPicSym()->getFrameWidthInCU();
-      Int frameHeightInCU = pcCU->getPic()->getPicSym()->getFrameHeightInCU();
-      Bool leftCUExists   = (currCUaddr % frameWitdhInCU) > 0;
-      Bool aboveCUExists  = (currCUaddr / frameWitdhInCU) > 0;
-      Bool rightCUExists  = (currCUaddr % frameWitdhInCU) < (frameWitdhInCU - 1);
-      Bool belowCUExists  = (currCUaddr / frameWitdhInCU) < (frameHeightInCU - 1);
-      Int currTileSetIdx  = pcCU->getPic()->getPicSym()->getTileIdxMap(currCUaddr);
-      // Check if CU is at tile set boundary
-      if ( (leftCUExists && pcCU->getPic()->getPicSym()->getTileIdxMap(currCUaddr-1) != currTileSetIdx) ||
-           (leftCUExists && aboveCUExists && pcCU->getPic()->getPicSym()->getTileIdxMap(currCUaddr-frameWitdhInCU-1) != currTileSetIdx) ||
-           (aboveCUExists && pcCU->getPic()->getPicSym()->getTileIdxMap(currCUaddr-frameWitdhInCU) != currTileSetIdx) ||
-           (aboveCUExists && rightCUExists && pcCU->getPic()->getPicSym()->getTileIdxMap(currCUaddr-frameWitdhInCU+1) != currTileSetIdx) ||
-           (rightCUExists && pcCU->getPic()->getPicSym()->getTileIdxMap(currCUaddr+1) != currTileSetIdx) ||
-           (rightCUExists && belowCUExists && pcCU->getPic()->getPicSym()->getTileIdxMap(currCUaddr+frameWitdhInCU+1) != currTileSetIdx) ||
-           (belowCUExists && pcCU->getPic()->getPicSym()->getTileIdxMap(currCUaddr+frameWitdhInCU) != currTileSetIdx) ||
-           (belowCUExists && leftCUExists && pcCU->getPic()->getPicSym()->getTileIdxMap(currCUaddr+frameWitdhInCU-1) != currTileSetIdx) )
-      {
-        disableILP = true;  // Disable ILP in tile set boundary CU
-      }
-    }
-  }
-#endif
-
   for ( Int iPartIdx = 0; iPartIdx < iNumPart; iPartIdx++ )
   {
@@ -3305 +3278 @@
       {
 #if N0383_IL_CONSTRAINED_TILE_SETS_SEI
-        if (pcCU->getSlice()->getRefPic( eRefPicList, iRefIdxTemp )->isILR(pcCU->getLayerId()) && disableILP)
+        if (pcCU->getSlice()->getRefPic( eRefPicList, iRefIdxTemp )->isILR(pcCU->getLayerId()) && m_disableILP)
         {
           continue;
@@ -3529 +3502 @@
         }
 #if N0383_IL_CONSTRAINED_TILE_SETS_SEI
-        if (pcPic->isILR(pcCU->getLayerId()) && disableILP)
+        if (pcPic->isILR(pcCU->getLayerId()) && m_disableILP)
         {
           testIter = false;
@@ -3550 +3523 @@
           }
 #if N0383_IL_CONSTRAINED_TILE_SETS_SEI
-          if (pcPic->isILR(pcCU->getLayerId()) && disableILP)
+          if (pcPic->isILR(pcCU->getLayerId()) && m_disableILP)
           {
             testRefIdx = false;
@@ -4119 +4092 @@
 
   // prediction pattern
+#if O0194_WEIGHTED_PREDICTION_CGS
+  // Bug Fix (It did not check WP for BSlices)
+  if ( pcCU->getSlice()->getPPS()->getUseWP())
+#else
   if ( pcCU->getSlice()->getPPS()->getUseWP() && pcCU->getSlice()->getSliceType()==P_SLICE )
+#endif
   {
     xPredInterLumaBlk( pcCU, pcPicYuvRef, uiPartAddr, &cMvCand, iSizeX, iSizeY, pcTemplateCand, true );
@@ -4128 +4106 @@
   }
 
+#if O0194_WEIGHTED_PREDICTION_CGS
+  if ( pcCU->getSlice()->getPPS()->getUseWP())
+  ///< Bug Fix (It did not check WP for BSlices)
+#else
   if ( pcCU->getSlice()->getPPS()->getUseWP() && pcCU->getSlice()->getSliceType()==P_SLICE )
+#endif
   {
     xWeightedPredictionUni( pcCU, pcTemplateCand, uiPartAddr, iSizeX, iSizeY, eRefPicList, pcTemplateCand, iRefIdx );