Changeset 1185 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder


Ignore:
Timestamp:
8 Jul 2015, 03:34:13 (10 years ago)
Author:
seregin
Message:

macro cleanup: VPS_VUI_BSP_HRD_PARAMS, R0227_VUI_BSP_HRD_FLAG

Location:
branches/SHM-dev/source/Lib/TLibDecoder
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r1134 r1185  
    199199      {
    200200        sei = new SEIDecodingUnitInfo;
    201 #if VPS_VUI_BSP_HRD_PARAMS
     201#if SVC_EXTENSION
    202202        xParseSEIDecodingUnitInfo((SEIDecodingUnitInfo&) *sei, payloadSize, sps, nestingSei, bspNestingSei, vps, pDecodedMessageOutputStream);
    203203#else       
    … …  
    214214      {
    215215        sei = new SEIBufferingPeriod;
    216 #if VPS_VUI_BSP_HRD_PARAMS
     216#if SVC_EXTENSION
    217217        xParseSEIBufferingPeriod((SEIBufferingPeriod&) *sei, payloadSize, sps, nestingSei, bspNestingSei, vps, pDecodedMessageOutputStream);
    218218#else
    … …  
    229229      {
    230230        sei = new SEIPictureTiming;
    231 #if VPS_VUI_BSP_HRD_PARAMS
     231#if SVC_EXTENSION
    232232        xParseSEIPictureTiming((SEIPictureTiming&)*sei, payloadSize, sps, nestingSei, bspNestingSei, vps, pDecodedMessageOutputStream);
    233233#else
    … …  
    560560}
    561561
    562 #if VPS_VUI_BSP_HRD_PARAMS
     562#if SVC_EXTENSION
    563563Void SEIReader::xParseSEIDecodingUnitInfo(SEIDecodingUnitInfo& sei, UInt payloadSize, TComSPS *sps, const SEIScalableNesting* nestingSei, const SEIBspNesting* bspNestingSei, TComVPS *vps,std::ostream *pDecodedMessageOutputStream)
    564564#else
    … …  
    571571  sei.m_decodingUnitIdx = val;
    572572
    573 #if VPS_VUI_BSP_HRD_PARAMS
     573#if SVC_EXTENSION
    574574  TComHRD *hrd;
    575575  if( bspNestingSei )   // If DU info SEI contained inside a BSP nesting SEI message
    … …  
    645645}
    646646
    647 #if VPS_VUI_BSP_HRD_PARAMS
     647#if SVC_EXTENSION
    648648Void SEIReader::xParseSEIBufferingPeriod(SEIBufferingPeriod& sei, UInt payloadSize, TComSPS *sps, const SEIScalableNesting* nestingSei, const SEIBspNesting* bspNestingSei, TComVPS *vps, std::ostream *pDecodedMessageOutputStream)
    649649#else
    … …  
    654654  UInt code;
    655655
    656 #if VPS_VUI_BSP_HRD_PARAMS
     656#if SVC_EXTENSION
    657657  TComHRD *pHRD;
    658658  if( bspNestingSei )   // If BP SEI contained inside a BSP nesting SEI message
    … …  
    749749}
    750750
    751 #if VPS_VUI_BSP_HRD_PARAMS
     751#if SVC_EXTENSION
    752752Void SEIReader::xParseSEIPictureTiming(SEIPictureTiming& sei, UInt payloadSize, TComSPS *sps, const SEIScalableNesting* nestingSei, const SEIBspNesting* bspNestingSei, TComVPS *vps, std::ostream *pDecodedMessageOutputStream)
    753753#else
    … …  
    758758  UInt code;
    759759
    760 #if VPS_VUI_BSP_HRD_PARAMS
     760#if SVC_EXTENSION
    761761  TComHRD *hrd;   
    762762  TComVUI *vui = sps->getVuiParameters();
    … …  
    15481548  assert(vps->getVpsVuiPresentFlag());
    15491549
    1550 #if VPS_VUI_BSP_HRD_PARAMS
     1550#if SVC_EXTENSION
    15511551  UInt uiCode;
    15521552  Int psIdx         = bspNestingSei.m_seiPartitioningSchemeIdx;

  • branches/SHM-dev/source/Lib/TLibDecoder/SEIread.h

    r1098 r1185  
    7878  Void xParseSEIActiveParameterSets           (SEIActiveParameterSets  &sei,          UInt payloadSize,               std::ostream *pDecodedMessageOutputStream);
    7979  Void xParseSEIDecodedPictureHash            (SEIDecodedPictureHash& sei,            UInt payloadSize,               std::ostream *pDecodedMessageOutputStream);
    80 #if VPS_VUI_BSP_HRD_PARAMS
     80#if SVC_EXTENSION
    8181  Void xParseSEIDecodingUnitInfo              (SEIDecodingUnitInfo& sei,              UInt payloadSize, TComSPS *sps, const SEIScalableNesting* nestingSei, const SEIBspNesting* bspNestingSei, TComVPS *vps, std::ostream *pDecodedMessageOutputStream);
    8282  Void xParseSEIBufferingPeriod               (SEIBufferingPeriod& sei,               UInt payloadSize, TComSPS *sps, const SEIScalableNesting* nestingSei, const SEIBspNesting* bspNestingSei, TComVPS *vps, std::ostream *pDecodedMessageOutputStream);

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

    r1183 r1185  
    602602      READ_CODE( 5, uiCode, "dpb_output_delay_length_minus1" );       hrd->setDpbOutputDelayLengthMinus1( uiCode );
    603603    }
    604 #if VPS_VUI_BSP_HRD_PARAMS
     604#if SVC_EXTENSION
    605605    else
    606606    {
    … …  
    35293529#if O0164_MULTI_LAYER_HRD
    35303530  READ_FLAG(uiCode, "vps_vui_bsp_hrd_present_flag" ); vps->setVpsVuiBspHrdPresentFlag(uiCode);
    3531   if (vps->getVpsVuiBspHrdPresentFlag())
    3532   {
    3533 #if VPS_VUI_BSP_HRD_PARAMS
     3531
     3532  if( vps->getVpsVuiBspHrdPresentFlag() )
     3533  {
    35343534    parseVpsVuiBspHrdParams(vps);
    3535 #else
    3536 #if R0227_VUI_BSP_HRD_FLAG
    3537     assert (vps->getTimingInfo()->getTimingInfoPresentFlag() == 1);
    3538 #endif
    3539     READ_UVLC( uiCode, "vps_num_bsp_hrd_parameters_minus1" ); vps->setVpsNumBspHrdParametersMinus1(uiCode);
    3540     vps->createBspHrdParamBuffer(vps->getVpsNumBspHrdParametersMinus1() + 1);
    3541     for( i = 0; i <= vps->getVpsNumBspHrdParametersMinus1(); i++ )
    3542     {
    3543       if( i > 0 )
    3544       {
    3545         READ_FLAG( uiCode, "bsp_cprms_present_flag[i]" ); vps->setBspCprmsPresentFlag(i, uiCode);
    3546       }
    3547       parseHrdParameters(vps->getBspHrd(i), i==0 ? 1 : vps->getBspCprmsPresentFlag(i), vps->getMaxTLayers()-1);
    3548     }
    3549     for (UInt h = 1; h <= vps->getVpsNumLayerSetsMinus1(); h++)
    3550     {
    3551       READ_UVLC( uiCode, "num_bitstream_partitions[i]"); vps->setNumBitstreamPartitions(h, uiCode);
    3552 #if HRD_BPB
    3553       Int chkPart=0;
    3554 #endif
    3555       for( i = 0; i < vps->getNumBitstreamPartitions(h); i++ )
    3556       {
    3557         for( j = 0; j <= (vps->getMaxLayers()-1); j++ )
    3558         {
    3559           if( vps->getLayerIdIncludedFlag(h, j) )
    3560           {
    3561             READ_FLAG( uiCode, "layer_in_bsp_flag[h][i][j]" ); vps->setLayerInBspFlag(h, i, j, uiCode);
    3562           }
    3563         }
    3564 #if HRD_BPB
    3565         chkPart+=vps->getLayerInBspFlag(h, i, j);
    3566 #endif
    3567       }
    3568 #if HRD_BPB
    3569       assert(chkPart<=1);
    3570 #endif
    3571 #if HRD_BPB
    3572       if(vps->getNumBitstreamPartitions(h)==1)
    3573       {
    3574         Int chkPartition1=0; Int chkPartition2=0;
    3575         for( j = 0; j <= (vps->getMaxLayers()-1); j++ )
    3576         {
    3577           if( vps->getLayerIdIncludedFlag(h, j) )
    3578           {
    3579             chkPartition1+=vps->getLayerInBspFlag(h, 0, j);
    3580             chkPartition2++;
    3581           }
    3582         }
    3583         assert(chkPartition1!=chkPartition2);
    3584       }
    3585 #endif
    3586       if (vps->getNumBitstreamPartitions(h))
    3587       {
    3588 #if Q0182_MULTI_LAYER_HRD_UPDATE
    3589         READ_UVLC( uiCode, "num_bsp_sched_combinations_minus1[h]"); vps->setNumBspSchedCombinations(h, uiCode + 1);
    3590 #else
    3591         READ_UVLC( uiCode, "num_bsp_sched_combinations[h]"); vps->setNumBspSchedCombinations(h, uiCode);
    3592 #endif
    3593         for( i = 0; i < vps->getNumBspSchedCombinations(h); i++ )
    3594         {
    3595           for( j = 0; j < vps->getNumBitstreamPartitions(h); j++ )
    3596           {
    3597             READ_UVLC( uiCode, "bsp_comb_hrd_idx[h][i][j]"); vps->setBspCombHrdIdx(h, i, j, uiCode);
    3598 #if HRD_BPB
    3599             assert(uiCode <= vps->getVpsNumBspHrdParametersMinus1());
    3600 #endif
    3601 
    3602             READ_UVLC( uiCode, "bsp_comb_sched_idx[h][i][j]"); vps->setBspCombSchedIdx(h, i, j, uiCode);
    3603 #if HRD_BPB
    3604             assert(uiCode <= vps->getBspHrdParamBufferCpbCntMinus1(uiCode,vps->getMaxTLayers()-1));
    3605 #endif
    3606           }
    3607         }
    3608       }
    3609     }
    3610 #endif
    36113535  }
    36123536#endif
    … …  
    36353559  assert( uiCode == 0 );
    36363560}
    3637 #endif
    36383561
    36393562#if Q0048_CGS_3D_ASYMLUT
    … …  
    38463769}
    38473770#endif
    3848 #if VPS_VUI_BSP_HRD_PARAMS
     3771#endif
     3772
    38493773Void TDecCavlc::parseVpsVuiBspHrdParams( TComVPS *vps )
    38503774{
    … …  
    38683792      }
    38693793    }
     3794
    38703795    READ_UVLC( uiCode, "num_sub_layer_hrd_minus1[i]" ); vps->setNumSubLayerHrdMinus1(j, uiCode );
    38713796    assert( uiCode <= vps->getMaxTLayers() - 1 );
    38723797   
    38733798    parseHrdParameters( vps->getBspHrd(j), vps->getCprmsAddPresentFlag(j), vps->getNumSubLayerHrdMinus1(j) );
     3799
    38743800    if( i > 0 && !vps->getCprmsAddPresentFlag(i) )
    38753801    {
    … …  
    38853811    }
    38863812  }
     3813
    38873814  if( vps->getNumHrdParameters() + vps->getVpsNumAddHrdParams() > 0 )
    38883815  {
    … …  
    38913818      Int lsIdx = vps->getOutputLayerSetIdx(h);
    38923819      READ_UVLC(uiCode, "num_signalled_partitioning_schemes[h]"); vps->setNumSignalledPartitioningSchemes(h, uiCode);
     3820
    38933821      for (Int j = 1; j < vps->getNumSignalledPartitioningSchemes(h) + 1; j++)
    38943822      {
    38953823        READ_UVLC(uiCode, "num_partitions_in_scheme_minus1[h][j]"); vps->setNumPartitionsInSchemeMinus1(h, j, uiCode);
    3896         for (Int k = 0; k <= vps->getNumPartitionsInSchemeMinus1(h, j); k++)
    3897         {
    3898           for (Int r = 0; r < vps->getNumLayersInIdList(lsIdx); r++)
     3824
     3825        for( Int k = 0; k <= vps->getNumPartitionsInSchemeMinus1(h, j); k++ )
     3826        {
     3827          for( Int r = 0; r < vps->getNumLayersInIdList(lsIdx); r++ )
    38993828          {
    39003829            READ_FLAG(uiCode, "layer_included_in_partition_flag[h][j][k][r]"); vps->setLayerIncludedInPartitionFlag(h, j, k, r, uiCode ? true : false);
    … …  
    39023831        }
    39033832      }
    3904       for (Int i = 0; i < vps->getNumSignalledPartitioningSchemes(h) + 1; i++)
    3905       {
    3906         for (Int t = 0; t <= vps->getMaxSLayersInLayerSetMinus1(lsIdx); t++)
     3833
     3834      for( Int i = 0; i < vps->getNumSignalledPartitioningSchemes(h) + 1; i++ )
     3835      {
     3836        for( Int t = 0; t <= vps->getMaxSLayersInLayerSetMinus1(lsIdx); t++ )
    39073837        {
    39083838          READ_UVLC(uiCode, "num_bsp_schedules_minus1[h][i][t]");              vps->setNumBspSchedulesMinus1(h, i, t, uiCode);
    3909           for (Int j = 0; j <= vps->getNumBspSchedulesMinus1(h, i, t); j++)
     3839
     3840          for( Int j = 0; j <= vps->getNumBspSchedulesMinus1(h, i, t); j++)
    39103841          {
    39113842            for( Int k = 0; k <= vps->getNumPartitionsInSchemeMinus1(h, i); k++ )
    … …  
    39143845              {
    39153846                Int numBits = 1;
    3916                 while ((1 << numBits) < (vps->getNumHrdParameters() + vps->getVpsNumAddHrdParams()))
     3847
     3848                while( (1 << numBits) < (vps->getNumHrdParameters() + vps->getVpsNumAddHrdParams()) )
    39173849                {
    39183850                  numBits++;
    39193851                }
     3852
    39203853                READ_CODE(numBits, uiCode, "bsp_comb_hrd_idx[h][i][t][j][k]");      vps->setBspHrdIdx(h, i, t, j, k, uiCode);
    39213854              }
     3855
    39223856              READ_UVLC(uiCode, "bsp_comb_sched_idx[h][i][t][j][k]");    vps->setBspSchedIdx(h, i, t, j, k, uiCode);
    39233857            }
    … …  
    39323866  }
    39333867}
    3934 #endif
    3935 #endif
     3868#endif //SVC_EXTENSION
    39363869//! \}
    39373870

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

    r1145 r1185  
    138138  Void  parseVpsDpbSizeTable( TComVPS *vps );
    139139#endif
    140 #if VPS_VUI_BSP_HRD_PARAMS
    141140  Void  parseVpsVuiBspHrdParams( TComVPS *vps );
    142 #endif
    143141  Void  parseSPSExtension    ( TComSPS* pcSPS );
    144142#if Q0048_CGS_3D_ASYMLUT
Note: See TracChangeset for help on using the changeset viewer.