Changeset 34 in SHVCSoftware for branches/SHM-1.0-dev/source/Lib/TLibCommon

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)
• Lib/TLibCommon/TComPic.cpp (modified) (3 diffs)
• Lib/TLibCommon/TComTrQuant.cpp (modified) (1 diff)

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) );