Ticket #180: FIX_ISSUE_91.patch

File FIX_ISSUE_91.patch, 2.0 KB (added by adamjw, 5 years ago)

  • source/Lib/CommonLib/TypeDef.h 

     source/Lib/CommonLib/TypeDef.h        | 2 ++
 source/Lib/EncoderLib/EncModeCtrl.cpp | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 20ffefd..5a480f2 100644
    a b  
    5050#include <assert.h>
    5151#include <cassert>
    5252
     53#define FIX_ISSUE_91                                      1
     54
    5355#define JVET_L0090_PAIR_AVG                               1 // Add pairwise average candidates, replace HEVC combined candidates
    5456#define REUSE_CU_RESULTS                                  1
    5557

  • source/Lib/EncoderLib/EncModeCtrl.cpp 

    diff --git a/source/Lib/EncoderLib/EncModeCtrl.cpp b/source/Lib/EncoderLib/EncModeCtrl.cpp
index eeee01f..5a71313 100644
    a b bool BestEncInfoCache::isValid( const CodingStructure& cs, const Partitioner& pa 
    761761    return false;
    762762  if( cs.picture->poc != encInfo.poc || CS::getArea( cs, cs.area, partitioner.chType ) != CS::getArea( cs, encInfo.cu, partitioner.chType ) || !isTheSameNbHood( encInfo.cu, cs, partitioner )
    763763    || encInfo.cu.cpr
     764#if FIX_ISSUE_91
     765    || partitioner.currDepth <= cs.pps->getMaxCuDQPDepth() || cs.currQP[partitioner.chType] != encInfo.cu.qp
     766#endif
    764767    )
    765768  {
    766769    return false;
    … … bool BestEncInfoCache::setCsFrom( CodingStructure& cs, EncTestMode& testMode, co 
    778781
    779782  BestEncodingInfo& encInfo = *m_bestEncInfo[idx1][idx2][idx3][idx4];
    780783
    781   if( cs.picture->poc != encInfo.poc || CS::getArea( cs, cs.area, partitioner.chType ) != CS::getArea( cs, encInfo.cu, partitioner.chType ) || !isTheSameNbHood( encInfo.cu, cs, partitioner ) )
     784  if( cs.picture->poc != encInfo.poc || CS::getArea( cs, cs.area, partitioner.chType ) != CS::getArea( cs, encInfo.cu, partitioner.chType ) || !isTheSameNbHood( encInfo.cu, cs, partitioner )
     785#if FIX_ISSUE_91
     786    || partitioner.currDepth <= cs.pps->getMaxCuDQPDepth() || cs.currQP[partitioner.chType] != encInfo.cu.qp
     787#endif
     788    )
    782789  {
    783790    return false;
    784791  }