Index: branches/SHM-6-dev/source/App/TAppDecoder/TAppDecTop.cpp =================================================================== --- branches/SHM-6-dev/source/App/TAppDecoder/TAppDecTop.cpp (revision 651) +++ branches/SHM-6-dev/source/App/TAppDecoder/TAppDecTop.cpp (revision 652) @@ -257,5 +257,5 @@ Bool outputPicturesFlag = true; #if NO_OUTPUT_OF_PRIOR_PICS - if( m_acTDecTop[nalu.m_layerId].getNoOutputOfPriorPicsFlags() ) + if( m_acTDecTop[nalu.m_layerId].getNoOutputPriorPicsFlag() ) { outputPicturesFlag = false; @@ -449,4 +449,12 @@ loopFiltered = (nalu.m_nalUnitType == NAL_UNIT_EOS); } +#if !FIX_WRITING_OUTPUT +#if SETTING_NO_OUT_PIC_PRIOR + if (bNewPicture && m_cTDecTop.getNoOutputPriorPicsFlag()) + { + m_cTDecTop.checkNoOutputPriorPics( pcListPic ); + } +#endif +#endif if( pcListPic ) @@ -460,4 +468,18 @@ openedReconFile = true; } +#if FIX_WRITING_OUTPUT + // write reconstruction to file + if( bNewPicture ) + { + xWriteOutput( pcListPic, nalu.m_temporalId ); + } +#if SETTING_NO_OUT_PIC_PRIOR + if ( (bNewPicture || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_CRA) && m_cTDecTop.getNoOutputPriorPicsFlag() ) + { + m_cTDecTop.checkNoOutputPriorPics( pcListPic ); + m_cTDecTop.setNoOutputPriorPicsFlag (false); + } +#endif +#endif if ( bNewPicture && ( nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR_W_RADL @@ -471,8 +493,16 @@ if (nalu.m_nalUnitType == NAL_UNIT_EOS) { +#if FIX_OUTPUT_EOS + xWriteOutput( pcListPic, nalu.m_temporalId ); +#else xFlushOutput( pcListPic ); - } - // write reconstruction to file +#endif + } + // write reconstruction to file -- for additional bumping as defined in C.5.2.3 +#if FIX_WRITING_OUTPUT + if(!bNewPicture && nalu.m_nalUnitType >= NAL_UNIT_CODED_SLICE_TRAIL_N && nalu.m_nalUnitType <= NAL_UNIT_RESERVED_VCL31) +#else if(bNewPicture) +#endif { xWriteOutput( pcListPic, nalu.m_temporalId ); @@ -586,4 +616,24 @@ TComList::iterator iterPic = pcListPic->begin(); Int numPicsNotYetDisplayed = 0; + Int dpbFullness = 0; +#if SVC_EXTENSION +TComSPS* activeSPS = m_acTDecTop[layerId].getActiveSPS(); +#else + TComSPS* activeSPS = m_cTDecTop.getActiveSPS(); +#endif + UInt numReorderPicsHighestTid; + UInt maxDecPicBufferingHighestTid; + UInt maxNrSublayers = activeSPS->getMaxTLayers(); + + if(m_iMaxTemporalLayer == -1 || m_iMaxTemporalLayer >= maxNrSublayers) + { + numReorderPicsHighestTid = activeSPS->getNumReorderPics(maxNrSublayers-1); + maxDecPicBufferingHighestTid = activeSPS->getMaxDecPicBuffering(maxNrSublayers-1); + } + else + { + numReorderPicsHighestTid = activeSPS->getNumReorderPics(m_iMaxTemporalLayer); + maxDecPicBufferingHighestTid = activeSPS->getMaxDecPicBuffering(m_iMaxTemporalLayer); + } while (iterPic != pcListPic->end()) @@ -597,4 +647,9 @@ { numPicsNotYetDisplayed++; + dpbFullness++; + } + else if(pcPic->getSlice( 0 )->isReferenced()) + { + dpbFullness++; } iterPic++; @@ -619,9 +674,13 @@ #if SVC_EXTENSION - if ( pcPicTop->getOutputMark() && (numPicsNotYetDisplayed > pcPicTop->getNumReorderPics(tId) && !(pcPicTop->getPOC()%2) && pcPicBottom->getPOC() == pcPicTop->getPOC()+1) - && pcPicBottom->getOutputMark() && (numPicsNotYetDisplayed > pcPicBottom->getNumReorderPics(tId) && (pcPicTop->getPOC() == m_aiPOCLastDisplay[layerId]+1 || m_aiPOCLastDisplay[layerId]<0))) -#else - if ( pcPicTop->getOutputMark() && (numPicsNotYetDisplayed > pcPicTop->getNumReorderPics(tId) && !(pcPicTop->getPOC()%2) && pcPicBottom->getPOC() == pcPicTop->getPOC()+1) - && pcPicBottom->getOutputMark() && (numPicsNotYetDisplayed > pcPicBottom->getNumReorderPics(tId) && (pcPicTop->getPOC() == m_iPOCLastDisplay+1 || m_iPOCLastDisplay<0))) + if( pcPicTop->getOutputMark() && pcPicBottom->getOutputMark() && + (numPicsNotYetDisplayed > numReorderPicsHighestTid || dpbFullness > maxDecPicBufferingHighestTid) && + (!(pcPicTop->getPOC()%2) && pcPicBottom->getPOC() == pcPicTop->getPOC()+1) && + (pcPicTop->getPOC() == m_aiPOCLastDisplay[layerId]+1 || m_aiPOCLastDisplay[layerId]<0) ) +#else + if ( pcPicTop->getOutputMark() && pcPicBottom->getOutputMark() && + (numPicsNotYetDisplayed > numReorderPicsHighestTid || dpbFullness > maxDecPicBufferingHighestTid) && + (!(pcPicTop->getPOC()%2) && pcPicBottom->getPOC() == pcPicTop->getPOC()+1) && + (pcPicTop->getPOC() == m_iPOCLastDisplay+1 || m_iPOCLastDisplay < 0)) #endif { @@ -720,13 +779,19 @@ #if SVC_EXTENSION - if ( pcPic->getOutputMark() && (numPicsNotYetDisplayed > pcPic->getNumReorderPics(tId) && pcPic->getPOC() > m_aiPOCLastDisplay[layerId])) -#else - if ( pcPic->getOutputMark() && (numPicsNotYetDisplayed > pcPic->getNumReorderPics(tId) && pcPic->getPOC() > m_iPOCLastDisplay)) + if( pcPic->getOutputMark() && pcPic->getPOC() > m_aiPOCLastDisplay[layerId] && + (numPicsNotYetDisplayed > numReorderPicsHighestTid || dpbFullness > maxDecPicBufferingHighestTid) ) +#else + if(pcPic->getOutputMark() && pcPic->getPOC() > m_iPOCLastDisplay && + (numPicsNotYetDisplayed > numReorderPicsHighestTid || dpbFullness > maxDecPicBufferingHighestTid)) #endif { // write to file numPicsNotYetDisplayed--; -#if SVC_EXTENSION - if ( m_pchReconFile[layerId] ) + if(pcPic->getSlice(0)->isReferenced() == false) + { + dpbFullness--; + } +#if SVC_EXTENSION + if( m_pchReconFile[layerId] ) { const Window &conf = pcPic->getConformanceWindow(); Index: branches/SHM-6-dev/source/App/TAppEncoder/TAppEncCfg.cpp =================================================================== --- branches/SHM-6-dev/source/App/TAppEncoder/TAppEncCfg.cpp (revision 651) +++ branches/SHM-6-dev/source/App/TAppEncoder/TAppEncCfg.cpp (revision 652) @@ -710,5 +710,9 @@ ("IntraPeriod,-ip", m_iIntraPeriod, -1, "Intra period in frames, (-1: only first frame)") #endif +#if ALLOW_RECOVERY_POINT_AS_RAP + ("DecodingRefreshType,-dr", m_iDecodingRefreshType, 0, "Intra refresh type (0:none 1:CRA 2:IDR 3:RecPointSEI)") +#else ("DecodingRefreshType,-dr", m_iDecodingRefreshType, 0, "Intra refresh type (0:none 1:CRA 2:IDR)") +#endif ("GOPSize,g", m_iGOPSize, 1, "GOP size of temporal structure") // motion options @@ -905,4 +909,6 @@ ("SEIToneMapCameraIsoSpeedIdc", m_cameraIsoSpeedIdc, 0, "Indicates the camera ISO speed for daylight illumination") ("SEIToneMapCameraIsoSpeedValue", m_cameraIsoSpeedValue, 400, "Specifies the camera ISO speed for daylight illumination of Extended_ISO") + ("SEIToneMapExposureIndexIdc", m_exposureIndexIdc, 0, "Indicates the exposure index setting of the camera") + ("SEIToneMapExposureIndexValue", m_exposureIndexValue, 400, "Specifies the exposure index setting of the cameran of Extended_ISO") ("SEIToneMapExposureCompensationValueSignFlag", m_exposureCompensationValueSignFlag, 0, "Specifies the sign of ExposureCompensationValue") ("SEIToneMapExposureCompensationValueNumerator", m_exposureCompensationValueNumerator, 0, "Specifies the numerator of ExposureCompensationValue") @@ -1587,5 +1593,13 @@ xConfirmPara( (m_iIntraPeriod > 0 && m_iIntraPeriod < m_iGOPSize) || m_iIntraPeriod == 0, "Intra period must be more than GOP size, or -1 , not 0" ); #endif +#if ALLOW_RECOVERY_POINT_AS_RAP + xConfirmPara( m_iDecodingRefreshType < 0 || m_iDecodingRefreshType > 3, "Decoding Refresh Type must be comprised between 0 and 3 included" ); + if(m_iDecodingRefreshType == 3) + { + xConfirmPara( !m_recoveryPointSEIEnabled, "When using RecoveryPointSEI messages as RA points, recoveryPointSEI must be enabled" ); + } +#else xConfirmPara( m_iDecodingRefreshType < 0 || m_iDecodingRefreshType > 2, "Decoding Refresh Type must be equal to 0, 1 or 2" ); +#endif #if !SVC_EXTENSION xConfirmPara( m_iQP < -6 * (m_internalBitDepthY - 8) || m_iQP > 51, "QP exceeds supported range (-QpBDOffsety to 51)" ); @@ -2160,4 +2174,5 @@ xConfirmPara( m_toneMapModelId < 0 || m_toneMapModelId > 4 , "SEIToneMapModelId must be in rage 0 to 4"); xConfirmPara( m_cameraIsoSpeedValue == 0, "SEIToneMapCameraIsoSpeedValue shall not be equal to 0"); + xConfirmPara( m_exposureIndexValue == 0, "SEIToneMapExposureIndexValue shall not be equal to 0"); xConfirmPara( m_extendedRangeWhiteLevel < 100, "SEIToneMapExtendedRangeWhiteLevel should be greater than or equal to 100"); xConfirmPara( m_nominalBlackLevelLumaCodeValue >= m_nominalWhiteLevelLumaCodeValue, "SEIToneMapNominalWhiteLevelLumaCodeValue shall be greater than SEIToneMapNominalBlackLevelLumaCodeValue"); Index: branches/SHM-6-dev/source/App/TAppEncoder/TAppEncCfg.h =================================================================== --- branches/SHM-6-dev/source/App/TAppEncoder/TAppEncCfg.h (revision 651) +++ branches/SHM-6-dev/source/App/TAppEncoder/TAppEncCfg.h (revision 652) @@ -255,4 +255,6 @@ Int m_cameraIsoSpeedIdc; Int m_cameraIsoSpeedValue; + Int m_exposureIndexIdc; + Int m_exposureIndexValue; Int m_exposureCompensationValueSignFlag; Int m_exposureCompensationValueNumerator; Index: branches/SHM-6-dev/source/App/TAppEncoder/TAppEncTop.cpp =================================================================== --- branches/SHM-6-dev/source/App/TAppEncoder/TAppEncTop.cpp (revision 651) +++ branches/SHM-6-dev/source/App/TAppEncoder/TAppEncTop.cpp (revision 652) @@ -767,4 +767,6 @@ m_cTEncTop.setTMISEICameraIsoSpeedIdc ( m_cameraIsoSpeedIdc ); m_cTEncTop.setTMISEICameraIsoSpeedValue ( m_cameraIsoSpeedValue ); + m_cTEncTop.setTMISEIExposureIndexIdc ( m_exposureIndexIdc ); + m_cTEncTop.setTMISEIExposureIndexValue ( m_exposureIndexValue ); m_cTEncTop.setTMISEIExposureCompensationValueSignFlag ( m_exposureCompensationValueSignFlag ); m_cTEncTop.setTMISEIExposureCompensationValueNumerator ( m_exposureCompensationValueNumerator );