Changeset 563 in SHVCSoftware for branches/SHM-5.0-dev/source/Lib/TLibCommon

Timestamp:

27 Jan 2014, 17:44:28 (11 years ago)

Author:

seregin

Message:

remove REMOVE_COL_PICTURE_SIGNALING macro

Location:

branches/SHM-5.0-dev/source/Lib/TLibCommon

Files:

• TComSlice.h (modified) (1 diff)
• TypeDef.h (modified) (1 diff)

branches/SHM-5.0-dev/source/Lib/TLibCommon/TComSlice.h

@@ -2160 +2160 @@
   Void      setMFMEnabledFlag(Bool flag)                { m_bMFMEnabledFlag = flag; }
   Bool      getMFMEnabledFlag()                         { return m_bMFMEnabledFlag; }
-#if !REMOVE_COL_PICTURE_SIGNALING
-  Void      setColRefLayerIdx(Int i)                    { m_colRefLayerIdx = i;     }
-  Int       getColRefLayerIdx()                         { return m_colRefLayerIdx;  }
-  Void      setAltColIndicationFlag(Bool i)             { m_altColIndicationFlag = i; }
-  Bool      getAltColIndicationFlag()                   { return m_altColIndicationFlag; }
-  Void      setMotionPredIlp(TComPic *ilpPic)           { m_pcIlpPic = ilpPic; }
-  TComPic*  getMotionPredIlp()                          { return m_pcIlpPic; }
-#endif
 #endif
 

branches/SHM-5.0-dev/source/Lib/TLibCommon/TypeDef.h

@@ -166 +166 @@
 #endif
 #if REF_IDX_MFM
-#define REMOVE_COL_PICTURE_SIGNALING     1      ///< JCTVC-N0107: remove alternative collocated picture signalling
 #define N0139_POSITION_ROUNDING_OFFSET   1      ///< JCTVC-N0139: offset for collocated block in motion mapping
 #endif