Changeset 94 in SHVCSoftware for branches/HM-10.0-dev-SHM/source/Lib

Timestamp:

22 Mar 2013, 23:01:13 (12 years ago)

Author:

seregin

Message:

check for MFM flag

Location:

branches/HM-10.0-dev-SHM/source/Lib

Files:

• TLibCommon/TComSlice.cpp (modified) (1 diff)
• TLibDecoder/TDecTop.cpp (modified) (1 diff)
• TLibDecoder/TDecTop.h (modified) (2 diffs)

branches/HM-10.0-dev-SHM/source/Lib/TLibCommon/TComSlice.cpp

@@ -2098 +2098 @@
     assert(iRefPicNum == 1);
 #if RAP_MFM_INIT
-    if(!(getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA && getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA))
+    if(!(getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA && getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA) && getSPS()->getMFMEnabledFlag())
 #else
     if( getPOC() != 0 )

branches/HM-10.0-dev-SHM/source/Lib/TLibDecoder/TDecTop.cpp

@@ -902 +902 @@
   m_parameterSetManagerDecoder.storePrefetchedSPS(sps);
 #endif
-#if REF_IDX_MFM
-  m_pcSPS = sps;
-  setMFMEnabledFlag(sps->getMFMEnabledFlag());
-#endif
 #if REF_IDX_FRAMEWORK
   if(m_numLayer>0)

branches/HM-10.0-dev-SHM/source/Lib/TLibDecoder/TDecTop.h

@@ -76 +76 @@
 #else
   ParameterSetManagerDecoder m_parameterSetManagerDecoder;  // storage for parameter sets 
-#endif
-
-#if REF_IDX_MFM
-  TComSPS*               m_pcSPS;
-  Bool                   m_bMFMEnabledFlag;
 #endif
 
@@ -177 +172 @@
   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: