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


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

macro cleanup: VPS_VUI_BSP_HRD_PARAMS, R0227_VUI_BSP_HRD_FLAG

Location:
branches/SHM-dev/source
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp

    r1182 r1185  
    15951595  vps->setHigherLayerIrapSkipFlag(m_skipPictureAtArcSwitch);
    15961596
    1597   for (Int k = 0; k < MAX_VPS_LAYER_SETS_PLUS1; k++)
     1597  for( Int k = 0; k < MAX_VPS_LAYER_SETS_PLUS1; k++ )
    15981598  {
    15991599    vps->setAltOuputLayerFlag( k, m_altOutputLayerFlag );
    16001600  }
    16011601
    1602 #if VPS_VUI_BSP_HRD_PARAMS
     1602  // VPS VUI BSP HRD parameters
    16031603  vps->setVpsVuiBspHrdPresentFlag(false);
    16041604  TEncTop *pcCfg = &m_acTEncTop[0];
    … …  
    16401640
    16411641    // Signalling of additional partitioning schemes
    1642     for(Int h = 1; h < vps->getNumOutputLayerSets(); h++)
     1642    for( Int h = 1; h < vps->getNumOutputLayerSets(); h++ )
    16431643    {
    16441644      Int lsIdx = vps->getOutputLayerSetIdx( h );
    … …  
    16781678    }
    16791679  }
    1680 #else
    1681 
    1682 #if O0164_MULTI_LAYER_HRD
    1683   vps->setVpsVuiBspHrdPresentFlag(false);
    1684   TEncTop *pcCfg = &m_acTEncTop[0];
    1685   if( pcCfg->getBufferingPeriodSEIEnabled() )
    1686   {
    1687     vps->setVpsVuiBspHrdPresentFlag(true);
    1688     vps->setVpsNumBspHrdParametersMinus1(vps->getVpsNumLayerSetsMinus1() - 1);
    1689     vps->createBspHrdParamBuffer(vps->getVpsNumBspHrdParametersMinus1() + 1);
    1690     for ( i = 0; i <= vps->getVpsNumBspHrdParametersMinus1(); i++ )
    1691     {
    1692       vps->setBspCprmsPresentFlag(i, true);
    1693 
    1694       UInt layerId = i + 1;
    1695       TEncTop *pcCfgLayer = &m_acTEncTop[layerId];
    1696 
    1697       Int iPicWidth         = pcCfgLayer->getSourceWidth();
    1698       Int iPicHeight        = pcCfgLayer->getSourceHeight();
    1699 #if LAYER_CTB
    1700       UInt uiWidthInCU       = ( iPicWidth  % m_acLayerCfg[layerId].m_uiMaxCUWidth  ) ? iPicWidth  / m_acLayerCfg[layerId].m_uiMaxCUWidth  + 1 : iPicWidth  / m_acLayerCfg[layerId].m_uiMaxCUWidth;
    1701       UInt uiHeightInCU      = ( iPicHeight % m_acLayerCfg[layerId].m_uiMaxCUHeight ) ? iPicHeight / m_acLayerCfg[layerId].m_uiMaxCUHeight + 1 : iPicHeight / m_acLayerCfg[layerId].m_uiMaxCUHeight;
    1702 #else
    1703       UInt uiWidthInCU       = ( iPicWidth %m_uiMaxCUWidth  ) ? iPicWidth /m_uiMaxCUWidth  + 1 : iPicWidth /m_uiMaxCUWidth;
    1704       UInt uiHeightInCU      = ( iPicHeight%m_uiMaxCUHeight ) ? iPicHeight/m_uiMaxCUHeight + 1 : iPicHeight/m_uiMaxCUHeight;
    1705 #endif
    1706       UInt uiNumCUsInFrame   = uiWidthInCU * uiHeightInCU;
    1707 
    1708 #if LAYER_CTB
    1709       UInt maxCU = pcCfgLayer->getSliceArgument() >> ( m_acLayerCfg[layerId].m_uiMaxCUDepth << 1);
    1710 #else
    1711       UInt maxCU = pcCfgLayer->getSliceArgument() >> ( m_uiMaxCUDepth << 1);
    1712 #endif
    1713       UInt numDU = ( pcCfgLayer->getSliceMode() == 1 ) ? ( uiNumCUsInFrame / maxCU ) : ( 0 );
    1714       if( uiNumCUsInFrame % maxCU != 0 || numDU == 0 )
    1715       {
    1716         numDU ++;
    1717       }
    1718       vps->getBspHrd(i)->setNumDU( numDU );
    1719       vps->setBspHrdParameters( i, pcCfgLayer->getFrameRate(), numDU, pcCfgLayer->getTargetBitrate(), ( pcCfgLayer->getIntraPeriod() > 0 ) );
    1720     }
    1721     for (UInt h = 1; h <= vps->getVpsNumLayerSetsMinus1(); h++)
    1722     {
    1723       vps->setNumBitstreamPartitions(h, 1);
    1724       for( i = 0; i < vps->getNumBitstreamPartitions(h); i++ )
    1725       {
    1726         for( UInt j = 0; j <= (vps->getMaxLayers()-1); j++ )
    1727         {
    1728           if (vps->getLayerIdIncludedFlag(h, j) && h == j)
    1729           {
    1730             vps->setLayerInBspFlag(h, i, j, true);
    1731           }
    1732         }
    1733       }
    1734       vps->setNumBspSchedCombinations(h, 1);
    1735       for( i = 0; i < vps->getNumBspSchedCombinations(h); i++ )
    1736       {
    1737         for( UInt j = 0; j < vps->getNumBitstreamPartitions(h); j++ )
    1738         {
    1739           vps->setBspCombHrdIdx(h, i, j, 0);
    1740           vps->setBspCombSchedIdx(h, i, j, 0);
    1741         }
    1742       }
    1743     }
    1744   }
    1745 #endif
    1746 #endif
    1747 
    17481680#else //SVC_EXTENSION
    17491681  m_cTEncTop.init(isFieldCoding);

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

    r1172 r1185  
    848848  Bool  m_callerOwnsSEIs;
    849849  SEIMessages m_nestedSEIs;
    850 #if VPS_VUI_BSP_HRD_PARAMS
    851850  Int  m_seiPartitioningSchemeIdx;
    852851  Int  m_seiOlsIdx;
    853 #endif
    854852};
    855853

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

    r1182 r1185  
    395395  Bool getCpbDpbDelaysPresentFlag() { return getNalHrdParametersPresentFlag() || getVclHrdParametersPresentFlag(); }
    396396
    397 #if VPS_VUI_BSP_HRD_PARAMS
     397#if SVC_EXTENSION
    398398Void copyCommonInformation( TComHRD *refHrd )
    399399{
    … …  
    725725#if O0164_MULTI_LAYER_HRD
    726726  Bool       m_vpsVuiBspHrdPresentFlag;
    727 #if VPS_VUI_BSP_HRD_PARAMS
    728727  Int                 m_vpsNumAddHrdParams;
    729728  std::vector<Bool>   m_cprmsAddPresentFlag;
    … …  
    736735  Int    m_bspHrdIdx                      [MAX_VPS_OUTPUT_LAYER_SETS_PLUS1][16][MAX_TLAYER][31][MAX_LAYERS];
    737736  Int    m_bspSchedIdx                    [MAX_VPS_OUTPUT_LAYER_SETS_PLUS1][16][MAX_TLAYER][31][MAX_LAYERS];
    738 #else
    739   UInt       m_vpsNumBspHrdParametersMinus1;
    740   Bool       m_bspCprmsPresentFlag[MAX_VPS_LAYER_SETS_PLUS1];
    741   TComHRD    *m_bspHrd;
    742   UInt       m_numBitstreamPartitions[MAX_VPS_LAYER_SETS_PLUS1];
    743   Bool       m_layerInBspFlag[MAX_VPS_LAYER_SETS_PLUS1][8][MAX_LAYERS];
    744   UInt       m_numBspSchedCombinations[MAX_VPS_LAYER_SETS_PLUS1];
    745   UInt       m_bspCombHrdIdx[MAX_VPS_LAYER_SETS_PLUS1][16][16];
    746   UInt       m_bspCombSchedIdx[MAX_VPS_LAYER_SETS_PLUS1][16][16];
    747 #endif
    748737#endif
    749738  UInt       m_baseLayerPSCompatibilityFlag[MAX_LAYERS];
    … …  
    822811  Void    createBspHrdParamBuffer(UInt numHrds)
    823812  {
    824 #if VPS_VUI_BSP_HRD_PARAMS
    825813    m_bspHrd.resize( numHrds );
    826814    m_cprmsAddPresentFlag.resize( numHrds );
    827815    m_numSubLayerHrdMinus1.resize( numHrds );
    828 #else
    829     m_bspHrd    = new TComHRD[ numHrds ];
    830 #endif
    831 //    m_hrdOpSetIdx      = new UInt   [ getNumHrdParameters() ];
    832 //    m_cprmsPresentFlag = new Bool   [ getNumHrdParameters() ];
    833816  }
    834817#endif
    … …  
    836819  Int getBspHrdParamBufferCpbCntMinus1(UInt i, UInt sl)
    837820  {
    838 #if VPS_VUI_BSP_HRD_PARAMS
    839821    return m_bspHrd[i].getCpbCntMinus1(sl);
    840 #else
    841     return m_bspHrd->getCpbCntMinus1(sl);
    842 #endif
    843822  }
    844823#endif
    … …  
    10581037  Void   setAvgPicRate(Int i, Int j, Int x)   { m_avgPicRate[i][j] = x;    }
    10591038#if O0164_MULTI_LAYER_HRD
    1060   Bool     getVpsVuiBspHrdPresentFlag()                         { return m_vpsVuiBspHrdPresentFlag;      }
    1061   Void     setVpsVuiBspHrdPresentFlag(Bool x)                   { m_vpsVuiBspHrdPresentFlag = x;         }
    1062 #if VPS_VUI_BSP_HRD_PARAMS
    1063   Int      getVpsNumAddHrdParams()                              { return m_vpsNumAddHrdParams; }
    1064   Void     setVpsNumAddHrdParams(Int  i)                   { m_vpsNumAddHrdParams = i;    }
    1065 
    1066   Bool     getCprmsAddPresentFlag(Int i)                        { return m_cprmsAddPresentFlag[i];       }
    1067   Void     setCprmsAddPresentFlag(Int  i, Bool  val)  { m_cprmsAddPresentFlag[i] = val;        }
    1068 
    1069   Int      getNumSubLayerHrdMinus1(Int i)           { return m_numSubLayerHrdMinus1[i]; }
    1070   Void     setNumSubLayerHrdMinus1(Int i, Int val)  { m_numSubLayerHrdMinus1[i] = val; }
     1039  Bool     getVpsVuiBspHrdPresentFlag()                                         { return m_vpsVuiBspHrdPresentFlag;      }
     1040  Void     setVpsVuiBspHrdPresentFlag(Bool x)                                   { m_vpsVuiBspHrdPresentFlag = x;         }
     1041  Int      getVpsNumAddHrdParams()                                              { return m_vpsNumAddHrdParams; }
     1042  Void     setVpsNumAddHrdParams(Int  i)                                        { m_vpsNumAddHrdParams = i;    }
     1043
     1044  Bool     getCprmsAddPresentFlag(Int i)                                        { return m_cprmsAddPresentFlag[i];       }
     1045  Void     setCprmsAddPresentFlag(Int  i, Bool  val)                            { m_cprmsAddPresentFlag[i] = val;        }
     1046
     1047  Int      getNumSubLayerHrdMinus1(Int i)                                       { return m_numSubLayerHrdMinus1[i]; }
     1048  Void     setNumSubLayerHrdMinus1(Int i, Int val)                              { m_numSubLayerHrdMinus1[i] = val;  }
    10711049
    10721050  TComHRD*  getBspHrd(Int i)           {return &m_bspHrd[i];}
    10731051
    1074   Int      getNumSignalledPartitioningSchemes(Int  i)                    { return m_numSignalledPartitioningSchemes[i];    }
    1075   Void     setNumSignalledPartitioningSchemes(Int  i, Int  val)          { m_numSignalledPartitioningSchemes[i] = val;     }
    1076 
    1077   Int      getNumPartitionsInSchemeMinus1(Int  i, Int j)  { return m_numPartitionsInSchemeMinus1[i][j];}
    1078   Void     setNumPartitionsInSchemeMinus1(Int i, Int j, Int val) { m_numPartitionsInSchemeMinus1[i][j] = val; }
    1079 
    1080   Int      getLayerIncludedInPartitionFlag(Int  i, Int j, Int k, Int l)  { return m_layerIncludedInPartitionFlag[i][j][k][l];}
     1052  Int      getNumSignalledPartitioningSchemes(Int  i)                           { return m_numSignalledPartitioningSchemes[i];    }
     1053  Void     setNumSignalledPartitioningSchemes(Int  i, Int  val)                 { m_numSignalledPartitioningSchemes[i] = val;     }
     1054
     1055  Int      getNumPartitionsInSchemeMinus1(Int  i, Int j)                        { return m_numPartitionsInSchemeMinus1[i][j];}
     1056  Void     setNumPartitionsInSchemeMinus1(Int i, Int j, Int val)                { m_numPartitionsInSchemeMinus1[i][j] = val; }
     1057
     1058  Int      getLayerIncludedInPartitionFlag(Int  i, Int j, Int k, Int l)         { return m_layerIncludedInPartitionFlag[i][j][k][l];}
    10811059  Void     setLayerIncludedInPartitionFlag(Int i, Int j, Int k, Int l, Int val) { m_layerIncludedInPartitionFlag[i][j][k][l] = val; }
    10821060
    1083   Int      getNumBspSchedulesMinus1(Int  i, Int j, Int k)         { return m_numBspSchedulesMinus1[i][j][k];}
    1084   Void     setNumBspSchedulesMinus1(Int i, Int j, Int k, Int val) { m_numBspSchedulesMinus1[i][j][k] = val; }
    1085 
    1086   Int      getBspSchedIdx(Int  i, Int j, Int k, Int l, Int m)  { return m_bspSchedIdx[i][j][k][l][m];}
    1087   Void     setBspSchedIdx(Int  i, Int j, Int k, Int l, Int m, Int val) { m_bspSchedIdx[i][j][k][l][m] = val; }
    1088 
    1089   Int      getBspHrdIdx(Int  i, Int j, Int k, Int l, Int m)  { return m_bspHrdIdx[i][j][k][l][m];}
    1090   Void     setBspHrdIdx(Int  i, Int j, Int k, Int l, Int m, Int val) { m_bspHrdIdx[i][j][k][l][m] = val; }
    1091 #else
    1092   UInt     getVpsNumBspHrdParametersMinus1()                    { return m_vpsNumBspHrdParametersMinus1; }
    1093   Void     setVpsNumBspHrdParametersMinus1(UInt i)              { m_vpsNumBspHrdParametersMinus1 = i;    }
    1094   Bool     getBspCprmsPresentFlag(UInt i)                       { return m_bspCprmsPresentFlag[i];       }
    1095   Void     setBspCprmsPresentFlag(UInt i, Bool val)             { m_bspCprmsPresentFlag[i] = val;        }
    1096   TComHRD* getBspHrd(UInt i)                                    { return &m_bspHrd[i];                    }
    1097   UInt     getNumBitstreamPartitions(UInt i)                    { return m_numBitstreamPartitions[i];    }
    1098   Void     setNumBitstreamPartitions(UInt i, UInt val)          { m_numBitstreamPartitions[i] = val;     }
    1099   UInt     getLayerInBspFlag(UInt h, UInt i, UInt j)            { return m_layerInBspFlag[h][i][j];      }
    1100   Void     setLayerInBspFlag(UInt h, UInt i, UInt j, UInt val)  { m_layerInBspFlag[h][i][j] = val;       }
    1101   UInt     getNumBspSchedCombinations(UInt i)                   { return m_numBspSchedCombinations[i];   }
    1102   Void     setNumBspSchedCombinations(UInt i, UInt val)         { m_numBspSchedCombinations[i] = val;    }
    1103   UInt     getBspCombHrdIdx(UInt h, UInt i, UInt j)             { return m_bspCombHrdIdx[h][i][j];       }
    1104   Void     setBspCombHrdIdx(UInt h, UInt i, UInt j, UInt val)   { m_bspCombHrdIdx[h][i][j] = val;        }
    1105   UInt     getBspCombSchedIdx(UInt h, UInt i, UInt j)           { return m_bspCombSchedIdx[h][i][j];     }
    1106   Void     setBspCombSchedIdx(UInt h, UInt i, UInt j, UInt val) { m_bspCombSchedIdx[h][i][j] = val;      }
    1107 #endif
     1061  Int      getNumBspSchedulesMinus1(Int  i, Int j, Int k)                       { return m_numBspSchedulesMinus1[i][j][k];}
     1062  Void     setNumBspSchedulesMinus1(Int i, Int j, Int k, Int val)               { m_numBspSchedulesMinus1[i][j][k] = val; }
     1063
     1064  Int      getBspSchedIdx(Int  i, Int j, Int k, Int l, Int m)                   { return m_bspSchedIdx[i][j][k][l][m];}
     1065  Void     setBspSchedIdx(Int  i, Int j, Int k, Int l, Int m, Int val)          { m_bspSchedIdx[i][j][k][l][m] = val; }
     1066
     1067  Int      getBspHrdIdx(Int  i, Int j, Int k, Int l, Int m)                     { return m_bspHrdIdx[i][j][k][l][m];}
     1068  Void     setBspHrdIdx(Int  i, Int j, Int k, Int l, Int m, Int val)            { m_bspHrdIdx[i][j][k][l][m] = val; }
    11081069#endif
    11091070  Void   setBaseLayerPSCompatibilityFlag (Int layer, int val)   { m_baseLayerPSCompatibilityFlag[layer] = val; }

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

    r1184 r1185  
    5151
    5252#define BSP_INIT_ARRIVAL_SEI             1      ///< JCTVC-R0231: Make signalling of vcl_initial_arrival_delay independent of NalHrdBpPresentFlag
    53 #define VPS_VUI_BSP_HRD_PARAMS           1      ///< JCTVC-R0231: Define the VPS VUI BSP hrd_params() as a separate function, and apply changes adopted.
    5453
    5554#define R0226_SLICE_TMVP                 1      ///< JCTVC-R0226, Regarding slice_temporal_mvp_enabled_flag
    56 #define R0227_VUI_BSP_HRD_FLAG           1      ///< JCTVC-R0227, Conformance checking such that VPS VUI HRD only present if VPS timing info is signalled
    5755
    5856#define Q0108_TSA_STSA                   1      ///< JCTVC-Q0108, Remove cross-layer alignment constraints of TSA and STSA pictures, enable to have different prediction structures in different layers

  • 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

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

    r1134 r1185  
    5555
    5656#if O0164_MULTI_LAYER_HRD
    57 #if VPS_VUI_BSP_HRD_PARAMS
    5857Void SEIWriter::xWriteSEIpayloadData(TComBitIf& bs, const SEI& sei, TComVPS *vps, TComSPS *sps, const SEIScalableNesting* nestingSeiPtr, const SEIBspNesting* bspNestingSeiPtr)
    5958#else
    60 Void SEIWriter::xWriteSEIpayloadData(TComBitIf& bs, const SEI& sei, TComVPS *vps, TComSPS *sps, const SEIScalableNesting& nestingSei, const SEIBspNesting& bspNestingSei)
    61 #endif
    62 #else
    6359Void SEIWriter::xWriteSEIpayloadData(TComBitIf& bs, const SEI& sei, TComSPS *sps)
    6460#endif
    6561{
    66 #if VPS_VUI_BSP_HRD_PARAMS
     62#if SVC_EXTENSION
    6763  SEIScalableNesting nestingSei;
    6864  SEIBspNesting      bspNestingSei;
    … …  
    8783    xWriteSEIDecodedPictureHash(*static_cast<const SEIDecodedPictureHash*>(&sei));
    8884    break;
    89 #if VPS_VUI_BSP_HRD_PARAMS
     85#if SVC_EXTENSION
    9086  case SEI::DECODING_UNIT_INFO:
    9187    xWriteSEIDecodingUnitInfo(*static_cast<const SEIDecodingUnitInfo*>(& sei), sps, nestingSeiPtr, bspNestingSeiPtr, vps);
    … …  
    236232#endif
    237233#if O0164_MULTI_LAYER_HRD
    238 #if VPS_VUI_BSP_HRD_PARAMS
    239234  xWriteSEIpayloadData(bs_count, sei, vps, sps, nestingSei, bspNestingSei);
    240 #else
    241   xWriteSEIpayloadData(bs_count, sei, vps, sps, *nestingSei, *bspNestingSei);
    242 #endif
    243235#else
    244236  xWriteSEIpayloadData(bs_count, sei, sps);
    … …  
    279271
    280272#if O0164_MULTI_LAYER_HRD
    281 #if VPS_VUI_BSP_HRD_PARAMS
    282273  xWriteSEIpayloadData(bs, sei, vps, sps, nestingSei, bspNestingSei);
    283 #else
    284   xWriteSEIpayloadData(bs, sei, vps, sps, *nestingSei, *bspNestingSei);
    285 #endif
    286274#else
    287275  xWriteSEIpayloadData(bs, sei, sps);
    … …  
    352340}
    353341
    354 #if VPS_VUI_BSP_HRD_PARAMS
     342#if SVC_EXTENSION
    355343Void SEIWriter::xWriteSEIDecodingUnitInfo(const SEIDecodingUnitInfo& sei, TComSPS *sps, const SEIScalableNesting* nestingSei, const SEIBspNesting* bspNestingSei, TComVPS *vps)
    356 #else
    357 Void SEIWriter::xWriteSEIDecodingUnitInfo(const SEIDecodingUnitInfo& sei, TComSPS *sps)
    358 #endif
    359 {
    360 #if VPS_VUI_BSP_HRD_PARAMS
     344{
    361345  TComHRD *hrd;
    362346  if( bspNestingSei )   // If DU info SEI contained inside a BSP nesting SEI message
    … …  
    406390    WRITE_CODE(sei.m_picSptDpbOutputDuDelay, hrd->getDpbOutputDelayDuLengthMinus1() + 1, "pic_spt_dpb_output_du_delay");
    407391  }
     392}
    408393#else
     394Void SEIWriter::xWriteSEIDecodingUnitInfo(const SEIDecodingUnitInfo& sei, TComSPS *sps)
     395{
    409396  TComVUI *vui = sps->getVuiParameters();
    410397  WRITE_UVLC(sei.m_decodingUnitIdx, "decoding_unit_idx");
    … …  
    418405    WRITE_CODE(sei.m_picSptDpbOutputDuDelay, vui->getHrdParameters()->getDpbOutputDelayDuLengthMinus1() + 1, "pic_spt_dpb_output_du_delay");
    419406  }
    420 #endif
    421 }
    422 
    423 #if VPS_VUI_BSP_HRD_PARAMS
     407}
     408#endif
     409
     410#if SVC_EXTENSION
    424411Void SEIWriter::xWriteSEIBufferingPeriod(const SEIBufferingPeriod& sei, TComSPS *sps, const SEIScalableNesting* nestingSei, const SEIBspNesting* bspNestingSei, TComVPS *vps)
    425412#else
    … …  
    428415{
    429416  Int i, nalOrVcl;
    430 #if VPS_VUI_BSP_HRD_PARAMS
     417#if SVC_EXTENSION
    431418  TComHRD *hrd;
    432419  if( bspNestingSei )   // If BP SEI contained inside a BSP nesting SEI message
    … …  
    506493#endif
    507494}
    508 #if VPS_VUI_BSP_HRD_PARAMS
     495
     496#if SVC_EXTENSION
    509497Void SEIWriter::xWriteSEIPictureTiming(const SEIPictureTiming& sei,  TComSPS *sps, const SEIScalableNesting* nestingSei, const SEIBspNesting* bspNestingSei, TComVPS *vps)
    510498#else
    … …  
    513501{
    514502  Int i;
    515 #if VPS_VUI_BSP_HRD_PARAMS
     503#if SVC_EXTENSION
    516504  TComHRD *hrd;   
    517505  TComVUI *vui = sps->getVuiParameters();
    … …  
    11651153  assert(vps->getVpsVuiPresentFlag());
    11661154
    1167 #if VPS_VUI_BSP_HRD_PARAMS
     1155#if SVC_EXTENSION
    11681156  Int psIdx = bspNestingSei.m_seiPartitioningSchemeIdx;
    11691157  Int seiOlsIdx = bspNestingSei.m_seiOlsIdx;

  • branches/SHM-dev/source/Lib/TLibEncoder/SEIwrite.h

    r1098 r1185  
    5858protected:
    5959#if O0164_MULTI_LAYER_HRD
    60 #if VPS_VUI_BSP_HRD_PARAMS
    6160  Void xWriteSEIpayloadData(TComBitIf& bs, const SEI& sei, TComVPS *vps, TComSPS *sps, const SEIScalableNesting* nestingSei, const SEIBspNesting* bspNestingSei);
    62 #else
    63   Void xWriteSEIpayloadData(TComBitIf& bs, const SEI& sei, TComVPS *vps, TComSPS *sps, const SEIScalableNesting& nestingSei, const SEIBspNesting& bspNestingSei);
    64 #endif
    6561#else
    6662  Void xWriteSEIpayloadData(TComBitIf& bs, const SEI& sei, TComSPS *sps);
    … …  
    6965  Void xWriteSEIActiveParameterSets(const SEIActiveParameterSets& sei);
    7066  Void xWriteSEIDecodedPictureHash(const SEIDecodedPictureHash& sei);
    71 #if VPS_VUI_BSP_HRD_PARAMS
     67#if SVC_EXTENSION
    7268  Void xWriteSEIDecodingUnitInfo(const SEIDecodingUnitInfo& sei, TComSPS *sps, const SEIScalableNesting* nestingSei, const SEIBspNesting* bspNestingSei, TComVPS *vps);
    7369  Void xWriteSEIBufferingPeriod(const SEIBufferingPeriod& sei, TComSPS *sps, const SEIScalableNesting* nestingSei, const SEIBspNesting* bspNestingSei, TComVPS *vps);

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

    r1183 r1185  
    24962496
    24972497#if O0164_MULTI_LAYER_HRD
    2498     WRITE_FLAG(vps->getVpsVuiBspHrdPresentFlag(), "vps_vui_bsp_hrd_present_flag" );
    2499     if (vps->getVpsVuiBspHrdPresentFlag())
    2500     {
    2501 #if VPS_VUI_BSP_HRD_PARAMS
    2502       codeVpsVuiBspHrdParams(vps);
    2503 #else
    2504       WRITE_UVLC( vps->getVpsNumBspHrdParametersMinus1(), "vps_num_bsp_hrd_parameters_minus1" );
    2505       for( i = 0; i <= vps->getVpsNumBspHrdParametersMinus1(); i++ )
    2506       {
    2507         if( i > 0 )
    2508         {
    2509           WRITE_FLAG( vps->getBspCprmsPresentFlag(i), "bsp_cprms_present_flag[i]" );
    2510         }
    2511         codeHrdParameters(vps->getBspHrd(i), i==0 ? 1 : vps->getBspCprmsPresentFlag(i), vps->getMaxTLayers()-1);
    2512       }
    2513       for( UInt h = 1; h <= vps->getVpsNumLayerSetsMinus1(); h++ )
    2514       {
    2515         WRITE_UVLC( vps->getNumBitstreamPartitions(h), "num_bitstream_partitions[i]");
    2516         for( i = 0; i < vps->getNumBitstreamPartitions(h); i++ )
    2517         {
    2518           for( j = 0; j <= (vps->getMaxLayers()-1); j++ )
    2519           {
    2520             if (vps->getLayerIdIncludedFlag(h, j))
    2521             {
    2522               WRITE_FLAG( vps->getLayerInBspFlag(h, i, j), "layer_in_bsp_flag[h][i][j]" );
    2523             }
    2524           }
    2525         }
    2526         if (vps->getNumBitstreamPartitions(h))
    2527         {
    2528 #if Q0182_MULTI_LAYER_HRD_UPDATE
    2529           WRITE_UVLC(vps->getNumBspSchedCombinations(h) - 1, "num_bsp_sched_combinations_minus1[h]");
    2530 #else
    2531           WRITE_UVLC( vps->getNumBspSchedCombinations(h), "num_bsp_sched_combinations[h]");
    2532 #endif
    2533           for( i = 0; i < vps->getNumBspSchedCombinations(h); i++ )
    2534           {
    2535             for( j = 0; j < vps->getNumBitstreamPartitions(h); j++ )
    2536             {
    2537               WRITE_UVLC( vps->getBspCombHrdIdx(h, i, j), "bsp_comb_hrd_idx[h][i][j]");
    2538               WRITE_UVLC( vps->getBspCombSchedIdx(h, i, j), "bsp_comb_sched_idx[h][i][j]");
    2539             }
    2540           }
    2541         }
    2542       }
    2543 #endif
    2544     }
    2545 #endif
    2546 
    2547     for( i = 1; i < vps->getMaxLayers(); i++ )
    2548     {
    2549       if( vps->getNumRefLayers(vps->getLayerIdInNuh(i)) == 0 )
    2550       {
    2551         WRITE_FLAG(vps->getBaseLayerPSCompatibilityFlag(i), "base_layer_parameter_set_compatibility_flag" );
    2552       }
    2553     }
     2498  WRITE_FLAG(vps->getVpsVuiBspHrdPresentFlag(), "vps_vui_bsp_hrd_present_flag" );
     2499
     2500  if( vps->getVpsVuiBspHrdPresentFlag() )
     2501  {
     2502    codeVpsVuiBspHrdParams(vps);
     2503  }
     2504#endif
     2505
     2506  for( i = 1; i < vps->getMaxLayers(); i++ )
     2507  {
     2508    if( vps->getNumRefLayers(vps->getLayerIdInNuh(i)) == 0 )
     2509    {
     2510      WRITE_FLAG(vps->getBaseLayerPSCompatibilityFlag(i), "base_layer_parameter_set_compatibility_flag" );
     2511    }
     2512  }
    25542513}
    25552514
    … …  
    25612520  WRITE_FLAG( 0, "inter_view_mv_vert_constraint_flag" );
    25622521}
    2563 #endif //SVC_EXTENSION
    25642522
    25652523#if Q0048_CGS_3D_ASYMLUT
    … …  
    27912749}
    27922750#endif
    2793 #if VPS_VUI_BSP_HRD_PARAMS
     2751#endif
     2752
    27942753Void TEncCavlc::codeVpsVuiBspHrdParams(TComVPS * const vps)
    27952754{
    27962755  WRITE_UVLC( vps->getVpsNumAddHrdParams(), "vps_num_add_hrd_params" );
     2756
    27972757  for( Int i = vps->getNumHrdParameters(), j = 0; i < vps->getNumHrdParameters() + vps->getVpsNumAddHrdParams(); i++, j++ ) // j = i - vps->getNumHrdParameters()
    27982758  {
    … …  
    28012761      WRITE_FLAG( vps->getCprmsAddPresentFlag(j), "cprms_add_present_flag[i]" );
    28022762    }
     2763
    28032764    WRITE_UVLC( vps->getNumSubLayerHrdMinus1(j), "num_sub_layer_hrd_minus1[i]" );
     2765
    28042766    codeHrdParameters(vps->getBspHrd(j), i == 0 ? true : vps->getCprmsAddPresentFlag(j), vps->getNumSubLayerHrdMinus1(j));
    28052767  }
    … …  
    28102772    {
    28112773      Int lsIdx = vps->getOutputLayerSetIdx( h );
     2774
    28122775      WRITE_UVLC( vps->getNumSignalledPartitioningSchemes(h), "num_signalled_partitioning_schemes[h]");
    28132776
    … …  
    28152778      {
    28162779        WRITE_UVLC( vps->getNumPartitionsInSchemeMinus1(h, j), "num_partitions_in_scheme_minus1[h][j]" );
     2780
    28172781        for( Int k = 0; k <= vps->getNumPartitionsInSchemeMinus1(h, j); k++ )
    28182782        {
    … …  
    28322796          for( Int j = 0; j <= vps->getNumBspSchedulesMinus1(h, i, t); j++ )
    28332797          {
    2834             for (Int k = 0; k <= vps->getNumPartitionsInSchemeMinus1(h, i); k++)
     2798            for( Int k = 0; k <= vps->getNumPartitionsInSchemeMinus1(h, i); k++ )
    28352799            {
    2836               if (vps->getNumHrdParameters() + vps->getVpsNumAddHrdParams() > 1)
     2800              if( vps->getNumHrdParameters() + vps->getVpsNumAddHrdParams() > 1 )
    28372801              {
    28382802                Int numBits = 1;
    … …  
    28412805                  numBits++;
    28422806                }
     2807
    28432808                WRITE_CODE(vps->getBspHrdIdx(h, i, t, j, k), numBits, "bsp_comb_hrd_idx[h][i][t][j][k]");
    28442809              }
     2810
    28452811              WRITE_UVLC( vps->getBspSchedIdx(h, i, t, j, k), "bsp_comb_sched_idx[h][i][t][j][k]");
    28462812            }
    … …  
    28512817  }
    28522818}
    2853 #endif
    2854 #endif
     2819
     2820#endif //SVC_EXTENSION
    28552821//! \}

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

    r1029 r1185  
    166166  Void  codeVpsDpbSizeTable    (TComVPS *vps);
    167167#endif
    168 #if VPS_VUI_BSP_HRD_PARAMS
    169168  Void  codeVpsVuiBspHrdParams  (TComVPS * const);
    170 #endif
    171169#if Q0048_CGS_3D_ASYMLUT
    172170#if R0179_ENC_OPT_3DLUT_SIZE

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

    r1181 r1185  
    24482448      {
    24492449        Int j;
    2450 #if VPS_VUI_BSP_HRD_PARAMS
    24512450        TComVPS *vps = m_pcEncTop->getVPS();
    2452         for(Int i = 0; i < vps->getNumOutputLayerSets(); i++)
    2453         {
    2454           for(Int k = 0; k < vps->getNumSignalledPartitioningSchemes(i); k++)
     2451
     2452        for( Int i = 0; i < vps->getNumOutputLayerSets(); i++ )
     2453        {
     2454          for( Int k = 0; k < vps->getNumSignalledPartitioningSchemes(i); k++ )
    24552455          {
    2456             for(Int l = 0; l < vps->getNumPartitionsInSchemeMinus1(i, k)+1; l++)
     2456            for( Int l = 0; l < vps->getNumPartitionsInSchemeMinus1(i, k)+1; l++ )
    24572457            {
    2458 #endif
    24592458              nalu = NALUnit(NAL_UNIT_PREFIX_SEI, 0, 1);
    24602459              m_pcEntropyCoder->setEntropyCoder(m_pcCavlcCoder, pcSlice);
    24612460              m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream);
    2462 #if VPS_VUI_BSP_HRD_PARAMS
    24632461              SEIScalableNesting *scalableBspNestingSei = xCreateBspNestingSEI(pcSlice, i, k, l);
    2464 #else
    2465               SEIScalableNesting *scalableBspNestingSei = xCreateBspNestingSEI(pcSlice);
    2466 #endif
    24672462              m_seiWriter.writeSEImessage(nalu.m_Bitstream, *scalableBspNestingSei, m_pcEncTop->getVPS(), pcSlice->getSPS());
    24682463              writeRBSPTrailingBits(nalu.m_Bitstream);
    … …  
    24732468                + m_pictureTimingSEIPresentInAU
    24742469                + m_nestedPictureTimingSEIPresentInAU;  // Insert SEI after APS, BP and PT SEI
     2470
    24752471              AccessUnit::iterator it;
    2476               for(j = 0, it = accessUnit.begin(); j < seiPositionInAu + offsetPosition; j++)
     2472
     2473              for( j = 0, it = accessUnit.begin(); j < seiPositionInAu + offsetPosition; j++ )
    24772474              {
    24782475                it++;
    24792476              }
     2477
    24802478              accessUnit.insert(it, new NALUnitEBSP(nalu));
    2481 #if VPS_VUI_BSP_HRD_PARAMS
    24822479            }
    24832480          }
    24842481        }
    2485 #endif
    24862482      }
    24872483#endif
    … …  
    49584954
    49594955#if O0164_MULTI_LAYER_HRD
    4960 #if VPS_VUI_BSP_HRD_PARAMS
    49614956SEIScalableNesting* TEncGOP::xCreateBspNestingSEI(TComSlice *pcSlice, Int olsIdx, Int partitioningSchemeIdx, Int bspIdx)
    4962 #else
    4963 SEIScalableNesting* TEncGOP::xCreateBspNestingSEI(TComSlice *pcSlice)
    4964 #endif
    49654957{
    49664958  SEIScalableNesting *seiScalableNesting = new SEIScalableNesting();
    … …  
    49754967  seiScalableNesting->m_defaultOpFlag                 = 0;
    49764968  seiScalableNesting->m_nestingNumOpsMinus1           = 0;      //nesting_num_ops_minus1
    4977 #if VPS_VUI_BSP_HRD_PARAMS
    49784969  seiScalableNesting->m_nestingOpIdx[0]               = pcSlice->getVPS()->getOutputLayerSetIdx(olsIdx);
    49794970  seiScalableNesting->m_nestingMaxTemporalIdPlus1[0]  = 6 + 1;
    4980 #else
    4981   seiScalableNesting->m_nestingOpIdx[0]               = 1;
    4982 #endif
    49834971  seiScalableNesting->m_allLayersFlag                 = 0;
    49844972  seiScalableNesting->m_nestingNoOpMaxTemporalIdPlus1 = 6 + 1;  //nesting_no_op_max_temporal_id_plus1
    … …  
    50265014  seiBspNesting->m_nestedSEIs.push_back(seiBufferingPeriod);
    50275015  seiBspNesting->m_nestedSEIs.push_back(seiBspInitialArrivalTime);
    5028 #if VPS_VUI_BSP_HRD_PARAMS
    50295016  seiBspNesting->m_bspIdx = bspIdx;
    50305017  seiBspNesting->m_seiOlsIdx = olsIdx;
    50315018  seiBspNesting->m_seiPartitioningSchemeIdx = partitioningSchemeIdx;
    5032 #endif
    50335019  seiScalableNesting->m_nestedSEIs.push_back(seiBspNesting); // BSP nesting SEI is contained in scalable nesting SEI
    50345020

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.h

    r1131 r1185  
    282282#endif
    283283#if O0164_MULTI_LAYER_HRD
    284 #if VPS_VUI_BSP_HRD_PARAMS
    285284  SEIScalableNesting* xCreateBspNestingSEI(TComSlice *pcSlice, Int olsIdx, Int partitioningSchemeIdx, Int bspIdx);
    286 #else
    287   SEIScalableNesting* xCreateBspNestingSEI(TComSlice *pcSlice);
    288 #endif
    289285#endif
    290286#if P0123_ALPHA_CHANNEL_SEI

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

    r1182 r1185  
    240240
    241241  // set the VPS profile information
    242 #if VPS_VUI_BSP_HRD_PARAMS
     242#if SVC_EXTENSION
    243243  m_cVPS.getTimingInfo()->setTimingInfoPresentFlag       ( true );
    244244#else
Note: See TracChangeset for help on using the changeset viewer.