Changeset 1139 in SHVCSoftware for branches/SHM-dev/source
- Timestamp:
- 7 Jul 2015, 23:25:11 (9 years ago)
- Location:
- branches/SHM-dev/source
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp
r1116 r1139 332 332 #if ALIGNED_BUMPING 333 333 Bool outputPicturesFlag = true; 334 #if NO_OUTPUT_OF_PRIOR_PICS 334 335 335 if( m_acTDecTop[nalu.m_layerId].getNoOutputPriorPicsFlag() ) 336 336 { 337 337 outputPicturesFlag = false; 338 338 } 339 #endif340 339 341 340 if (nalu.m_nalUnitType == NAL_UNIT_EOS) // End of sequence … … 351 350 #endif 352 351 { 353 #if NO_OUTPUT_OF_PRIOR_PICS 354 if( 355 #else 356 if ( bNewPOC && 357 #endif 358 ( nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR_W_RADL 352 if( nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR_W_RADL 359 353 || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR_N_LP 360 354 || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_BLA_N_LP 361 355 || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_BLA_W_RADL 362 || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_BLA_W_LP ))356 || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_BLA_W_LP ) 363 357 { 364 358 flushAllPictures( nalu.m_layerId, outputPicturesFlag ); -
branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp
r1136 r1139 3955 3955 } 3956 3956 3957 #if NO_OUTPUT_OF_PRIOR_PICS3958 3957 Bool TComSlice::getBlaPicFlag () 3959 3958 { … … 3962 3961 || getNalUnitType() == NAL_UNIT_CODED_SLICE_BLA_W_LP; 3963 3962 } 3963 3964 3964 Bool TComSlice::getCraPicFlag () 3965 3965 { 3966 3966 return getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA; 3967 3967 } 3968 #endif 3968 3969 3969 #if POC_RESET_IDC_DECODER 3970 3970 Bool TComSlice::getRaslPicFlag () -
branches/SHM-dev/source/Lib/TLibCommon/TComSlice.h
r1137 r1139 2596 2596 #endif 2597 2597 2598 #if NO_OUTPUT_OF_PRIOR_PICS2599 2598 Bool getBlaPicFlag (); 2600 2599 Bool getCraPicFlag (); 2601 #endif2602 2600 #if POC_RESET_IDC_DECODER 2603 2601 Bool getRaslPicFlag (); … … 2618 2616 2619 2617 #endif //SVC_EXTENSION 2618 2620 2619 protected: 2621 2620 TComPic* xGetRefPic (TComList<TComPic*>& rcListPic, Int poc); -
branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h
r1138 r1139 117 117 #endif 118 118 #define POC_RESET_INFO_INFERENCE 1 ///< JCTVC-Q0146: Infer the value of poc_reset_info_present_flag when not present 119 #define NO_OUTPUT_OF_PRIOR_PICS 1 ///< Use no_output_of_prior_pics_flag120 119 #define REPN_FORMAT_IN_VPS 1 ///< JCTVC-N0092: Signal represenation format (spatial resolution, bit depth, colour format) in the VPS 121 120 #define RPL_INIT_N0316_N0082 1 ///< JCTVC-N0316, JCTVC-N0082: initial reference picture list construction -
branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp
r1133 r1139 838 838 bNewPOC = m_apcSlicePilot->getPOC() != m_prevPOC || ( m_apcSlicePilot->getFirstSliceInPic() && m_parseIdc == -1 ); 839 839 840 #if NO_OUTPUT_OF_PRIOR_PICS841 840 #if NO_CLRAS_OUTPUT_FLAG 842 841 if (m_layerId == m_smallestLayerId && m_apcSlicePilot->getRapPicFlag()) … … 892 891 } 893 892 } 894 #endif895 893 896 894 #if POC_RESET_IDC_DECODER … … 1357 1355 if (m_bFirstSliceInPicture) 1358 1356 { 1357 #if SVC_EXTENSION 1359 1358 #if AVC_BASE 1360 1359 if( m_layerId > 0 && m_parameterSetManagerDecoder.getPrefetchedVPS(0)->getNonHEVCBaseLayerFlag() ) … … 1465 1464 #endif 1466 1465 1467 #if NO_OUTPUT_OF_PRIOR_PICS1468 1466 if ( m_layerId == 0 && m_apcSlicePilot->getRapPicFlag() && getNoClrasOutputFlag() ) 1469 1467 { … … 1474 1472 } 1475 1473 } 1476 #endif 1477 1478 #if SVC_EXTENSION 1474 1479 1475 xCheckLayerReset(); 1480 1476 xSetLayerInitializedFlag();
Note: See TracChangeset for help on using the changeset viewer.