Changeset 728 in SHVCSoftware
- Timestamp:
- 23 Apr 2014, 22:32:28 (11 years ago)
- Location:
- branches/SHM-6-dev/source/Lib
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/SHM-6-dev/source/Lib/TLibCommon/TypeDef.h
r718 r728 103 103 #define POC_RESET_IDC_SIGNALLING 1 ///< JCTVC-P0041: Include signalling for poc_reset related syntax elements 104 104 #endif 105 #define POC_RESET_INFO_INFERENCE 1 ///< JCTVC-Q0146: Infer the value of poc_reset_info_present_flag when not present 105 106 #define NO_OUTPUT_OF_PRIOR_PICS 1 ///< Use no_output_of_prior_pics_flag 106 107 #define ALIGN_TSA_STSA_PICS 1 ///< JCTVC-N0084: Alignment of TSA and STSA pictures across AU. -
branches/SHM-6-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp
r726 r728 339 339 340 340 READ_FLAG( uiCode, "pps_extension_flag"); 341 #if POC_RESET_INFO_INFERENCE 342 Bool ppsExtensionFlag = uiCode ? true : false; 343 if( ppsExtensionFlag ) 344 #else 341 345 if (uiCode) 346 #endif 342 347 { 343 348 #if P0166_MODIFIED_PPS_EXTENSION … … 367 372 #endif 368 373 } 374 #if POC_RESET_INFO_INFERENCE 375 else // Extension type 0 absent 376 { 377 pcPPS->setPocResetInfoPresentFlag( false ); 378 } 379 #endif 369 380 if (ppsExtensionTypeFlag[7]) 370 381 { … … 379 390 #endif 380 391 } 392 #if POC_RESET_INFO_INFERENCE 393 if( !ppsExtensionFlag ) 394 { 395 pcPPS->setPocResetInfoPresentFlag( false ); 396 } 397 #endif 381 398 } 382 399
Note: See TracChangeset for help on using the changeset viewer.