Ticket #1181: TLA_to_TSA_NALUtype_HM12dev.patch

File TLA_to_TSA_NALUtype_HM12dev.patch, 4.4 KB (added by adarsh, 10 years ago)

Patch to change NAL unit type name from TLA_R to TSA_R

  • App/TAppEncoder/TAppEncTop.cpp

     
    581581    {
    582582    case NAL_UNIT_CODED_SLICE_TRAIL_R:
    583583    case NAL_UNIT_CODED_SLICE_TRAIL_N:
    584     case NAL_UNIT_CODED_SLICE_TLA_R:
     584    case NAL_UNIT_CODED_SLICE_TSA_R:
    585585    case NAL_UNIT_CODED_SLICE_TSA_N:
    586586    case NAL_UNIT_CODED_SLICE_STSA_R:
    587587    case NAL_UNIT_CODED_SLICE_STSA_N:

  • Lib/TLibCommon/CommonDef.h

     
    195195  NAL_UNIT_CODED_SLICE_TRAIL_R,     // 1
    196196 
    197197  NAL_UNIT_CODED_SLICE_TSA_N,       // 2
    198   NAL_UNIT_CODED_SLICE_TLA_R,       // 3
     198  NAL_UNIT_CODED_SLICE_TSA_R,       // 3
    199199 
    200200  NAL_UNIT_CODED_SLICE_STSA_N,      // 4
    201201  NAL_UNIT_CODED_SLICE_STSA_R,      // 5

  • Lib/TLibCommon/NAL.h

     
    6666  {
    6767    return m_nalUnitType == NAL_UNIT_CODED_SLICE_TRAIL_R
    6868        || m_nalUnitType == NAL_UNIT_CODED_SLICE_TRAIL_N
    69         || m_nalUnitType == NAL_UNIT_CODED_SLICE_TLA_R
     69        || m_nalUnitType == NAL_UNIT_CODED_SLICE_TSA_R
    7070        || m_nalUnitType == NAL_UNIT_CODED_SLICE_TSA_N
    7171        || m_nalUnitType == NAL_UNIT_CODED_SLICE_STSA_R
    7272        || m_nalUnitType == NAL_UNIT_CODED_SLICE_STSA_N

  • Lib/TLibCommon/TComSlice.cpp

     
    10131013    //check that pictures of higher temporal layers are not used
    10141014    assert(rpcPic->getSlice( 0 )->isReferenced()==0||rpcPic->getUsedByCurr()==0||rpcPic->getTLayer()<=this->getTLayer());
    10151015    //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_TLA_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)
    10171017    {
    10181018      assert(rpcPic->getSlice( 0 )->isReferenced()==0||rpcPic->getTLayer()<this->getTLayer());
    10191019    }

  • Lib/TLibDecoder/NALread.cpp

     
    121121  }
    122122  else
    123123  {
    124     assert( nalu.m_nalUnitType != NAL_UNIT_CODED_SLICE_TLA_R
     124    assert( nalu.m_nalUnitType != NAL_UNIT_CODED_SLICE_TSA_R
    125125         && nalu.m_nalUnitType != NAL_UNIT_CODED_SLICE_TSA_N
    126126         && nalu.m_nalUnitType != NAL_UNIT_CODED_SLICE_STSA_R
    127127         && nalu.m_nalUnitType != NAL_UNIT_CODED_SLICE_STSA_N );

  • Lib/TLibDecoder/TDecTop.cpp

     
    707707
    708708    case NAL_UNIT_CODED_SLICE_TRAIL_R:
    709709    case NAL_UNIT_CODED_SLICE_TRAIL_N:
    710     case NAL_UNIT_CODED_SLICE_TLA_R:
     710    case NAL_UNIT_CODED_SLICE_TSA_R:
    711711    case NAL_UNIT_CODED_SLICE_TSA_N:
    712712    case NAL_UNIT_CODED_SLICE_STSA_R:
    713713    case NAL_UNIT_CODED_SLICE_STSA_N:

  • Lib/TLibEncoder/TEncGOP.cpp

     
    532532        }
    533533        else
    534534        {
    535           pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_TLA_R);
     535          pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_TSA_R);
    536536        }
    537537      }
    538538      else if(pcSlice->isStepwiseTemporalLayerSwitchingPointCandidate(rcListPic))
    … …  
    21092109  {
    21102110    case NAL_UNIT_CODED_SLICE_TRAIL_R:    return "TRAIL_R";
    21112111    case NAL_UNIT_CODED_SLICE_TRAIL_N:    return "TRAIL_N";
    2112     case NAL_UNIT_CODED_SLICE_TLA_R:      return "TLA_R";
     2112    case NAL_UNIT_CODED_SLICE_TSA_R:      return "TSA_R";
    21132113    case NAL_UNIT_CODED_SLICE_TSA_N:      return "TSA_N";
    21142114    case NAL_UNIT_CODED_SLICE_STSA_R:     return "STSA_R";
    21152115    case NAL_UNIT_CODED_SLICE_STSA_N:     return "STSA_N";