Changeset 1412 in 3DVCSoftware for branches/HTM-16.2-dev/source/Lib/TLibEncoder/TEncSampleAdaptiveOffset.cpp
- Timestamp:
- 12 Apr 2018, 11:12:21 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-16.2-dev/source/Lib/TLibEncoder/TEncSampleAdaptiveOffset.cpp
r1405 r1412 4 4 * granted under this license. 5 5 * 6 * Copyright (c) 2010-201 6, ITU/ISO/IEC6 * Copyright (c) 2010-2017, ITU/ISO/IEC 7 7 * All rights reserved. 8 8 * … … 120 120 121 121 ::memset(m_saoDisabledRate, 0, sizeof(m_saoDisabledRate)); 122 #if OPTIONAL_RESET_SAO_ENCODING_AFTER_IRAP123 122 m_lastIRAPPoc = MAX_INT; 124 #endif125 123 126 124 for(Int typeIdc=0; typeIdc < NUM_SAO_NEW_TYPES; typeIdc++) … … 242 240 243 241 244 #if OPTIONAL_RESET_SAO_ENCODING_AFTER_IRAP245 242 Void 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 #else247 Void TEncSampleAdaptiveOffset::SAOProcess(TComPic* pPic, Bool* sliceEnabled, const Double *lambdas, const Bool bTestSAODisableAtPictureLevel, const Double saoEncodingRate, const Double saoEncodingRateChroma, Bool isPreDBFSamplesUsed )248 #endif249 243 { 250 244 TComPicYuv* orgYuv= pPic->getPicYuvOrg(); … … 263 257 } 264 258 //slice on/off 265 #if OPTIONAL_RESET_SAO_ENCODING_AFTER_IRAP266 259 decidePicParams(sliceEnabled, pPic, saoEncodingRate, saoEncodingRateChroma, bResetStateAfterIRAP); 267 #else268 decidePicParams(sliceEnabled, pPic->getSlice(0)->getDepth(), saoEncodingRate, saoEncodingRateChroma);269 #endif270 260 271 261 //block on/off … … 341 331 } 342 332 343 #if OPTIONAL_RESET_SAO_ENCODING_AFTER_IRAP344 333 Void 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 { 350 335 if (pic->getSlice(0)->isIRAP()) 351 336 { … … 364 349 } 365 350 const Int picTempLayer = pic->getSlice(0)->getDepth(); 366 #endif367 351 368 352 //decide sliceEnabled[compIdx]
Note: See TracChangeset for help on using the changeset viewer.