Ticket #69: bug_69_bms.patch

File bug_69_bms.patch, 1.5 KB (added by adamjw, 6 years ago)

  • source/Lib/CommonLib/dtrace_codingstruct.h 

     source/Lib/CommonLib/dtrace_codingstruct.h | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/source/Lib/CommonLib/dtrace_codingstruct.h b/source/Lib/CommonLib/dtrace_codingstruct.h
index ae3cdb9..08ed379 100644
    a b inline void dtraceModeCost(CodingStructure &cs, double lambda) 
    108108  else if( isIntra ) intraModeC = g_intraMode65to33AngMapping[intraModeC];
    109109#endif
    110110#endif
     111  int imvVal = 0;
     112#if JVET_K0357_AMVR
     113  imvVal = cs.cus[0]->imv;
     114#endif
    111115#if JEM_TOOLS
    112116  DTRACE( g_trace_ctx, D_MODE_COST, "ModeCost: %6lld %3d @(%4d,%4d) [%2dx%2d] %d (qp%d,pm%d,ptSize%d,skip%d,mrg%d,fruc%d,obmc%d,ic%d,imv%d,affn%d,%d,%d) tempCS = %lld (%d,%d)\n",
    113117    DTRACE_GET_COUNTER( g_trace_ctx, D_MODE_COST ),
    … … inline void dtraceModeCost(CodingStructure &cs, double lambda) 
    123127    cs.pus[0]->frucMrgMode,
    124128    cs.cus[0]->obmcFlag,
    125129    cs.cus[0]->LICFlag,
    126 #if JVET_K0357_AMVR
    127     cs.cus[0]->imv,
    128 #else
    129     0,
    130 #endif
     130    imvVal,
    131131    cs.cus[0]->affine,
    132132    intraModeL, intraModeC,
    133133    tempCost, tempBits, tempDist );
    … … inline void dtraceModeCost(CodingStructure &cs, double lambda) 
    144144    cs.cus[0]->skip,
    145145    cs.pus[0]->mergeFlag,
    146146    0, 0,
    147 #if JVET_K0357_AMVR
    148     cs.cus[0]->imv,
    149 #else
    150     0,
    151 #endif
     147    imvVal
    152148    0, 0,
    153149          intraModeL, intraModeC,
    154150          tempCost, tempBits, tempDist );