Changeset 27 in SHVCSoftware for branches/SHM-1.0-dev/source/Lib/TLibDecoder

Timestamp:

6 Feb 2013, 03:30:58 (13 years ago)

Author:

qualcomm

Message:

Clean up for L0366 from Qualcomm, liweig@…

Location:

branches/SHM-1.0-dev/source/Lib/TLibDecoder

Files:

• TDecGop.cpp (modified) (1 diff)
• TDecTop.cpp (modified) (2 diffs)

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

@@ -288 +288 @@
   rpcPic->compressMotion(); 
 
-#if REF_IDX_MFM
-  if( rpcPic->getLayerId() == 0 && rpcPic->upsampledMvFieldIsNull() ) 
-  { 
-    TComSPS *spsEL = m_ppcTDecTop[1]->getSPS();
-
-    rpcPic->createUpSampledMvField(spsEL->getPicHeightInLumaSamples(), spsEL->getPicWidthInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth);  //create up-sampled mv field 
-  }
-
-  if( rpcPic->getLayerId() == 0 && rpcPic->IsUpsampledMvField() == false ) 
-  { 
-    TComSPS *spsBL = m_ppcTDecTop[0]->getSPS();
-    TComSPS *spsEL = m_ppcTDecTop[1]->getSPS();
-
-    Int iBWidth  = spsBL->getPicWidthInLumaSamples() - spsBL->getPicCropLeftOffset() - spsBL->getPicCropRightOffset(); 
-    Int iBHeight = spsBL->getPicHeightInLumaSamples() - spsBL->getPicCropTopOffset() - spsBL->getPicCropBottomOffset();
-
-    Int iEWidth  = spsEL->getPicWidthInLumaSamples() - spsEL->getPicCropLeftOffset() - spsEL->getPicCropRightOffset(); 
-    Int iEHeight = spsEL->getPicHeightInLumaSamples() - spsEL->getPicCropTopOffset() - spsEL->getPicCropBottomOffset();
-
-    UInt upSampleRatio; 
-    if(iEWidth == iBWidth && iEHeight == iBHeight) 
-      upSampleRatio = 0; 
-    else if(iEWidth == 2*iBWidth && iEHeight == 2*iBHeight) 
-      upSampleRatio = 1; 
-    else if(2*iEWidth == 3*iBWidth && 2*iEHeight == 3*iBHeight) 
-      upSampleRatio = 2; 
-    else 
-      assert(0);
-
-    rpcPic->doTheUpSampleMvField(upSampleRatio); 
-    rpcPic->setUpsampledMvField(true);
-  }
-#endif
 
   Char c = (pcSlice->isIntra() ? 'I' : pcSlice->isInterP() ? 'P' : 'B');

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

@@ -271 +271 @@
 #endif
 
-#if REF_IDX_MFM
-    rpcPic->setUpsampledMvField(false);
-#endif
+
     m_cListPic.pushBack( rpcPic );
     
@@ -321 +319 @@
 #endif
 
-#if REF_IDX_MFM
-  rpcPic->setUpsampledMvField(false);
-#endif
+
 }