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

Timestamp:

8 Jul 2015, 21:20:10 (10 years ago)

Author:

seregin

Message:

macro cleanup: MFM_ENCCONSTRAINT

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• TComPic.cpp (modified) (2 diffs)
• TComPic.h (modified) (1 diff)
• TComSlice.cpp (modified) (1 diff)
• TComSlice.h (modified) (1 diff)
• TypeDef.h (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibCommon/TComPic.cpp ¶

@@ -353 +353 @@
 #endif
 
-#if MFM_ENCCONSTRAINT
 Bool TComPic::checkSameRefInfo()
 {
@@ -393 +392 @@
   return( bSameRefInfo );  
 }
-#endif
 #endif //SVC_EXTENSION
 

branches/SHM-dev/source/Lib/TLibCommon/TComPic.h ¶

@@ -214 +214 @@
   Void          initUpsampledMvField  ();
 #endif
-#if MFM_ENCCONSTRAINT
   Bool          checkSameRefInfo();
-#endif
   Void          copyUpsampledPictureYuv(TComPicYuv*   pcPicYuvIn, TComPicYuv*   pcPicYuvOut); 
 #if Q0048_CGS_3D_ASYMLUT

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp ¶

@@ -3709 +3709 @@
 }
 
-#if MFM_ENCCONSTRAINT
 TComPic* TComSlice::getBaseColPic(  TComList<TComPic*>& rcListPic )
 {
   return xGetRefPic( rcListPic, m_iPOC );
 }
-#endif
 
 Void TComSlice::setILRPic(TComPic **pcIlpPic)

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

@@ -2276 +2276 @@
   TComPic*  getBaseColPic       (UInt refLayerIdc)                { return m_pcBaseColPic[refLayerIdc]; }
   TComPic** getBaseColPic       ()                                { return &m_pcBaseColPic[0];          }
-#if MFM_ENCCONSTRAINT
   TComPic*  getBaseColPic( TComList<TComPic*>& rcListPic );
-#endif
 
   Void      setLayerId (UInt layerId)   { m_layerId = layerId; }

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

@@ -101 +101 @@
 
 /// normative encoder constraints --------
-#define MFM_ENCCONSTRAINT                1      ///< JCTVC-O0216: Encoder constraint for motion field mapping
 #define REF_IDX_ME_ZEROMV                1      ///< JCTVC-L0051: use zero motion for inter-layer reference picture (without fractional ME)