Commit 35e53f00 authored by Vadim Seregin's avatar Vadim Seregin

add field coding flag check

parent ce9be424
Pipeline #5462 passed with stage
in 10 minutes and 34 seconds
...@@ -700,7 +700,7 @@ void Slice::checkRPL(const ReferencePictureList* pRPL0, const ReferencePictureLi ...@@ -700,7 +700,7 @@ void Slice::checkRPL(const ReferencePictureList* pRPL0, const ReferencePictureLi
( !m_pcPPS->getMixedNaluTypesInPicFlag() && ( m_eNalUnitType == NAL_UNIT_CODED_SLICE_IDR_W_RADL || m_eNalUnitType == NAL_UNIT_CODED_SLICE_IDR_N_LP ) && ( m_pcSPS->getIDRRefParamListPresent() || m_pcPPS->getRplInfoInPhFlag() ) ) // an IDR picture with sps_idr_rpl_present_flag equal to 1 or pps_rpl_info_in_ph_flag equal to 1 ( !m_pcPPS->getMixedNaluTypesInPicFlag() && ( m_eNalUnitType == NAL_UNIT_CODED_SLICE_IDR_W_RADL || m_eNalUnitType == NAL_UNIT_CODED_SLICE_IDR_N_LP ) && ( m_pcSPS->getIDRRefParamListPresent() || m_pcPPS->getRplInfoInPhFlag() ) ) // an IDR picture with sps_idr_rpl_present_flag equal to 1 or pps_rpl_info_in_ph_flag equal to 1
#endif #endif
|| ( !m_pcPPS->getMixedNaluTypesInPicFlag() && m_eNalUnitType == NAL_UNIT_CODED_SLICE_CRA && m_pcPicHeader->getNoOutputBeforeRecoveryFlag() ) // a CRA picture with NoOutputBeforeRecoveryFlag equal to 1 || ( !m_pcPPS->getMixedNaluTypesInPicFlag() && m_eNalUnitType == NAL_UNIT_CODED_SLICE_CRA && m_pcPicHeader->getNoOutputBeforeRecoveryFlag() ) // a CRA picture with NoOutputBeforeRecoveryFlag equal to 1
|| ( m_iPOC < m_iAssociatedIRAP && m_iAssociatedIRAPType == NAL_UNIT_CODED_SLICE_CRA && lastNoOutputBeforeRecoveryFlag ) // a picture, associated with a CRA picture with NoOutputBeforeRecoveryFlag equal to 1, that precedes, in decoding order, the leading pictures associated with the same CRA picture || ( m_pcSPS->getFieldSeqFlag() && m_iPOC > m_iAssociatedIRAP /*&& m_iPOC < firstLeadingPicPOC*/ && m_iAssociatedIRAPType == NAL_UNIT_CODED_SLICE_CRA && lastNoOutputBeforeRecoveryFlag ) // a picture, associated with a CRA picture with NoOutputBeforeRecoveryFlag equal to 1, that precedes, in decoding order, the leading pictures associated with the same CRA picture
|| ( ( m_eNalUnitType == NAL_UNIT_CODED_SLICE_RADL || m_eNalUnitType == NAL_UNIT_CODED_SLICE_RASL ) && m_iAssociatedIRAPType == NAL_UNIT_CODED_SLICE_CRA && lastNoOutputBeforeRecoveryFlag ) // a leading picture associated with a CRA picture with NoOutputBeforeRecoveryFlag equal to 1 || ( ( m_eNalUnitType == NAL_UNIT_CODED_SLICE_RADL || m_eNalUnitType == NAL_UNIT_CODED_SLICE_RASL ) && m_iAssociatedIRAPType == NAL_UNIT_CODED_SLICE_CRA && lastNoOutputBeforeRecoveryFlag ) // a leading picture associated with a CRA picture with NoOutputBeforeRecoveryFlag equal to 1
|| ( !m_pcPPS->getMixedNaluTypesInPicFlag() && m_eNalUnitType == NAL_UNIT_CODED_SLICE_GDR && m_pcPicHeader->getNoOutputBeforeRecoveryFlag() ) // a GDR picture with NoOutputBeforeRecoveryFlag equal to 1 || ( !m_pcPPS->getMixedNaluTypesInPicFlag() && m_eNalUnitType == NAL_UNIT_CODED_SLICE_GDR && m_pcPicHeader->getNoOutputBeforeRecoveryFlag() ) // a GDR picture with NoOutputBeforeRecoveryFlag equal to 1
|| ( m_pcPicHeader->getRecoveryPocCnt() >= 0 && m_iPOC < m_pcPicHeader->getRecoveryPocCnt() && lastNoOutputBeforeRecoveryFlag ) // a recovering picture of a GDR picture with NoOutputBeforeRecoveryFlag equal to 1 and nuh_layer_id equal to layerId || ( m_pcPicHeader->getRecoveryPocCnt() >= 0 && m_iPOC < m_pcPicHeader->getRecoveryPocCnt() && lastNoOutputBeforeRecoveryFlag ) // a recovering picture of a GDR picture with NoOutputBeforeRecoveryFlag equal to 1 and nuh_layer_id equal to layerId
...@@ -1539,7 +1539,7 @@ void Slice::checkSubpicTypeConstraints( PicList& rcListPic, const ReferencePictu ...@@ -1539,7 +1539,7 @@ void Slice::checkSubpicTypeConstraints( PicList& rcListPic, const ReferencePictu
( ( m_eNalUnitType == NAL_UNIT_CODED_SLICE_IDR_W_RADL || m_eNalUnitType == NAL_UNIT_CODED_SLICE_IDR_N_LP ) && ( m_pcSPS->getIDRRefParamListPresent() || m_pcPPS->getRplInfoInPhFlag() ) ) // an IDR subpicture in an IDR picture with sps_idr_rpl_present_flag equal to 1 or pps_rpl_info_in_ph_flag equal to 1 ( ( m_eNalUnitType == NAL_UNIT_CODED_SLICE_IDR_W_RADL || m_eNalUnitType == NAL_UNIT_CODED_SLICE_IDR_N_LP ) && ( m_pcSPS->getIDRRefParamListPresent() || m_pcPPS->getRplInfoInPhFlag() ) ) // an IDR subpicture in an IDR picture with sps_idr_rpl_present_flag equal to 1 or pps_rpl_info_in_ph_flag equal to 1
#endif #endif
|| ( m_eNalUnitType == NAL_UNIT_CODED_SLICE_CRA && !m_pcPPS->getMixedNaluTypesInPicFlag() && m_pcPicHeader->getNoOutputBeforeRecoveryFlag() ) // a CRA subpicture in a CRA picture with NoOutputBeforeRecoveryFlag equal to 1 || ( m_eNalUnitType == NAL_UNIT_CODED_SLICE_CRA && !m_pcPPS->getMixedNaluTypesInPicFlag() && m_pcPicHeader->getNoOutputBeforeRecoveryFlag() ) // a CRA subpicture in a CRA picture with NoOutputBeforeRecoveryFlag equal to 1
|| ( m_iPOC < m_prevIRAPSubpicPOC && m_iAssociatedIRAPType == NAL_UNIT_CODED_SLICE_CRA && lastNoOutputBeforeRecoveryFlag ) // a subpicture, associated with a CRA subpicture in a CRA picture with NoOutputBeforeRecoveryFlag equal to 1, that precedes, in decoding order, the leading pictures associated with the same CRA picture || ( m_pcSPS->getFieldSeqFlag() && m_iPOC > m_prevIRAPSubpicPOC /*&& m_iPOC < firstLeadingPicPOC*/ && m_iAssociatedIRAPType == NAL_UNIT_CODED_SLICE_CRA && lastNoOutputBeforeRecoveryFlag ) // a subpicture, associated with a CRA subpicture in a CRA picture with NoOutputBeforeRecoveryFlag equal to 1, that precedes, in decoding order, the leading pictures associated with the same CRA picture
|| ( ( m_eNalUnitType == NAL_UNIT_CODED_SLICE_RADL || m_eNalUnitType == NAL_UNIT_CODED_SLICE_RASL ) && m_iAssociatedIRAPType == NAL_UNIT_CODED_SLICE_CRA && lastNoOutputBeforeRecoveryFlag ) // a leading subpicture associated with a CRA subpicture in a CRA picture with NoOutputBeforeRecoveryFlag equal to 1 || ( ( m_eNalUnitType == NAL_UNIT_CODED_SLICE_RADL || m_eNalUnitType == NAL_UNIT_CODED_SLICE_RASL ) && m_iAssociatedIRAPType == NAL_UNIT_CODED_SLICE_CRA && lastNoOutputBeforeRecoveryFlag ) // a leading subpicture associated with a CRA subpicture in a CRA picture with NoOutputBeforeRecoveryFlag equal to 1
|| ( m_eNalUnitType == NAL_UNIT_CODED_SLICE_GDR && !m_pcPPS->getMixedNaluTypesInPicFlag() && m_pcPicHeader->getNoOutputBeforeRecoveryFlag() ) // a GDR subpicture in a GDR picture with NoOutputBeforeRecoveryFlag equal to 1 || ( m_eNalUnitType == NAL_UNIT_CODED_SLICE_GDR && !m_pcPPS->getMixedNaluTypesInPicFlag() && m_pcPicHeader->getNoOutputBeforeRecoveryFlag() ) // a GDR subpicture in a GDR picture with NoOutputBeforeRecoveryFlag equal to 1
|| ( m_pcPicHeader->getRecoveryPocCnt() >= 0 && m_iPOC < m_pcPicHeader->getRecoveryPocCnt() && lastNoOutputBeforeRecoveryFlag ) // a subpicure in a recovering picture of a GDR picture with NoOutputBeforeRecoveryFlag equal to 1 and nuh_layer_id equal to layerId || ( m_pcPicHeader->getRecoveryPocCnt() >= 0 && m_iPOC < m_pcPicHeader->getRecoveryPocCnt() && lastNoOutputBeforeRecoveryFlag ) // a subpicure in a recovering picture of a GDR picture with NoOutputBeforeRecoveryFlag equal to 1 and nuh_layer_id equal to layerId
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment