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

Timestamp:

4 Feb 2013, 08:30:23 (13 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/TLibDecoder

Files:

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

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

@@ -844 +844 @@
 #endif
   READ_FLAG( uiCode, "sps_temporal_mvp_enable_flag" );            pcSPS->setTMVPFlagsPresent(uiCode);
+#if REF_IDX_MFM
+  if(pcSPS->getLayerId() > 0)
+  {
+          READ_FLAG( uiCode, "sps_enh_mfm_enable_flag" );
+          pcSPS->setMFMEnabledFlag( uiCode ? true : false );
+          assert(pcSPS->getMFMEnabledFlag()); 
+  }
+#endif
 #if SUPPORT_FOR_VUI
   READ_FLAG( uiCode, "vui_parameters_present_flag" );             pcSPS->setVuiParametersPresentFlag(uiCode);

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

@@ -287 +287 @@
 
   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');
   if (!pcSlice->isReferenced()) c += 32;

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

@@ -164 +164 @@
         m_cIlpPic[j]->create(pcSPS->getPicWidthInLumaSamples(), pcSPS->getPicHeightInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, true);
 #endif
-#if REF_IDX_ME_AROUND_ZEROMV || REF_IDX_ME_ZEROMV
+#if REF_IDX_ME_AROUND_ZEROMV || REF_IDX_ME_ZEROMV || REF_IDX_MFM
         m_cIlpPic[j]->setIsILR(true);
 #endif
@@ -270 +270 @@
     rpcPic->getPicSym()->allocSaoParam(&m_cSAO);
 #endif
+
+#if REF_IDX_MFM
+    rpcPic->setUpsampledMvField(false);
+#endif
     m_cListPic.pushBack( rpcPic );
     
@@ -315 +319 @@
 #if REMOVE_APS
   rpcPic->getPicSym()->allocSaoParam(&m_cSAO);
+#endif
+
+#if REF_IDX_MFM
+  rpcPic->setUpsampledMvField(false);
 #endif
 }
@@ -768 +776 @@
     {
       setILRPic(pcPic);
+#if REF_IDX_MFM
+      pcSlice->setRefPOCListILP(m_ppcTDecTop[m_layerId]->m_cIlpPic, pcSlice->getBaseColPic());
+#endif
+
       pcSlice->addRefPicList ( m_cIlpPic, 
                                1, 
@@ -880 +892 @@
   m_cEntropyDecoder.decodeSPS( sps );
   m_parameterSetManagerDecoder.storePrefetchedSPS(sps);
+#if REF_IDX_MFM
+  m_pcSPS = sps;
+  setMFMEnabledFlag(sps->getMFMEnabledFlag());
+#endif
 #if !REMOVE_ALF
   m_cAdaptiveLoopFilter.create( sps->getPicWidthInLumaSamples(), sps->getPicHeightInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth );

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

@@ -80 +80 @@
   ParameterSetManagerDecoder m_parameterSetManagerDecoder;  // storage for parameter sets 
 #endif
+
+#if REF_IDX_MFM
+  TComSPS*               m_pcSPS;
+  Bool                   m_bMFMEnabledFlag;
+#endif
+
   TComSlice*              m_apcSlicePilot;
   
@@ -170 +176 @@
   Void      setILRPic(TComPic *pcPic);
 #endif
+#if REF_IDX_MFM
+  TComSPS*  getSPS()                       {return m_pcSPS;}
+  Void      setMFMEnabledFlag(Bool flag)   {m_bMFMEnabledFlag = flag;}
+  Bool      getMFMEnabledFlag()            {return m_bMFMEnabledFlag;}
+#endif
+
 protected:
   Void  xGetNewPicBuffer  (TComSlice* pcSlice, TComPic*& rpcPic);