JVET-AC0074: adopted constraints for NNPF frame rate upsampling

JVET-AC0074: adopted constraints for NNPF frame rate upsampling

source/App/EncoderApp/EncApp.h

@@ -146,7 +146,7 @@ public:
   void      featureToFile(std::ofstream& featureFile,int feature[MAX_CU_DEPTH+1][MAX_CU_DEPTH+1], std::string featureName);
 #endif
 #if JVET_AC0074_USE_OF_NNPFC_FOR_PIC_RATE_UPSAMPLING
-  bool getNNPostFilterEnabled() { return m_cEncLib.getNNPostFilterSEICharacteristicsEnabled() && m_cEncLib.getNnPostFilterSEIActivationEnabled(); }
+  bool getNNPostFilterEnabled() { return m_cEncLib.getNNPostFilterSEICharacteristicsEnabled() || m_cEncLib.getNnPostFilterSEIActivationEnabled(); }
 #endif
 };// END CLASS DEFINITION EncApp