Changeset 34 in SHVCSoftware

Timestamp:

8 Feb 2013, 00:16:24 (12 years ago)

Author:

seregin

Message:

Merge with trunk

Location:

branches/SHM-1.0-dev/source

Files:

• . (modified) (1 prop)
• App/TAppEncoder/TAppEncTop.cpp (modified) (1 diff)
• Lib/TLibCommon/TComPic.cpp (modified) (3 diffs)
• Lib/TLibCommon/TComTrQuant.cpp (modified) (1 diff)
• Lib/TLibDecoder/TDecTop.cpp (modified) (1 diff)
• Lib/TLibEncoder/TEncCu.cpp (modified) (2 diffs)
• Lib/TLibEncoder/TEncSearch.cpp (modified) (7 diffs)
• Lib/TLibEncoder/TEncTop.cpp (modified) (1 diff)

branches/SHM-1.0-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -99 +99 @@
 
 #if REF_IDX_MFM
-  if(layer == 0)
-    m_acTEncTop[layer].setMFMEnabledFlag(false);
-  else
-    m_acTEncTop[layer].setMFMEnabledFlag(true);
+    if(layer == 0)
+    {
+      m_acTEncTop[layer].setMFMEnabledFlag(false);
+    }
+    else
+    {
+      m_acTEncTop[layer].setMFMEnabledFlag(true);
+    }
 #endif
     // set layer ID 

branches/SHM-1.0-dev/source/Lib/TLibCommon/TComPic.cpp

@@ -586 +586 @@
 }
 
-
-
-
 Void TComPic::copyUpsampledMvField(TComPic* pcPicBase)
 {
-
-
-
   Int iBWidth   = pcPicBase->getPicYuvRec()->getWidth () - pcPicBase->getPicYuvRec()->getPicCropLeftOffset() - pcPicBase->getPicYuvRec()->getPicCropRightOffset();
   Int iBHeight  = pcPicBase->getPicYuvRec()->getHeight() - pcPicBase->getPicYuvRec()->getPicCropTopOffset() - pcPicBase->getPicYuvRec()->getPicCropBottomOffset();
@@ -599 +593 @@
   Int iEWidth   = getPicYuvRec()->getWidth() -  getPicYuvRec()->getPicCropLeftOffset() - getPicYuvRec()->getPicCropRightOffset();
   Int iEHeight  = getPicYuvRec()->getHeight() - getPicYuvRec()->getPicCropTopOffset() -  getPicYuvRec()->getPicCropBottomOffset();
-
-
+  
   UInt upSampleRatio = 0;
   if(iEWidth == iBWidth && iEHeight == iBHeight)
@@ -654 +647 @@
         }
       }
-
       else
       {

branches/SHM-1.0-dev/source/Lib/TLibCommon/TComTrQuant.cpp

@@ -1498 +1498 @@
 #if NO_RESIDUAL_FLAG_FOR_BLPRED
     if(pcCU->isIntraBL(uiAbsPartIdx) && eTxt == TEXT_LUMA)
+    {
       invtransformNxN( pcCU->getCUTransquantBypass(uiAbsPartIdx), eTxt, DC_IDX, pResi, uiStride, rpcCoeff, uiWidth, uiHeight, scalingListType, pcCU->getTransformSkip(uiAbsPartIdx, eTxt) );
+    }
     else
+    {
       invtransformNxN( pcCU->getCUTransquantBypass(uiAbsPartIdx), eTxt, REG_DCT, pResi, uiStride, rpcCoeff, uiWidth, uiHeight, scalingListType, pcCU->getTransformSkip(uiAbsPartIdx, eTxt) );
+    }
 #else
     invtransformNxN( pcCU->getCUTransquantBypass(uiAbsPartIdx), eTxt, REG_DCT, pResi, uiStride, rpcCoeff, uiWidth, uiHeight, scalingListType, pcCU->getTransformSkip(uiAbsPartIdx, eTxt) );

branches/SHM-1.0-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -169 +169 @@
         for (Int i=0; i<m_cIlpPic[j]->getPicSym()->getNumberOfCUsInFrame(); i++)
         {
-            m_cIlpPic[j]->getPicSym()->getCU(i)->initCU(m_cIlpPic[j], i);
+          m_cIlpPic[j]->getPicSym()->getCU(i)->initCU(m_cIlpPic[j], i);
         }
       }

branches/SHM-1.0-dev/source/Lib/TLibEncoder/TEncCu.cpp

@@ -1352 +1352 @@
     {
 #if REF_IDX_ME_ZEROMV
-    Bool bZeroMVILR = rpcTempCU->xCheckZeroMVILRMerge(uhInterDirNeighbours[uiMergeCand], cMvFieldNeighbours[0 + 2*uiMergeCand], cMvFieldNeighbours[1 + 2*uiMergeCand]);
-    if(bZeroMVILR)
-    {
+      Bool bZeroMVILR = rpcTempCU->xCheckZeroMVILRMerge(uhInterDirNeighbours[uiMergeCand], cMvFieldNeighbours[0 + 2*uiMergeCand], cMvFieldNeighbours[1 + 2*uiMergeCand]);
+      if(bZeroMVILR)
+      {
 #endif
         if(!(uiNoResidual==1 && mergeCandBuffer[uiMergeCand]==1))
@@ -1408 +1408 @@
     }
 #if REF_IDX_ME_ZEROMV 
-  }
+      }
 #endif
    }

branches/SHM-1.0-dev/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -3429 +3429 @@
         {
 #if REF_IDX_ME_ZEROMV 
-      Bool bZeroMVILR = pcCU->xCheckZeroMVILRMvdL1Zero(iRefList, iRefIdxTemp, aaiMvpIdx[iRefList][iRefIdxTemp]);
-      if(bZeroMVILR)
-      {
+          Bool bZeroMVILR = pcCU->xCheckZeroMVILRMvdL1Zero(iRefList, iRefIdxTemp, aaiMvpIdx[iRefList][iRefIdxTemp]);
+          if(bZeroMVILR)
+          {
 #endif
           bestBiPDist = biPDistTemp;
@@ -3437 +3437 @@
           bestBiPRefIdxL1 = iRefIdxTemp;
 #if REF_IDX_ME_ZEROMV
-      }
+          }
 #endif
         }
@@ -3577 +3577 @@
     //  Bi-directional prediction
 #if REF_IDX_ME_ZEROMV
-  if ( (pcCU->getSlice()->isInterB()) && (pcCU->isBipredRestriction(iPartIdx) == false) && !(pcCU->getSlice()->getMvdL1ZeroFlag() && bestBiPDist == MAX_INT) )
+    if ( (pcCU->getSlice()->isInterB()) && (pcCU->isBipredRestriction(iPartIdx) == false) && !(pcCU->getSlice()->getMvdL1ZeroFlag() && bestBiPDist == MAX_INT) )
 #else
     if ( (pcCU->getSlice()->isInterB()) && (pcCU->isBipredRestriction(iPartIdx) == false) )
@@ -4511 +4511 @@
 #if REF_IDX_ME_ZEROMV
   if( pcCU->getSlice()->getRefPic( eRefPicList, iRefIdxPred )->getIsILR())  //ILR reference pic 
+  {
     rcMv.setZero();  //use Mv(0, 0) for integer ME 
+  }
   else  //non ILR reference pic
   {
@@ -4543 +4545 @@
 #if REF_IDX_ME_ZEROMV
     if( pcCU->getSlice()->getRefPic( eRefPicList, iRefIdxPred )->getIsILR())  //ILR reference pic
+    {
       xPatternSearchFracDIFMv0( pcCU, pcPatternKey, piRefY, iRefStride, &rcMv, cMvHalf, cMvQter, ruiCost, bBi );
+    }
     else    //non ILR reference pic
+    {
       xPatternSearchFracDIF( pcCU, pcPatternKey, piRefY, iRefStride, &rcMv, cMvHalf, cMvQter, ruiCost, bBi );
+    }
 #else
     xPatternSearchFracDIF( pcCU, pcPatternKey, piRefY, iRefStride, &rcMv, cMvHalf, cMvQter, ruiCost
@@ -5447 +5453 @@
 #if NO_RESIDUAL_FLAG_FOR_BLPRED
       if(pcCU->isIntraBL(uiAbsPartIdx) )
+      {
         m_pcTrQuant->invtransformNxN( pcCU->getCUTransquantBypass(uiAbsPartIdx), TEXT_LUMA,DC_IDX, pcResiCurrY, m_pcQTTempTComYuv[uiQTTempAccessLayer].getStride(),  pcCoeffCurrY, trWidth, trHeight, scalingListType );//this is for inter mode only
+      }
       else
+      {
         m_pcTrQuant->invtransformNxN( pcCU->getCUTransquantBypass(uiAbsPartIdx), TEXT_LUMA,REG_DCT, pcResiCurrY, m_pcQTTempTComYuv[uiQTTempAccessLayer].getStride(),  pcCoeffCurrY, trWidth, trHeight, scalingListType );//this is for inter mode only
+      }
 #else
       m_pcTrQuant->invtransformNxN( pcCU->getCUTransquantBypass(uiAbsPartIdx), TEXT_LUMA,REG_DCT, pcResiCurrY, m_pcQTTempTComYuv[uiQTTempAccessLayer].getStride(),  pcCoeffCurrY, trWidth, trHeight, scalingListType );//this is for inter mode only
@@ -5793 +5803 @@
 #if NO_RESIDUAL_FLAG_FOR_BLPRED
         if(pcCU->isIntraBL(uiAbsPartIdx) )
+        {
           m_pcTrQuant->invtransformNxN( pcCU->getCUTransquantBypass(uiAbsPartIdx), TEXT_LUMA,DC_IDX, pcResiCurrY, m_pcQTTempTComYuv[uiQTTempAccessLayer].getStride(),  pcCoeffCurrY, trWidth, trHeight, scalingListType, true );
+        }
         else
+        {
           m_pcTrQuant->invtransformNxN( pcCU->getCUTransquantBypass(uiAbsPartIdx), TEXT_LUMA,REG_DCT, pcResiCurrY, m_pcQTTempTComYuv[uiQTTempAccessLayer].getStride(),  pcCoeffCurrY, trWidth, trHeight, scalingListType, true );
+        }
 #else
         m_pcTrQuant->invtransformNxN( pcCU->getCUTransquantBypass(uiAbsPartIdx), TEXT_LUMA,REG_DCT, pcResiCurrY, m_pcQTTempTComYuv[uiQTTempAccessLayer].getStride(),  pcCoeffCurrY, trWidth, trHeight, scalingListType, true );

branches/SHM-1.0-dev/source/Lib/TLibEncoder/TEncTop.cpp

@@ -402 +402 @@
         for (Int i=0; i<m_cIlpPic[j]->getPicSym()->getNumberOfCUsInFrame(); i++)
         {
-            m_cIlpPic[j]->getPicSym()->getCU(i)->initCU(m_cIlpPic[j], i);
+          m_cIlpPic[j]->getPicSym()->getCU(i)->initCU(m_cIlpPic[j], i);
         }
       }