Changeset 94 in SHVCSoftware for branches


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed

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

    r90 r94  
    20982098    assert(iRefPicNum == 1);
    20992099#if RAP_MFM_INIT
    2100     if(!(getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA && getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA))
     2100    if(!(getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA && getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA) && getSPS()->getMFMEnabledFlag())
    21012101#else
    21022102    if( getPOC() != 0 )

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

    r92 r94  
    902902  m_parameterSetManagerDecoder.storePrefetchedSPS(sps);
    903903#endif
    904 #if REF_IDX_MFM
    905   m_pcSPS = sps;
    906   setMFMEnabledFlag(sps->getMFMEnabledFlag());
    907 #endif
    908904#if REF_IDX_FRAMEWORK
    909905  if(m_numLayer>0)

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

    r90 r94  
    7676#else
    7777  ParameterSetManagerDecoder m_parameterSetManagerDecoder;  // storage for parameter sets
    78 #endif
    79 
    80 #if REF_IDX_MFM
    81   TComSPS*               m_pcSPS;
    82   Bool                   m_bMFMEnabledFlag;
    8378#endif
    8479
    … …  
    177172  Void      setILRPic(TComPic *pcPic);
    178173#endif
    179 #if REF_IDX_MFM
    180   TComSPS*  getSPS()                       {return m_pcSPS;}
    181   Void      setMFMEnabledFlag(Bool flag)   {m_bMFMEnabledFlag = flag;}
    182   Bool      getMFMEnabledFlag()            {return m_bMFMEnabledFlag;}
    183 #endif
    184174
    185175protected:
Note: See TracChangeset for help on using the changeset viewer.