Changeset 827 in SHVCSoftware for branches/SHM-dev

Timestamp:

13 Jul 2014, 01:29:28 (10 years ago)

Author:

seregin

Message:

set spatial flag for ILR and fix for MFM centre

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• TComDataCU.cpp (modified) (1 diff)
• TComPic.cpp (modified) (1 diff)
• TComSlice.cpp (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibCommon/TComDataCU.cpp

@@ -3493 +3493 @@
   TComPic* baseColPic = m_pcSlice->getBaseColPic(refLayerIdc);
 
-  UInt uiPelX = (UInt)Clip3<UInt>(0, m_pcPic->getPicYuvRec()->getWidth()  - 1, pelX + 8);
-  UInt uiPelY = (UInt)Clip3<UInt>(0, m_pcPic->getPicYuvRec()->getHeight() - 1, pelY + 8);
+  UInt uiPelX = (UInt)Clip3<UInt>(0, m_pcPic->getPicYuvRec()->getWidth()  - 1, pelX);
+  UInt uiPelY = (UInt)Clip3<UInt>(0, m_pcPic->getPicYuvRec()->getHeight() - 1, pelY);
+
+#if REF_IDX_MFM
+  // centre of the collocated 16x16 block for motion mapping
+  if( motionMapping )
+  {
+    uiPelX += 8;
+    uiPelY += 8;
+  }
+#endif
 
 #if !LAYER_CTB

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

@@ -187 +187 @@
   for( Int i = 0; i < MAX_LAYERS; i++ )
   {
-    if( m_bSpatialEnhLayer[i] )
+    if( m_bSpatialEnhLayer[i] && m_pcFullPelBaseRec[i] )
     {
       m_pcFullPelBaseRec[i]->destroy();

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

@@ -3866 +3866 @@
       TComPic* pcRefPicBL = m_pcBaseColPic[refLayerIdc];
 
+      // copy scalability ratio, it is needed to get the corect location for the motion field of the corresponding reference layer block
+      pcIlpPic[refLayerIdc]->setSpatialEnhLayerFlag( refLayerIdc, m_pcPic->isSpatialEnhLayer(refLayerIdc) );
+
       pcIlpPic[refLayerIdc]->copyUpsampledPictureYuv( m_pcPic->getFullPelBaseRec( refLayerIdc ), pcIlpPic[refLayerIdc]->getPicYuvRec() );      
       pcIlpPic[refLayerIdc]->getSlice(0)->setBaseColPic( refLayerIdc, pcRefPicBL );