Changeset 1226 in SHVCSoftware for branches/SHM-dev/source/App/TAppEncoder

Timestamp:

9 Jul 2015, 00:20:09 (9 years ago)

Author:

seregin

Message:

macro cleanup: REF_IDX_MFM

Location:

branches/SHM-dev/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (1 diff)
• TAppEncTop.cpp (modified) (2 diffs)

branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -4497 +4497 @@
   printf("REF_IDX_ME_ZEROMV: %d ", REF_IDX_ME_ZEROMV);
   printf("ENCODER_FAST_MODE: %d ", ENCODER_FAST_MODE);
-  printf("REF_IDX_MFM: %d ", REF_IDX_MFM);
 #else
   printf("RecalQP:%d", m_recalculateQPAccordingToLambda ? 1 : 0 );

branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -253 +253 @@
     m_acTEncTop[layer].setFramesToBeEncoded                               ( m_framesToBeEncoded );
 
-#if REF_IDX_MFM
 #if AVC_BASE
     m_acTEncTop[layer].setMFMEnabledFlag                                  (layer == 0 ? false : ( m_nonHEVCBaseLayerFlag ? false : true ) && m_acLayerCfg[layer].getNumMotionPredRefLayers());
@@ -259 +258 @@
     m_acTEncTop[layer].setMFMEnabledFlag                                  (layer == 0 ? false : ( m_acLayerCfg[layer].getNumMotionPredRefLayers() > 0 ) );
 #endif
-#endif
+
     // set layer ID
     m_acTEncTop[layer].setLayerId                                         ( m_acLayerCfg[layer].m_layerId );