Changeset 862 in SHVCSoftware


Ignore:
Timestamp:
12 Aug 2014, 01:48:03 (10 years ago)
Author:
qualcomm
Message:

JCTVC-R0238: (Ed.) Move additional layer set signalling in VPS extn. (Macro: MOVE_ADDN_LS_SIGNALLING)

From: Adarsh K. Ramasubramonian <aramasub@…>

Location:
branches/SHM-dev/source/Lib
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r861 r862  
    5252#define POC_RESET_VALUE_RESTRICTION      1      ///< R0223: Restriction on the value of full_poc_reset_flag
    5353#define OUTPUT_LAYER_SETS_CONFIG         1
     54#define MOVE_ADDN_LS_SIGNALLING          1      ///< JCTVC-R0238: (Ed.) Move additional layer set signalling in VPS extn.
    5455#define O0137_MAX_LAYERID                1      ///< JCTVC-O0137, JCTVC-O0200, JCTVC-O0223: restrict nuh_layer_id and vps_max_layers_minus1
    5556

  • branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r852 r862  
    12811281  vps->setTreePartitionLayerIdList();
    12821282#endif
     1283#if MOVE_ADDN_LS_SIGNALLING
     1284#if Q0078_ADD_LAYER_SETS
     1285  if (vps->getNumIndependentLayers() > 1)
     1286  {
     1287    READ_UVLC(uiCode, "num_add_layer_sets"); vps->setNumAddLayerSets(uiCode);
     1288    for (i = 0; i < vps->getNumAddLayerSets(); i++)
     1289    {
     1290      for (j = 1; j < vps->getNumIndependentLayers(); j++)
     1291      {
     1292        int len = 1;
     1293        while ((1 << len) < (vps->getNumLayersInTreePartition(j) + 1))
     1294        {
     1295          len++;
     1296        }
     1297        READ_CODE(len, uiCode, "highest_layer_idx_plus1[i][j]"); vps->setHighestLayerIdxPlus1(i, j, uiCode);
     1298      }
     1299    }
     1300    vps->setNumLayerSets(vps->getNumLayerSets() + vps->getNumAddLayerSets());
     1301    vps->setLayerIdIncludedFlagsForAddLayerSets();
     1302  }
     1303#endif
     1304#endif
    12831305#if VPS_TSLAYERS
    12841306  READ_FLAG( uiCode, "vps_sub_layers_max_minus1_present_flag"); vps->setMaxTSLayersPresentFlag(uiCode ? true : false);
    … …  
    13661388#endif
    13671389
     1390#if !MOVE_ADDN_LS_SIGNALLING
    13681391#if Q0078_ADD_LAYER_SETS
    13691392  if (vps->getNumIndependentLayers() > 1)
    … …  
    13851408    vps->setLayerIdIncludedFlagsForAddLayerSets();
    13861409  }
     1410#endif
    13871411#endif
    13881412

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

    r852 r862  
    10061006  }
    10071007#endif
     1008#if MOVE_ADDN_LS_SIGNALLING
     1009#if Q0078_ADD_LAYER_SETS
     1010  if (vps->getNumIndependentLayers() > 1)
     1011  {
     1012    WRITE_UVLC( vps->getNumAddLayerSets(), "num_add_layer_sets" );
     1013    for (i = 0; i < vps->getNumAddLayerSets(); i++)
     1014    {
     1015      for (j = 1; j < vps->getNumIndependentLayers(); j++)
     1016      {
     1017        int len = 1;
     1018        while ((1 << len) < (vps->getNumLayersInTreePartition(j) + 1))
     1019        {
     1020          len++;
     1021        }
     1022        WRITE_CODE(vps->getHighestLayerIdxPlus1(i, j), len, "highest_layer_idx_plus1[i][j]");
     1023      }
     1024    }
     1025  }
     1026#endif
     1027#endif
    10081028#if VPS_TSLAYERS
    10091029    WRITE_FLAG( vps->getMaxTSLayersPresentFlag(), "vps_sub_layers_max_minus1_present_flag");
    … …  
    10561076#endif
    10571077
     1078
     1079#if !MOVE_ADDN_LS_SIGNALLING
    10581080#if Q0078_ADD_LAYER_SETS
    10591081  if (vps->getNumIndependentLayers() > 1)
    … …  
    10731095    }
    10741096  }
     1097#endif
    10751098#endif
    10761099
Note: See TracChangeset for help on using the changeset viewer.