Changeset 549 in SHVCSoftware for branches/SHM-5.0-dev/source


Ignore:
Timestamp:
21 Jan 2014, 03:57:34 (11 years ago)
Author:
seregin
Message:

set MAX_LAYERS to 8, should be lossless

Location:
branches/SHM-5.0-dev/source
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-5.0-dev/source/App/TAppDecoder/TAppDecTop.cpp

    r540 r549  
    8181  }
    8282#if SVC_EXTENSION
    83   for( Int i = 0; i < m_tgtLayerId; i++ )
     83  for( Int i = 0; i <= m_tgtLayerId; i++ )
    8484  {
    8585    if( m_pchReconFile[i] )

  • branches/SHM-5.0-dev/source/Lib/TLibCommon/TComRom.cpp

    r540 r549  
    530530Int g_mvScalingFactor  [MAX_LAYERS][2] = {{0,0}, {0,0}};
    531531Int g_posScalingFactor [MAX_LAYERS][2] = {{0,0}, {0,0}};
     532
     533std::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}
    532573#endif
    533574

  • branches/SHM-5.0-dev/source/Lib/TLibCommon/TComRom.h

    r540 r549  
    288288#if SVC_EXTENSION
    289289extern Int g_mvScalingFactor  [MAX_LAYERS][2];
    290 extern Int g_posScalingFactor [MAX_LAYERS][2];
     290extern Int g_posScalingFactor [MAX_LAYERS][2];
     291std::string NaluToStr( NalUnitType nalu );
    291292#endif
    292293

  • branches/SHM-5.0-dev/source/Lib/TLibCommon/TypeDef.h

    r540 r549  
    4545#define RANDOM_ACCESS_SEI_FIX            1
    4646#if SVC_EXTENSION
    47 #define MAX_LAYERS                       2      ///< max number of layers the codec is supposed to handle
     47#define MAX_LAYERS                       8      ///< max number of layers the codec is supposed to handle
    4848
    4949#define O0194_DIFFERENT_BITDEPTH_EL_BL   1      ///< JCTVC-O0194: Support for different bitdepth values for BL and EL, add required configuration parameters (and Some bugfixes when REPN_FORMAT_IN_VPS (JCTVC-N0092) is enabled)

  • branches/SHM-5.0-dev/source/Lib/TLibDecoder/TDecGop.cpp

    r540 r549  
    234234  //-- For time output for each slice
    235235#if SVC_EXTENSION
    236   printf("\nPOC %4d LId: %1d TId: %1d ( %c-SLICE, QP%3d ) ", pcSlice->getPOC(),
     236  printf("\nPOC %4d LId: %1d TId: %1d ( %c-SLICE %s, QP%3d ) ", pcSlice->getPOC(),
    237237                                                    rpcPic->getLayerId(),
    238238                                                    pcSlice->getTLayer(),
    239239                                                    c,
     240                                                    NaluToStr( pcSlice->getNalUnitType() ).data(),
    240241                                                    pcSlice->getSliceQp() );
    241242#else

  • branches/SHM-5.0-dev/source/Lib/TLibDecoder/TDecTop.cpp

    r540 r549  
    196196    if (m_cIlpPic[0] == NULL)
    197197    {
    198       for (Int j=0; j < MAX_LAYERS /*MAX_NUM_REF*/; j++)  // consider to set to NumDirectRefLayers[LayerIdInVps[nuh_layer_id]]
     198      for (Int j=0; j < m_numDirectRefLayers; j++)
    199199      {
    200200
    … …  
    20382038{
    20392039  CommonDecoderParams* params = this->getCommonDecoderParams();
     2040
     2041  assert( params->getTargetLayerId() < vps->getMaxLayers() );
     2042
    20402043  if( params->getValueCheckedFlag() )
    20412044  {

  • branches/SHM-5.0-dev/source/Lib/TLibEncoder/TEncGOP.cpp

    r540 r549  
    31083108
    31093109#if SVC_EXTENSION
    3110 #if ADAPTIVE_QP_SELECTION
    3111   printf("POC %4d LId: %1d TId: %1d ( %c-SLICE, nQP %d QP %d ) %10d bits",
     3110#if ADAPTIVE_QP_SELECTION 
     3111  printf("POC %4d LId: %1d TId: %1d ( %c-SLICE %s, nQP %d QP %d ) %10d bits",
    31123112         pcSlice->getPOC(),
    31133113         pcSlice->getLayerId(),
    31143114         pcSlice->getTLayer(),
    31153115         c,
     3116         NaluToStr( pcSlice->getNalUnitType() ).data(),
    31163117         pcSlice->getSliceQpBase(),
    31173118         pcSlice->getSliceQp(),
    31183119         uibits );
    31193120#else
    3120   printf("POC %4d LId: %1d TId: %1d ( %c-SLICE, QP %d ) %10d bits",
     3121  printf("POC %4d LId: %1d TId: %1d ( %c-SLICE %s, QP %d ) %10d bits",
    31213122         pcSlice->getPOC()-pcSlice->getLastIDR(),
    31223123         pcSlice->getLayerId(),
    31233124         pcSlice->getTLayer(),
    31243125         c,
     3126         NaluToStr( pcSlice->getNalUnitType() ).data().
    31253127         pcSlice->getSliceQp(),
    31263128         uibits );

  • branches/SHM-5.0-dev/source/Lib/TLibEncoder/TEncTop.cpp

    r540 r549  
    16321632    if (m_cIlpPic[0] == NULL)
    16331633    {
    1634       for (Int j=0; j < MAX_LAYERS /*MAX_NUM_REF*/; j++) // consider to set to NumDirectRefLayers[LayerIdInVps[nuh_layer_id]]
     1634      for (Int j=0; j < m_numLayer; j++) // consider to set to NumDirectRefLayers[LayerIdInVps[nuh_layer_id]]
    16351635      {
    16361636        m_cIlpPic[j] = new  TComPic;
    … …  
    16991699    if (m_cIlpPic[0] == NULL)
    17001700    {
    1701       for (Int j=0; j < MAX_LAYERS /*MAX_NUM_REF*/; j++) // consider to set to NumDirectRefLayers[LayerIdInVps[nuh_layer_id]]
     1701      for (Int j=0; j < m_numDirectRefLayers; j++)
    17021702      {
    17031703        m_cIlpPic[j] = new  TComPic;
Note: See TracChangeset for help on using the changeset viewer.