Commit 7222b71f authored by Frank Bossen's avatar Frank Bossen

Merge branch 'high_prec_compile_fix' into 'master'

fix compilation for VTM (BMS_TOOLS=0)

See merge request !122
parents f83207ba b0f893c8
Pipeline #137 passed with stage
......@@ -256,7 +256,7 @@ void EncApp::xInitLibCfg()
m_cEncLib.setAffineType ( m_AffineType );
#endif
#endif
#if !JEM_TOOLS && (JVET_K0346 || JVET_K_AFFINE)
#if !JEM_TOOLS && (JVET_K0346 || JVET_K_AFFINE) && !REMOVE_MV_ADAPT_PREC
m_cEncLib.setHighPrecisionMv (m_highPrecisionMv);
#endif
m_cEncLib.setDisableMotionCompression ( m_DisableMotionCompression );
......
......@@ -2029,14 +2029,14 @@ bool EncAppCfg::xCheckParameter()
xConfirmPara( m_altResiCompId > 0, "Alternative residual compression can only be used with NEXT profile" );
#endif
#endif
#if JEM_TOOLS || JVET_K_AFFINE
#if (JEM_TOOLS || JVET_K_AFFINE) && !REMOVE_MV_ADAPT_PREC
xConfirmPara( m_highPrecisionMv, "High precision MV for temporal merging can only be used with NEXT profile" );
xConfirmPara( m_Affine, "Affine is only allowed with NEXT profile" );
#endif
#if JEM_TOOLS
xConfirmPara( m_BIO, "BIO only allowed with NEXT profile" );
#endif
#if !JEM_TOOLS && JVET_K0346 && !JVET_K_AFFINE
#if !JEM_TOOLS && JVET_K0346 && !JVET_K_AFFINE && !REMOVE_MV_ADAPT_PREC
xConfirmPara(m_highPrecisionMv, "High precision MV for temporal merging can only be used with NEXT profile");
#endif
xConfirmPara( m_DisableMotionCompression, "Disable motion data compression only allowed with NEXT profile" );
......
......@@ -224,7 +224,9 @@ protected:
#endif
#endif
#if JEM_TOOLS
#if !REMOVE_MV_ADAPT_PREC
bool m_highPrecisionMv;
#endif
bool m_Affine;
#if JVET_K0337_AFFINE_6PARA
bool m_AffineType;
......@@ -237,7 +239,7 @@ protected:
bool m_AffineType;
#endif
#endif
#if !JEM_TOOLS && (JVET_K0346 || JVET_K_AFFINE)
#if !JEM_TOOLS && (JVET_K0346 || JVET_K_AFFINE) && !REMOVE_MV_ADAPT_PREC
bool m_highPrecisionMv;
#endif
bool m_DisableMotionCompression;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment