diff --git a/source/Lib/CommonLib/Slice.cpp b/source/Lib/CommonLib/Slice.cpp index 4b08bb0aba2058d72215d0a42e4a2c4a53c21352..cf5d84765101f43eac37fa5bf86c12fdd2b606db 100644 --- a/source/Lib/CommonLib/Slice.cpp +++ b/source/Lib/CommonLib/Slice.cpp @@ -105,6 +105,9 @@ Slice::Slice() , m_pcPicHeader ( NULL ) , m_colFromL0Flag ( true ) , m_colRefIdx ( 0 ) +#if JVET_AG0098_AMVP_WITH_SBTMVP +, m_amvpSbTmvpAmvrEnabledFlag (false) +#endif #if JVET_AA0093_DIVERSITY_CRITERION_FOR_ARMC , m_costForARMC ( MAX_UINT ) #endif diff --git a/source/Lib/DecoderLib/CABACReader.cpp b/source/Lib/DecoderLib/CABACReader.cpp index e9ef16c25b6b9cfab78071f1c04363d949544e67..23d7055fbd9c52c07733d36376600ae6e953f8f2 100644 --- a/source/Lib/DecoderLib/CABACReader.cpp +++ b/source/Lib/DecoderLib/CABACReader.cpp @@ -4199,7 +4199,7 @@ void CABACReader::amvpSbTmvpFlag(PredictionUnit& pu) pu.cu->smvdMode = 0; g_picAmvpSbTmvpEnabledArea += pu.lwidth() * pu.lheight(); } - DTRACE(g_trace_ctx, D_SYNTAX, "amvpSbTmvpFlag() amvpSbTmvpFlag=%d interDir:%d colIdx:%d pos=(%d,%d) size=%dx%d\n", pu.amvpSbTmvpFlag ? 1 : 0, pu.interDir, pu.colIdx ? 1 : 0, pu.lumaPos().x, pu.lumaPos().y, pu.lumaSize().width, pu.lumaSize().height); + DTRACE(g_trace_ctx, D_SYNTAX, "amvpSbTmvpFlag() amvpSbTmvpFlag=%d colIdx:%d pos=(%d,%d) size=%dx%d\n", pu.amvpSbTmvpFlag ? 1 : 0, pu.colIdx ? 1 : 0, pu.lumaPos().x, pu.lumaPos().y, pu.lumaSize().width, pu.lumaSize().height); } void CABACReader::amvpSbTmvpMvdCoding(PredictionUnit &pu, Mv &rMvd) @@ -4208,7 +4208,7 @@ void CABACReader::amvpSbTmvpMvdCoding(PredictionUnit &pu, Mv &rMvd) { pu.amvpSbTmvpMvdIdx = -1; rMvd.setZero(); - DTRACE(g_trace_ctx, D_SYNTAX, "amvpSbTmvpMvdCoding() pos=(%d,%d) size=(%d,%d) amvpSbTmvpMvdIdx:%d mvd(%d, %d)\n", pu.lx(), pu.ly(), pu.lwidth(), pu.lheight(), -1, rMvd.getHor(), rMvd.getVer()); + DTRACE(g_trace_ctx, D_SYNTAX, "amvpSbTmvpMvdCoding() pos=(%d,%d) size=(%d,%d) amvpSbTmvpMvdIdx:%d\n", pu.lx(), pu.ly(), pu.lwidth(), pu.lheight(), -1); } else { diff --git a/source/Lib/EncoderLib/CABACWriter.cpp b/source/Lib/EncoderLib/CABACWriter.cpp index 161e092daceb17ade8e966362b9623cc7db20065..8747031e9d8a494e8840383a53a804b66a2ffdf9 100644 --- a/source/Lib/EncoderLib/CABACWriter.cpp +++ b/source/Lib/EncoderLib/CABACWriter.cpp @@ -3588,7 +3588,7 @@ void CABACWriter::amvpSbTmvpFlag(const PredictionUnit& pu) m_BinEncoder.encodeBin(pu.amvpSbTmvpFlag ? 1 : 0, Ctx::amvpSbTmvpFlag(0)); - DTRACE(g_trace_ctx, D_SYNTAX, "amvpSbTmvpFlag() amvpSbTmvpFlag=%d interDir:%d colIdx:%d pos=(%d,%d) size=%dx%d\n", pu.amvpSbTmvpFlag ? 1 : 0, pu.interDir, pu.colIdx ? 1 : 0, pu.lumaPos().x, pu.lumaPos().y, pu.lumaSize().width, pu.lumaSize().height); + DTRACE(g_trace_ctx, D_SYNTAX, "amvpSbTmvpFlag() amvpSbTmvpFlag=%d colIdx:%d pos=(%d,%d) size=%dx%d\n", pu.amvpSbTmvpFlag ? 1 : 0, pu.colIdx ? 1 : 0, pu.lumaPos().x, pu.lumaPos().y, pu.lumaSize().width, pu.lumaSize().height); if (pu.amvpSbTmvpFlag) { if (pu.cs->slice->getAmvpSbTmvpNumColPic() > 1)