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

Timestamp:

4 Feb 2013, 08:30:23 (12 years ago)

Author:

qualcomm

Message:

L0336: motion field mapping of inter-layer reference picture from Qualcomm, cjianle@…

Location:

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

Files:

• TEncCavlc.cpp (modified) (1 diff)
• TEncGOP.cpp (modified) (4 diffs)
• TEncTop.cpp (modified) (4 diffs)
• TEncTop.h (modified) (2 diffs)

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

@@ -600 +600 @@
 #endif
   WRITE_FLAG( pcSPS->getTMVPFlagsPresent()  ? 1 : 0,           "sps_temporal_mvp_enable_flag" );
+#if REF_IDX_MFM
+  if( pcSPS->getLayerId() > 0 )
+  {
+          assert(pcSPS->getMFMEnabledFlag());
+          WRITE_FLAG( pcSPS->getMFMEnabledFlag() ? 1 : 0,          "sps_enh_mfm_enable_flag" );
+  }
+#endif
 #if SUPPORT_FOR_VUI
   WRITE_FLAG( pcSPS->getVuiParametersPresentFlag(),             "vui_parameters_present_flag" );

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

@@ -465 +465 @@
 #endif 
 
+#if REF_IDX_FRAMEWORK
+    if (pcSlice->getSliceType() == B_SLICE) 
+      pcSlice->setColFromL0Flag(1-uiColDir);
+#endif
+
     //  Set reference list
     pcSlice->setRefPicList ( rcListPic );
@@ -471 +476 @@
     {
       m_pcEncTop->setILRPic(pcPic);
+
+#if REF_IDX_MFM
+      pcSlice->setRefPOCListILP(m_pcEncTop->getIlpList(), pcSlice->getBaseColPic());
+#endif
       pcSlice->addRefPicList ( m_pcEncTop->getIlpList(), 1);
+
+#if REF_IDX_MFM
+      Bool found         = false;
+      UInt ColFromL0Flag = pcSlice->getColFromL0Flag();
+      UInt ColRefIdx     = pcSlice->getColRefIdx();
+      for(Int colIdx = 0; colIdx < pcSlice->getNumRefIdx( RefPicList(1 - ColFromL0Flag) ); colIdx++) 
+      { 
+        if( pcSlice->getRefPic( RefPicList(1 - ColFromL0Flag), colIdx)->getIsILR() ) 
+        { 
+          ColRefIdx = colIdx; 
+          found = true;
+          break; 
+        }
+      }
+
+      if( found == false )
+      {
+        ColFromL0Flag = 1 - ColFromL0Flag;
+        for(Int colIdx = 0; colIdx < pcSlice->getNumRefIdx( RefPicList(1 - ColFromL0Flag) ); colIdx++) 
+        { 
+          if( pcSlice->getRefPic( RefPicList(1 - ColFromL0Flag), colIdx)->getIsILR() ) 
+          { 
+            ColRefIdx = colIdx; 
+            found = true; 
+            break; 
+          } 
+        }
+      }
+
+      if(found == true)
+      {
+        pcSlice->setColFromL0Flag(ColFromL0Flag);
+        pcSlice->setColRefIdx(ColRefIdx);
+      }
+#endif
     }
 #endif
@@ -495 +539 @@
     if (pcSlice->getSliceType() == B_SLICE)
     {
+#if !REF_IDX_FRAMEWORK
       pcSlice->setColFromL0Flag(1-uiColDir);
+#endif
       Bool bLowDelay = true;
       Int  iCurrPOC  = pcSlice->getPOC();
@@ -1515 +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

@@ -85 +85 @@
   memset(m_cIlpPic, 0, sizeof(m_cIlpPic));
 #endif
+#if REF_IDX_MFM
+  m_bMFMEnabledFlag = false;
+#endif
 }
 
@@ -394 +397 @@
         m_cIlpPic[j]->create(m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, true);
 #endif
-#if REF_IDX_ME_AROUND_ZEROMV || REF_IDX_ME_ZEROMV || ENCODER_FAST_MODE
+#if REF_IDX_ME_AROUND_ZEROMV || REF_IDX_ME_ZEROMV || ENCODER_FAST_MODE || REF_IDX_MFM
         m_cIlpPic[j]->setIsILR(true);
 #endif
@@ -599 +602 @@
   // mark it should be extended
   rpcPic->getPicYuvRec()->setBorderExtension(false);
+#if REF_IDX_MFM
+  rpcPic->setUpsampledMvField(false);
+#endif
 }
 
@@ -605 +611 @@
 #if SVC_EXTENSION
   m_cSPS.setLayerId(m_layerId);
+#endif
+#if REF_IDX_MFM
+  m_cSPS.setMFMEnabledFlag(m_bMFMEnabledFlag);
 #endif
 

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

@@ -140 +140 @@
   TComPic*                m_cIlpPic[MAX_NUM_REF];                    ///<  Inter layer Prediction picture =  upsampled picture 
 #endif
+#if REF_IDX_MFM
+  Bool                    m_bMFMEnabledFlag;
+#endif
 protected:
   Void  xGetNewPicBuffer  ( TComPic*& rpcPic );           ///< get picture buffer which will be processed
@@ -228 +231 @@
   Void setILRPic(TComPic *pcPic);
 #endif
+#if REF_IDX_MFM
+  Void setMFMEnabledFlag       (Bool flag)   {m_bMFMEnabledFlag = flag;}
+  Bool getMFMEnabledFlag()                   {return m_bMFMEnabledFlag;}    
+#endif
 
 };