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

Timestamp:

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

Author:

qualcomm

Message:

Clean up for L0366 from Qualcomm, liweig@…

Location:

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

Files:

• TEncGOP.cpp (modified) (1 diff)
• TEncTop.cpp (modified) (1 diff)

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

@@ -1561 +1561 @@
 
       pcPic->compressMotion(); 
-#if REF_IDX_MFM
-      if( m_layerId == 0 && pcPic->upsampledMvFieldIsNull() )
-      {
-        Int     iEHeight     = m_ppcTEncTop[m_layerId+1]->getSourceHeight();
-        Int     iEWidth      = m_ppcTEncTop[m_layerId+1]->getSourceWidth();
-        pcPic->createUpSampledMvField(iEHeight, iEWidth, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth);  //create up-sampled mv field
-      }
-
-        if( m_layerId == 0 && pcPic->IsUpsampledMvField() == false )
-      {
-        Int iBWidth  = m_ppcTEncTop[m_layerId]->getSourceWidth() - m_ppcTEncTop[m_layerId]->getCropLeft() - m_ppcTEncTop[m_layerId]->getCropRight();
-        Int iBHeight = m_ppcTEncTop[m_layerId]->getSourceHeight() - m_ppcTEncTop[m_layerId]->getCropTop() - m_ppcTEncTop[m_layerId]->getCropBottom();
-
-        Int iEWidth  = m_ppcTEncTop[m_layerId+1]->getSourceWidth() - m_ppcTEncTop[m_layerId+1]->getCropLeft() - m_ppcTEncTop[m_layerId+1]->getCropRight();
-        Int iEHeight = m_ppcTEncTop[m_layerId+1]->getSourceHeight() - m_ppcTEncTop[m_layerId+1]->getCropTop() - m_ppcTEncTop[m_layerId+1]->getCropBottom();
-
-        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);
-
-        pcPic->doTheUpSampleMvField(upSampleRatio);
-        pcPic->setUpsampledMvField(true);
-      }
-#endif
       
       //-- For time output for each slice

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

@@ -602 +602 @@
   // mark it should be extended
   rpcPic->getPicYuvRec()->setBorderExtension(false);
-#if REF_IDX_MFM
-  rpcPic->setUpsampledMvField(false);
-#endif
+
 }