Changeset 1208 in SHVCSoftware for branches/SHM-dev

Timestamp:

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

Author:

seregin

Message:

macro cleanup: MFM_ENCCONSTRAINT

Location:

branches/SHM-dev/source/Lib

Files:

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

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)
 

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

@@ -1759 +1759 @@
       pcSlice->setRefPicList( m_cListPic, false, NULL);
     }
-#if MFM_ENCCONSTRAINT
+
+    // motion field mapping constraint
     if( pcSlice->getMFMEnabledFlag() )
     {
@@ -1774 +1775 @@
       }
     }
-#endif
 #endif
     

branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -1936 +1936 @@
           // It is a requirement of bitstream conformance when the collocated picture, used for temporal motion vector prediction, is an inter-layer reference picture, 
           // VpsInterLayerMotionPredictionEnabled[ LayerIdxInVps[ currLayerId ] ][ LayerIdxInVps[ rLId ] ] shall be equal to 1, where rLId is set equal to nuh_layer_id of the inter-layer picture.
-          if( refPic->isILR(m_layerId) && pcSlice->getVPS()->isMotionPredictionType( pcSlice->getVPS()->getLayerIdxInVps(m_layerId), refPic->getLayerIdx() )
-#if MFM_ENCCONSTRAINT
-            && pcSlice->getBaseColPic( *m_ppcTEncTop[refPic->getLayerIdx()]->getListPic() )->checkSameRefInfo() == true 
-#endif
-            ) 
+          if( refPic->isILR(m_layerId) && pcSlice->getVPS()->isMotionPredictionType( pcSlice->getVPS()->getLayerIdxInVps(m_layerId), refPic->getLayerIdx() )            
+            && pcSlice->getBaseColPic( *m_ppcTEncTop[refPic->getLayerIdx()]->getListPic() )->checkSameRefInfo() == true ) 
           { 
             ColRefIdx = colIdx; 
@@ -1959 +1956 @@
             // VpsInterLayerMotionPredictionEnabled[ LayerIdxInVps[ currLayerId ] ][ LayerIdxInVps[ rLId ] ] shall be equal to 1, where rLId is set equal to nuh_layer_id of the inter-layer picture.
             if( refPic->isILR(m_layerId) && pcSlice->getVPS()->isMotionPredictionType( pcSlice->getVPS()->getLayerIdxInVps(m_layerId), refPic->getLayerIdx() )
-#if MFM_ENCCONSTRAINT
-              && pcSlice->getBaseColPic( *m_ppcTEncTop[refPic->getLayerIdx()]->getListPic() )->checkSameRefInfo() == true 
-#endif
-              ) 
+              && pcSlice->getBaseColPic( *m_ppcTEncTop[refPic->getLayerIdx()]->getListPic() )->checkSameRefInfo() == true ) 
             { 
               ColRefIdx = colIdx;