Changeset 308 in SHVCSoftware for branches/SHM-2.1-dev/source

Timestamp:

19 Jul 2013, 19:51:20 (11 years ago)

Author:

seregin

Message:

fix for the MFMEnabledFlag setting by checking the NumMotionPredRefLayers

File:

• branches/SHM-2.1-dev/source/App/TAppEncoder/TAppEncTop.cpp (modified) (1 diff)

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

@@ -111 +111 @@
 #if REF_IDX_MFM
 #if AVC_BASE
+#if M0457_PREDICTION_INDICATIONS
+    m_acTEncTop[layer].setMFMEnabledFlag(layer == 0 ? false : ( m_avcBaseLayerFlag ? AVC_SYNTAX : true ) && m_acLayerCfg[layer].getNumMotionPredRefLayers());
+#else
     m_acTEncTop[layer].setMFMEnabledFlag(layer == 0 ? false : ( m_avcBaseLayerFlag ? AVC_SYNTAX : true ));
+#endif
+#else
+#if M0457_PREDICTION_INDICATIONS
+    m_acTEncTop[layer].setMFMEnabledFlag(layer == 0 ? false : ( m_acLayerCfg[layer].getNumMotionPredRefLayers() > 0 ) );
 #else
     m_acTEncTop[layer].setMFMEnabledFlag(layer == 0 ? false : true);
+#endif
 #endif
 #if M0457_IL_SAMPLE_PRED_ONLY_FLAG