Changeset 588 in SHVCSoftware for trunk/source/Lib/TLibCommon/TComRom.cpp
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/SHM-5.0-dev (added) merged: 548-585,587
- Property svn:mergeinfo changed
-
trunk/source
- Property svn:mergeinfo changed
/branches/SHM-5.0-dev/source (added) merged: 549-585 /trunk/source removed
- Property svn:mergeinfo changed
-
trunk/source/Lib/TLibCommon/TComRom.cpp
r540 r588 530 530 Int g_mvScalingFactor [MAX_LAYERS][2] = {{0,0}, {0,0}}; 531 531 Int g_posScalingFactor [MAX_LAYERS][2] = {{0,0}, {0,0}}; 532 533 std::string NaluToStr( NalUnitType nalu ) 534 { 535 switch( nalu ) 536 { 537 case NAL_UNIT_CODED_SLICE_TRAIL_N: 538 case NAL_UNIT_CODED_SLICE_TRAIL_R: 539 return "TRAIL"; 540 541 case NAL_UNIT_CODED_SLICE_TSA_N: 542 case NAL_UNIT_CODED_SLICE_TSA_R: 543 return " TSA"; 544 545 case NAL_UNIT_CODED_SLICE_STSA_N: 546 case NAL_UNIT_CODED_SLICE_STSA_R: 547 return " STSA"; 548 549 case NAL_UNIT_CODED_SLICE_RADL_N: 550 case NAL_UNIT_CODED_SLICE_RADL_R: 551 return " RADL"; 552 553 case NAL_UNIT_CODED_SLICE_RASL_N: 554 case NAL_UNIT_CODED_SLICE_RASL_R: 555 return " RASL"; 556 557 case NAL_UNIT_CODED_SLICE_BLA_W_LP: 558 case NAL_UNIT_CODED_SLICE_BLA_W_RADL: 559 case NAL_UNIT_CODED_SLICE_BLA_N_LP: 560 return " BLA"; 561 562 case NAL_UNIT_CODED_SLICE_IDR_W_RADL: 563 case NAL_UNIT_CODED_SLICE_IDR_N_LP: 564 return " IDR"; 565 566 case NAL_UNIT_CODED_SLICE_CRA: 567 return " CRA"; 568 569 default: 570 return " "; 571 }; 572 } 532 573 #endif 533 574
Note: See TracChangeset for help on using the changeset viewer.