Ticket #1181: TLA_to_TSA_NALUtype_HM12dev.patch
File TLA_to_TSA_NALUtype_HM12dev.patch, 4.4 KB (added by adarsh, 10 years ago) |
---|
-
App/TAppEncoder/TAppEncTop.cpp
581 581 { 582 582 case NAL_UNIT_CODED_SLICE_TRAIL_R: 583 583 case NAL_UNIT_CODED_SLICE_TRAIL_N: 584 case NAL_UNIT_CODED_SLICE_T LA_R:584 case NAL_UNIT_CODED_SLICE_TSA_R: 585 585 case NAL_UNIT_CODED_SLICE_TSA_N: 586 586 case NAL_UNIT_CODED_SLICE_STSA_R: 587 587 case NAL_UNIT_CODED_SLICE_STSA_N: -
Lib/TLibCommon/CommonDef.h
195 195 NAL_UNIT_CODED_SLICE_TRAIL_R, // 1 196 196 197 197 NAL_UNIT_CODED_SLICE_TSA_N, // 2 198 NAL_UNIT_CODED_SLICE_T LA_R, // 3198 NAL_UNIT_CODED_SLICE_TSA_R, // 3 199 199 200 200 NAL_UNIT_CODED_SLICE_STSA_N, // 4 201 201 NAL_UNIT_CODED_SLICE_STSA_R, // 5 -
Lib/TLibCommon/NAL.h
66 66 { 67 67 return m_nalUnitType == NAL_UNIT_CODED_SLICE_TRAIL_R 68 68 || m_nalUnitType == NAL_UNIT_CODED_SLICE_TRAIL_N 69 || m_nalUnitType == NAL_UNIT_CODED_SLICE_T LA_R69 || m_nalUnitType == NAL_UNIT_CODED_SLICE_TSA_R 70 70 || m_nalUnitType == NAL_UNIT_CODED_SLICE_TSA_N 71 71 || m_nalUnitType == NAL_UNIT_CODED_SLICE_STSA_R 72 72 || m_nalUnitType == NAL_UNIT_CODED_SLICE_STSA_N -
Lib/TLibCommon/TComSlice.cpp
1013 1013 //check that pictures of higher temporal layers are not used 1014 1014 assert(rpcPic->getSlice( 0 )->isReferenced()==0||rpcPic->getUsedByCurr()==0||rpcPic->getTLayer()<=this->getTLayer()); 1015 1015 //check that pictures of higher or equal temporal layer are not in the RPS if the current picture is a TSA picture 1016 if(this->getNalUnitType() == NAL_UNIT_CODED_SLICE_T LA_R || this->getNalUnitType() == NAL_UNIT_CODED_SLICE_TSA_N)1016 if(this->getNalUnitType() == NAL_UNIT_CODED_SLICE_TSA_R || this->getNalUnitType() == NAL_UNIT_CODED_SLICE_TSA_N) 1017 1017 { 1018 1018 assert(rpcPic->getSlice( 0 )->isReferenced()==0||rpcPic->getTLayer()<this->getTLayer()); 1019 1019 } -
Lib/TLibDecoder/NALread.cpp
121 121 } 122 122 else 123 123 { 124 assert( nalu.m_nalUnitType != NAL_UNIT_CODED_SLICE_T LA_R124 assert( nalu.m_nalUnitType != NAL_UNIT_CODED_SLICE_TSA_R 125 125 && nalu.m_nalUnitType != NAL_UNIT_CODED_SLICE_TSA_N 126 126 && nalu.m_nalUnitType != NAL_UNIT_CODED_SLICE_STSA_R 127 127 && nalu.m_nalUnitType != NAL_UNIT_CODED_SLICE_STSA_N ); -
Lib/TLibDecoder/TDecTop.cpp
707 707 708 708 case NAL_UNIT_CODED_SLICE_TRAIL_R: 709 709 case NAL_UNIT_CODED_SLICE_TRAIL_N: 710 case NAL_UNIT_CODED_SLICE_T LA_R:710 case NAL_UNIT_CODED_SLICE_TSA_R: 711 711 case NAL_UNIT_CODED_SLICE_TSA_N: 712 712 case NAL_UNIT_CODED_SLICE_STSA_R: 713 713 case NAL_UNIT_CODED_SLICE_STSA_N: -
Lib/TLibEncoder/TEncGOP.cpp
532 532 } 533 533 else 534 534 { 535 pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_T LA_R);535 pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_TSA_R); 536 536 } 537 537 } 538 538 else if(pcSlice->isStepwiseTemporalLayerSwitchingPointCandidate(rcListPic)) … … 2109 2109 { 2110 2110 case NAL_UNIT_CODED_SLICE_TRAIL_R: return "TRAIL_R"; 2111 2111 case NAL_UNIT_CODED_SLICE_TRAIL_N: return "TRAIL_N"; 2112 case NAL_UNIT_CODED_SLICE_T LA_R: return "TLA_R";2112 case NAL_UNIT_CODED_SLICE_TSA_R: return "TSA_R"; 2113 2113 case NAL_UNIT_CODED_SLICE_TSA_N: return "TSA_N"; 2114 2114 case NAL_UNIT_CODED_SLICE_STSA_R: return "STSA_R"; 2115 2115 case NAL_UNIT_CODED_SLICE_STSA_N: return "STSA_N";