Changeset 1413 in 3DVCSoftware for trunk/source/Lib/TLibDecoder/TDecSlice.cpp


Ignore:
Timestamp:
11 Jul 2018, 15:19:49 (6 years ago)
Author:
tech
Message:

Merged HTM-16.2-dev@1412

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibDecoder/TDecSlice.cpp

    r1405 r1413  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2016, ITU/ISO/IEC
     6 * Copyright (c) 2010-2017, ITU/ISO/IEC
    77 * All rights reserved.
    88 *
     
    3737
    3838#include "TDecSlice.h"
     39#include "TDecConformance.h"
    3940
    4041//! \ingroup TLibDecoder
     
    6162}
    6263
    63 Void TDecSlice::init(TDecEntropy* pcEntropyDecoder, TDecCu* pcCuDecoder)
     64Void TDecSlice::init(TDecEntropy* pcEntropyDecoder, TDecCu* pcCuDecoder, TDecConformanceCheck *pDecConformanceCheck)
    6465{
    6566  m_pcEntropyDecoder  = pcEntropyDecoder;
    6667  m_pcCuDecoder       = pcCuDecoder;
     68  m_pDecConformanceCheck = pDecConformanceCheck;
    6769}
    6870
     
    130132    }
    131133  }
    132 #if  NH_3D_DLT
     134#if  NH_3D
    133135  if( pcSlice->getPPS()->getDLT() != NULL )
    134136  {
     
    186188#endif
    187189
     190#if DECODER_PARTIAL_CONFORMANCE_CHECK != 0
     191    const UInt numRemainingBitsPriorToCtu=ppcSubstreams[uiSubStrm]->getNumBitsLeft();
     192#endif
     193
    188194    if ( pcSlice->getSPS()->getUseSAO() )
    189195    {
     
    224230
    225231    m_pcCuDecoder->decodeCtu     ( pCtu, isLastCtuOfSliceSegment );
     232
     233#if DECODER_PARTIAL_CONFORMANCE_CHECK != 0
     234    const UInt numRemainingBitsPostCtu=ppcSubstreams[uiSubStrm]->getNumBitsLeft(); // NOTE: Does not account for changes in buffered bits in CABAC decoder, although it's probably good enough.
     235    if (TDecConformanceCheck::doChecking() && m_pDecConformanceCheck)
     236    {
     237      m_pDecConformanceCheck->checkCtuDecoding(numRemainingBitsPriorToCtu-numRemainingBitsPostCtu);
     238    }
     239#endif
     240
    226241    m_pcCuDecoder->decompressCtu ( pCtu );
    227242
Note: See TracChangeset for help on using the changeset viewer.