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

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/TLibEncoder

Files:

• TEncGOP.cpp (modified) (2 diffs)
• TEncSlice.cpp (modified) (1 diff)

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

@@ -691 +691 @@
       pcSlice->setInterLayerPredEnabledFlag(false);
       pcSlice->setMFMEnabledFlag(false);
-#if !REMOVE_COL_PICTURE_SIGNALING
-      pcSlice->setAltColIndicationFlag(false);
-#endif
     }
 #endif
@@ -1216 +1213 @@
 
 #if REF_IDX_MFM
-#if REMOVE_COL_PICTURE_SIGNALING
       if( pcSlice->getMFMEnabledFlag() )
-#else
-      if( pcSlice->getMFMEnabledFlag() && !(pcSlice->getActiveNumILRRefIdx() > 0 && m_pcEncTop->getNumMotionPredRefLayers() > 0) )
-#endif
       {
         Bool found         = false;

branches/SHM-5.0-dev/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -537 +537 @@
 #endif
     rpcSlice->setMFMEnabledFlag(m_ppcTEncTop[layerId]->getMFMEnabledFlag());
-#if !REMOVE_COL_PICTURE_SIGNALING
-    rpcSlice->setAltColIndicationFlag(rpcSlice->getMFMEnabledFlag());
-#endif
   }