Changeset 28 in SHVCSoftware for trunk/source/Lib/TLibDecoder

Timestamp:

7 Feb 2013, 02:16:51 (12 years ago)

Author:

seregin

Message:

Reintegrate SHM-1.0-dev branch

Location:

trunk/source/Lib/TLibDecoder

Files:

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

trunk/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);

trunk/source/Lib/TLibDecoder/TDecGop.cpp

@@ -287 +287 @@
 
   rpcPic->compressMotion(); 
+
+
   Char c = (pcSlice->isIntra() ? 'I' : pcSlice->isInterP() ? 'P' : 'B');
   if (!pcSlice->isReferenced()) c += 32;

trunk/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
+
+
     m_cListPic.pushBack( rpcPic );
     
@@ -316 +318 @@
   rpcPic->getPicSym()->allocSaoParam(&m_cSAO);
 #endif
+
+
 }
 
@@ -768 +772 @@
     {
       setILRPic(pcPic);
+#if REF_IDX_MFM
+      pcSlice->setRefPOCListILP(m_ppcTDecTop[m_layerId]->m_cIlpPic, pcSlice->getBaseColPic());
+#endif
+
       pcSlice->addRefPicList ( m_cIlpPic, 
                                1, 
@@ -880 +888 @@
   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 );

trunk/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);