Changeset 47 in SHVCSoftware for branches

Timestamp:

22 Feb 2013, 21:08:22 (12 years ago)

Author:

seregin

Message:

REUSE_BLKMAPPING: using the base layer get co-located block function for motion mapping

Location:

branches/SHM-1.1-dev/source/Lib/TLibCommon

Files:

• TComPic.cpp (modified) (7 diffs)
• TComPic.h (modified) (1 diff)
• TComSlice.cpp (modified) (1 diff)
• TypeDef.h (modified) (2 diffs)

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

@@ -557 +557 @@
 
 #if REF_IDX_MFM
+#if !REUSE_BLKMAPPING
 Void TComPic::deriveUnitIdxBase( UInt uiUpsamplePelX, UInt uiUpsamplePelY, UInt ratio, UInt& uiBaseCUAddr, UInt& uiBaseAbsPartIdx )
 {
@@ -591 +592 @@
   return;
 }
+#endif
 
 Void TComPic::copyUpsampledMvField(TComPic* pcPicBase)
 {
+#if !REUSE_MVSCALE || !REUSE_BLKMAPPING || AVC_SYNTAX
   Int iBWidth   = pcPicBase->getPicYuvRec()->getWidth () - pcPicBase->getPicYuvRec()->getPicCropLeftOffset() - pcPicBase->getPicYuvRec()->getPicCropRightOffset();
   Int iBHeight  = pcPicBase->getPicYuvRec()->getHeight() - pcPicBase->getPicYuvRec()->getPicCropTopOffset() - pcPicBase->getPicYuvRec()->getPicCropBottomOffset();
@@ -599 +602 @@
   Int iEWidth   = getPicYuvRec()->getWidth() -  getPicYuvRec()->getPicCropLeftOffset() - getPicYuvRec()->getPicCropRightOffset();
   Int iEHeight  = getPicYuvRec()->getHeight() - getPicYuvRec()->getPicCropTopOffset() -  getPicYuvRec()->getPicCropBottomOffset();
+#endif
   
+#if !REUSE_MVSCALE  || !REUSE_BLKMAPPING
   UInt upSampleRatio = 0;
   if(iEWidth == iBWidth && iEHeight == iBHeight)
@@ -617 +622 @@
     assert(0);
   }
+#endif
 
   for(UInt cuIdx = 0; cuIdx < getPicSym()->getNumberOfCUsInFrame(); cuIdx++)  //each LCU
@@ -634 +640 @@
       UInt  uiPelY = pcCUDes->getCUPelY() + g_auiRasterToPelY[ g_auiZscanToRaster[uiAbsPartIdx] ];
       UInt uiBaseCUAddr, uiBaseAbsPartIdx;
+
+#if REUSE_BLKMAPPING
+      TComDataCU *pcColCU = 0;
+      pcColCU = pcCUDes->getBaseColCU(uiPelX + 8, uiPelY + 8, uiBaseCUAddr, uiBaseAbsPartIdx);
+#else 
       pcPicBase->deriveUnitIdxBase(uiPelX + 8, uiPelY + 8, upSampleRatio, uiBaseCUAddr, uiBaseAbsPartIdx);
+#endif
 
 #if AVC_SYNTAX
@@ -640 +652 @@
       Int iBY = ( (uiPelY + 8) * iBHeight+ iEHeight/2 ) / iEHeight;
 
+#if REUSE_BLKMAPPING
+      if( ( iBX < iBWidth && iBY < iBHeight ) && pcColCU && (pcColCU->getPredictionMode(uiBaseAbsPartIdx) != MODE_NONE) && (pcColCU->getPredictionMode(uiBaseAbsPartIdx) != MODE_INTRA) )  //base layer unit not skip and invalid mode
+#else
       if( ( iBX < iBWidth && iBY < iBHeight ) && (pcPicBase->getCU(uiBaseCUAddr)->getPredictionMode(uiBaseAbsPartIdx) != MODE_NONE) && (pcPicBase->getCU(uiBaseCUAddr)->getPredictionMode(uiBaseAbsPartIdx) != MODE_INTRA) )  //base layer unit not skip and invalid mode
+#endif
+#else
+#if REUSE_BLKMAPPING
+      if( pcColCU && (pcColCU->getPredictionMode(uiBaseAbsPartIdx) != MODE_NONE) && (pcColCU->getPredictionMode(uiBaseAbsPartIdx) != MODE_INTRA) )  //base layer unit not skip and invalid mode
 #else
       if( (pcPicBase->getCU(uiBaseCUAddr)->getPredictionMode(uiBaseAbsPartIdx) != MODE_NONE) && (pcPicBase->getCU(uiBaseCUAddr)->getPredictionMode(uiBaseAbsPartIdx) != MODE_INTRA) )  //base layer unit not skip and invalid mode
+#endif
 #endif
       {
@@ -649 +669 @@
 #if REUSE_MVSCALE
           TComMvField sMvFieldBase, sMvField;
+#if REUSE_BLKMAPPING
+          pcColCU->getMvField( pcColCU, uiBaseAbsPartIdx, (RefPicList)refPicList, sMvFieldBase);
+#else
           pcPicBase->getCU(uiBaseCUAddr)->getMvField( pcPicBase->getCU(uiBaseCUAddr), uiBaseAbsPartIdx, (RefPicList)refPicList, sMvFieldBase);
+#endif
           pcCUDes->scaleBaseMV( sMvField, sMvFieldBase );
 #else

branches/SHM-1.1-dev/source/Lib/TLibCommon/TComPic.h

@@ -129 +129 @@
 #if REF_IDX_MFM
   Void          copyUpsampledMvField  (  TComPic* pcPicBase );
+#if !REUSE_BLKMAPPING
   Void          deriveUnitIdxBase     (  UInt uiUpsamplePelX, UInt uiUpsamplePelY, UInt ratio, UInt& uiBaseCUAddr, UInt& uiBaseAbsPartIdx );
+#endif
 #endif
 

branches/SHM-1.1-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -562 +562 @@
   assert(thePoc == pcRefPicBL->getPOC());
 
-#if REUSE_MVSCALE
+#if REUSE_MVSCALE || REUSE_BLKMAPPING
   ilpPic[0]->getSlice(0)->setBaseColPic( pcRefPicBL );
 #endif

branches/SHM-1.1-dev/source/Lib/TLibCommon/TypeDef.h

@@ -58 +58 @@
 
 #define AVC_BASE                         1      ///< YUV BL reading for AVC base SVC
-#define REF_IDX_FRAMEWORK                1      ///< inter-layer reference framework
+#define REF_IDX_FRAMEWORK                0      ///< inter-layer reference framework
 
 #if AVC_BASE
@@ -74 +74 @@
 #if REF_IDX_MFM
 #define REUSE_MVSCALE                    1      ///< using the base layer MV scaling function
+#define REUSE_BLKMAPPING                 1      ///< using the base layer get co-located block function
 #endif