Commit f3c66ebe authored by Karsten Suehring's avatar Karsten Suehring

remove macro JVET_L0104_NO_4x4BI_INTER_CU

parent e71b5d2d
......@@ -60,7 +60,6 @@
#define JVET_L0285_8BIT_TRANSFORM_CORE 1 // Primary transform using 8-bit cores
#define JVET_L0104_NO_4x4BI_INTER_CU 1 // Prohibit 4x4 bi-prediction for inter CU
#define JVET_L0266_HMVP 1 //History-based MVP
#if JVET_L0266_HMVP
#define JVET_L0158_L0106_RESET_BUFFER 1 //reset the history buffer on HMVP
......
......@@ -2919,12 +2919,10 @@ void PU::addAMVPHMVPCand(const PredictionUnit &pu, const RefPicList eRefPicList,
#endif
bool PU::isBipredRestriction(const PredictionUnit &pu)
{
#if JVET_L0104_NO_4x4BI_INTER_CU
if(pu.cu->lumaSize().width == 4 && pu.cu->lumaSize().height ==4 )
{
return true;
}
#endif
return false;
}
......
......@@ -1634,11 +1634,7 @@ void CABACReader::inter_pred_idc( PredictionUnit& pu )
pu.interDir = 1;
return;
}
#if JVET_L0104_NO_4x4BI_INTER_CU
if( !(PU::isBipredRestriction(pu)) )
#else
if( true )
#endif
{
unsigned ctxId = DeriveCtx::CtxInterDir(pu);
if( m_BinDecoder.decodeBin( Ctx::InterDir(ctxId) ) )
......
......@@ -1618,11 +1618,7 @@ void CABACWriter::inter_pred_idc( const PredictionUnit& pu )
{
return;
}
#if JVET_L0104_NO_4x4BI_INTER_CU
if( !(PU::isBipredRestriction(pu)) )
#else
if( true )
#endif
{
unsigned ctxId = DeriveCtx::CtxInterDir(pu);
if( pu.interDir == 3 )
......
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