Ticket #1373: ticket_1373.patch

File ticket_1373.patch, 2.3 KB (added by Vadim, 6 years ago)
  • Lib/TLibCommon/TComDataCU.cpp

     
    21942194    }
    21952195    else
    21962196    {
     2197#if FIX_TICKET_1373
     2198      if(getCbf( absPartIdx, COMPONENT_Y ) || (numValidComp>COMPONENT_Cb && getCbf( absPartIdx, COMPONENT_Cb )) || (numValidComp>COMPONENT_Cr && getCbf( absPartIdx, COMPONENT_Cr) )
     2199        || (getPLTModeFlag(absPartIdx) && getPLTEscape(COMPONENT_Y, absPartIdx))
     2200        )
     2201#else
    21972202      if(getCbf( absPartIdx, COMPONENT_Y ) || (numValidComp>COMPONENT_Cb && getCbf( absPartIdx, COMPONENT_Cb )) || (numValidComp>COMPONENT_Cr && getCbf( absPartIdx, COMPONENT_Cr) ) )
     2203#endif
    21982204      {
    21992205        foundNonZeroCbf = true;
    22002206      }
  • Lib/TLibCommon/TypeDef.h

     
    4545#include <vector>
    4646#include <cstdlib>
    4747
     48#define FIX_TICKET_1373         1
     49
    4850//! \ingroup TLibCommon
    4951//! \{
    5052
  • Lib/TLibEncoder/TEncCu.cpp

     
    14451445        {
    14461446          if( (     rpcTempCU->getCbf(uiBlkIdx, COMPONENT_Y)
    14471447                || (rpcTempCU->getCbf(uiBlkIdx, COMPONENT_Cb) && (numberValidComponents > COMPONENT_Cb))
    1448                 || (rpcTempCU->getCbf(uiBlkIdx, COMPONENT_Cr) && (numberValidComponents > COMPONENT_Cr)) ) )
     1448                || (rpcTempCU->getCbf(uiBlkIdx, COMPONENT_Cr) && (numberValidComponents > COMPONENT_Cr)) )
     1449#if FIX_TICKET_1373
     1450                || ( rpcTempCU->getPLTModeFlag(uiBlkIdx) && rpcTempCU->getPLTEscape(COMPONENT_Y, uiBlkIdx) )
     1451#endif
     1452                )
    14491453          {
    14501454            hasResidual = true;
    14511455            break;
     
    33053309  const TComPPS &pps = *(pcCU->getSlice()->getPPS());
    33063310  if ( pps.getUseDQP() && uiDepth <= pps.getMaxCuDQPDepth() )
    33073311  {
     3312#if FIX_TICKET_1373
     3313    if( pcCU->getQtRootCbf(0) || ( pcCU->getPLTModeFlag(0) && pcCU->getPLTEscape(COMPONENT_Y, 0) ) )
     3314#else
    33083315    if ( pcCU->getQtRootCbf( 0) )
     3316#endif
    33093317    {
    33103318      m_pcEntropyCoder->resetBits();
    33113319      m_pcEntropyCoder->encodeQP( pcCU, 0, false );