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/TLibEncoder/TEncSampleAdaptiveOffset.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 *
     
    120120
    121121  ::memset(m_saoDisabledRate, 0, sizeof(m_saoDisabledRate));
    122 #if OPTIONAL_RESET_SAO_ENCODING_AFTER_IRAP
    123122  m_lastIRAPPoc = MAX_INT;
    124 #endif
    125123
    126124  for(Int typeIdc=0; typeIdc < NUM_SAO_NEW_TYPES; typeIdc++)
     
    242240
    243241
    244 #if OPTIONAL_RESET_SAO_ENCODING_AFTER_IRAP
    245242Void TEncSampleAdaptiveOffset::SAOProcess(TComPic* pPic, Bool* sliceEnabled, const Double *lambdas, const Bool bTestSAODisableAtPictureLevel, const Double saoEncodingRate, const Double saoEncodingRateChroma, const Bool isPreDBFSamplesUsed, const Bool bResetStateAfterIRAP )
    246 #else
    247 Void TEncSampleAdaptiveOffset::SAOProcess(TComPic* pPic, Bool* sliceEnabled, const Double *lambdas, const Bool bTestSAODisableAtPictureLevel, const Double saoEncodingRate, const Double saoEncodingRateChroma, Bool isPreDBFSamplesUsed )
    248 #endif
    249243{
    250244  TComPicYuv* orgYuv= pPic->getPicYuvOrg();
     
    263257  }
    264258  //slice on/off
    265 #if OPTIONAL_RESET_SAO_ENCODING_AFTER_IRAP
    266259  decidePicParams(sliceEnabled, pPic, saoEncodingRate, saoEncodingRateChroma, bResetStateAfterIRAP);
    267 #else
    268   decidePicParams(sliceEnabled, pPic->getSlice(0)->getDepth(), saoEncodingRate, saoEncodingRateChroma);
    269 #endif
    270260
    271261  //block on/off
     
    341331}
    342332
    343 #if OPTIONAL_RESET_SAO_ENCODING_AFTER_IRAP
    344333Void TEncSampleAdaptiveOffset::decidePicParams(Bool* sliceEnabled, const TComPic* pic, const Double saoEncodingRate, const Double saoEncodingRateChroma, const Bool bResetStateAfterIRAP)
    345 #else
    346 Void TEncSampleAdaptiveOffset::decidePicParams(Bool* sliceEnabled, Int picTempLayer, const Double saoEncodingRate, const Double saoEncodingRateChroma)
    347 #endif
    348 {
    349 #if OPTIONAL_RESET_SAO_ENCODING_AFTER_IRAP
     334{
    350335  if (pic->getSlice(0)->isIRAP())
    351336  {
     
    364349  }
    365350  const Int picTempLayer = pic->getSlice(0)->getDepth();
    366 #endif
    367351
    368352  //decide sliceEnabled[compIdx]
Note: See TracChangeset for help on using the changeset viewer.