Ignore:
Timestamp:
2 Jul 2014, 18:11:25 (10 years ago)
Author:
tech
Message:

Update to HM-14.0

Integration of:

#define H_MV_HLS_8_SYN_Q0041_03 1 #3 Syntax only (HS /Q0041/hybrid scalability) The proposed text was endorsed, with non-editorial open issues considered as follows …: #define H_MV_HLS_7_OTHER_P0187_1 0 (OTHER/P0187/NoOutputOfPriorPicsFlag) #1 Inference of NoOutputOfPriorPicsFlag and proposes to take into account colour format and bit depth for the inference in addition to spatial resolution
#define H_MV_HLS_8_SYN_39_19 1 #39 Syntax only + (PS/Q0165,Q0078/presence of num_add_output_layer_sets) proposal 2. change condition for presence of num_add_output_layer_sets to avoid sending it when there is only one layer set.
#define H_MV_HLS_8_HRD_Q0101_04 1 #4 (HRD /Q0101/Bitstream part buffer) On Bitstream Partition Buffer. Decision (BF/Cleanup): Adopt (sub-proposals 1–11, refined as described).
#define H_MV_HLS_8_PPS_NODOC_NN 1 #NN (PPS /NODOC/reserved flag): Add a flag in PPS for SHVC color gamut scalability
#define H_MV_HLS_8_MIS_Q0177_47 1 #47 (MISC /Q0177/EOS NAL) proposal 2: clarification of description of end of sequence NAL unit
#define H_MV_HLS_8_HRD_Q0182_05 1 #5 (HRD /Q0182/Bitstream part buffer) Decision (BF/Cleanup/Ed): Adopted (such that we use the main proposal for sub-proposal 1, and alternative 1 for sub-proposal 2). + #define H_MV_HLS_8_HRD_Q0182_06 0 #6 (HRD /Q0182/hrd_parameters) Sub-proposal 2 Alternative 1: Clarify that the VPS hrd_parameters( ) syntax structure that applies to the layer set which is associated with the bitstream partition initial arrival time SEI message is used to determine the lengths of the nal_initial_arrival_delay[ i ] and vcl_initial_arrival_delay[ i ] syntax elements. Decision (BF/Cleanup/Ed): Adopted alternative 1 for sub-proposal 2
#define H_MV_HLS_8_SPS_NODOC_48 1 #48 (SPS /NODOC/PPS extension cleanups) Alignment with RExt
#define H_MV_HLS_8_DBP_NODOC_42 1 #42 (DBP /NODOC/sharing) Remove sub-DPB sharing and processes that mark inter-layer reference pictures as "unused for reference"
#define H_MV_HLS_8_RPS_Q0100_36 1 #36 (RPS /Q0100/constraint to semantics) v3, add constraint to RPS semantics
#define H_MV_HLS_8_POC_Q0142_32 1 #32 (POC /Q0142/poc_lsb_not_present_flag) v2: Add semantic constraints to poc_lsb_not_present_flag.
#define H_MV_HLS_8_HRD_Q0102_08 1 #8 (HRD /Q0102/sps_max_dec_pic_buffering_minus1) Sub-proposal 2: A semantics bug fix is proposed for sps_max_dec_pic_buffering_minus1 as a bug-fix. In discussion, the first option was preferred. Decision (BF/Cleanup/Ed.): Adopt.
#define H_MV_HLS_8_MIS_Q0102_30 1 #30 (MISC /Q0102/loop index) proposal 3, change the max loop index for signaling bit rate and pic rate info to MaxSubLayersInLayerSetMinus1
#define H_MV_HLS_8_GEN_Q0108_13 1 #13 (GEN /Q0108/STSA TemporalId) Agreed to remove restriction from proposal 2, to allow STSA pics of non-base layers to have TemporalId equal to 0.
#define H_MV_HLS_8_PMS_Q0195_21 1 #21 (PS /Q0195/constraint update_ref_format_flag) proposal 2: add a semantic constraint on the value of update_ref_format_flag
#define H_MV_HLS_8_PMS_Q0195_20 1 #20 (PS /Q0195/syntax table rep format) proposal 1: restructure syntax table for sending of rep_format_idx_present_flag and vps_num_ref_formats_minus1
#define H_MV_HLS_8_MIS_Q0177_22 1 #22 (MISC /Q0177/inference sps_temporal_id_nesting_flag) proposal 1: modify inference rule for sps_temporal_id_nesting_flag when it is not present
#define H_MV_HLS_8_PMS_Q0165_18 1 #18 (PS /Q0165/disallow an empty layer set) proposal 1.a), add a constraint to disallow an empty layer set
#define H_MV_HLS_8_RPS_Q0060_17 1 #17 (RPS /Q0060/condition refLayerPicIdc) Proposal 2: Add a condition to the derivation of refLayerPicIdc of (TemporalId == 0)
#define H_MV_HLS_8_POC_Q0146_15 1 #15 (POC /Q0146/inference of poc_msb_val_present_flag) Proposal 1.1: Change inference rule in semantics of poc_msb_val_present_flag

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-11.0-dev0/source/App/TAppEncoder/TAppEncTop.cpp

    r950 r962  
    5757TAppEncTop::TAppEncTop()
    5858{
     59
     60#if H_MV_HLS_8
     61  m_vps = new TComVPS;
     62#endif
    5963#if !H_MV
    6064  m_iFrameRcvd = 0;
    … …  
    6670TAppEncTop::~TAppEncTop()
    6771{
     72#if H_MV_HLS_8
     73  if (m_vps)
     74  {
     75   delete m_vps;
     76  };
     77#endif
     78
    6879}
    6980
    … …  
    7182{
    7283#if H_MV
     84#if H_MV_HLS_8
     85  TComVPS& vps = (*m_vps);   
     86#else
    7387  TComVPS& vps = m_vps;   
     88#endif
    7489#else
    7590  TComVPS vps;
    … …  
    409424  m_cTEncTop.setTMISEICameraIsoSpeedIdc                   ( m_cameraIsoSpeedIdc );
    410425  m_cTEncTop.setTMISEICameraIsoSpeedValue                 ( m_cameraIsoSpeedValue );
     426  m_cTEncTop.setTMISEIExposureIndexIdc                    ( m_exposureIndexIdc );
     427  m_cTEncTop.setTMISEIExposureIndexValue                  ( m_exposureIndexValue );
    411428  m_cTEncTop.setTMISEIExposureCompensationValueSignFlag   ( m_exposureCompensationValueSignFlag );
    412429  m_cTEncTop.setTMISEIExposureCompensationValueNumerator  ( m_exposureCompensationValueNumerator );
    … …  
    691708{
    692709#if H_3D
     710#if H_MV_HLS_8
     711  for ( Int viewIndex = 0; viewIndex < m_vps->getNumViews(); viewIndex++ )
     712  {
     713    m_vps->initCamParaVPS( viewIndex, true, m_cCameraData.getCamParsCodedPrecision(),
     714      m_cCameraData.getVaryingCameraParameters(), m_cCameraData.getCodedScale(), m_cCameraData.getCodedOffset() );
     715#else
    693716  for ( Int viewIndex = 0; viewIndex < m_vps.getNumViews(); viewIndex++ )
    694717  {
    695     m_vps.initCamParaVPS( viewIndex, true, m_cCameraData.getCamParsCodedPrecision(),
     718  m_vps.initCamParaVPS( viewIndex, true, m_cCameraData.getCamParsCodedPrecision(),
    696719      m_cCameraData.getVaryingCameraParameters(), m_cCameraData.getCodedScale(), m_cCameraData.getCodedOffset() );
     720#endif
    697721  }
    698722#endif
    … …  
    12751299
    12761300  Int  defaultDirectDependencyType = -1;
     1301#if MV_FIX_DEP_TYPES
     1302  Bool defaultDirectDependencyFlag = false;
     1303#else
    12771304  Bool defaultDirectDependencyFlag = true;
     1305#endif
     1306
    12781307  for( Int depLayer = 1; depLayer < m_numberOfLayers; depLayer++ )
    12791308  {
    … …  
    12931322      {
    12941323        defaultDirectDependencyType = curDirectDependencyType;
     1324#if MV_FIX_DEP_TYPES
     1325        defaultDirectDependencyFlag = true;
     1326#endif
    12951327      }
    12961328     
    … …  
    14821514Void TAppEncTop::xSetRepFormat( TComVPS& vps )
    14831515{
     1516#if H_MV_HLS_8_PMS_Q0195_20
     1517  vps.setRepFormatIdxPresentFlag( false );
     1518#else
    14841519  vps.setRepFormatIdxPresentFlag( true );
     1520#endif
    14851521  vps.setVpsNumRepFormatsMinus1 ( 0    );
    14861522
    … …  
    14991535  vps.setRepFormat( 0 , repFormat );
    15001536
     1537#if !H_MV_HLS_8_PMS_Q0195_20
    15011538  for(Int i = 0; i <= vps.getMaxLayersMinus1(); i++ )
    15021539  {
    15031540    vps.setVpsRepFormatIdx( i , 0 );
    15041541  }
     1542#endif
    15051543}
    15061544
    … …  
    15131551  assert ( dpbSize != 0 );
    15141552
     1553#if H_MV_HLS_8_HRD_Q0102_08
     1554  for( Int i = 0; i < vps.getNumOutputLayerSets(); i++ )
     1555#else
    15151556  for( Int i = 1; i < vps.getNumOutputLayerSets(); i++ )
     1557#endif
    15161558  { 
     1559#if H_MV_HLS_8_MIS_Q0102_30
     1560    Int currLsIdx = vps.olsIdxToLsIdx( i );
     1561#endif
    15171562    std::vector<Int> targetDecLayerIdList = vps.getTargetDecLayerIdList( i );
    15181563    Bool subLayerFlagInfoPresentFlag = false;
    15191564
     1565#if H_MV_HLS_8_MIS_Q0102_30
     1566    for( Int j = 0; j  <=  vps.getMaxSubLayersInLayerSetMinus1( currLsIdx ); j++ )
     1567#else
    15201568    for( Int j = 0; j  <=  vps.getMaxSubLayersInLayerSetMinus1( i ); j++ )
     1569#endif
    15211570    {   
    15221571      Bool subLayerDpbInfoPresentFlag = false;
    1523       assert( vps.getNumSubDpbs( vps.getLayerSetIdxForOutputLayerSet( i ) ) == targetDecLayerIdList.size() );
    1524       for( Int k = 0; k < vps.getNumSubDpbs( vps.getLayerSetIdxForOutputLayerSet( i )); k++ )   
     1572#if H_MV_HLS_8_MIS_Q0102_30 || H_MV_HLS_8_DBP_NODOC_42
     1573      assert( vps.getNumLayersInIdList( currLsIdx ) == targetDecLayerIdList.size() );
     1574      for( Int k = 0; k < vps.getNumLayersInIdList( currLsIdx ); k++ )   
     1575#else
     1576      assert( vps.getNumSubDpbs( vps.olsIdxToLsIdx( i ) ) == targetDecLayerIdList.size() );
     1577      for( Int k = 0; k < vps.getNumSubDpbs( vps.olsIdxToLsIdx( i )); k++ )   
     1578#endif
    15251579      {
    15261580        Int layerIdInVps = vps.getLayerIdInVps( targetDecLayerIdList[k] );           
    … …  
    15871641  Int numAddOuputLayerSets = (Int) m_outputLayerSetIdx.size();
    15881642  // Additional output layer sets + profileLevelTierIdx
    1589   vps.setDefaultTargetOutputLayerIdc      ( m_defaultTargetOutputLayerIdc );   
    1590   vps.setNumAddOutputLayerSets            ( numAddOuputLayerSets          );
     1643  vps.setDefaultOutputLayerIdc      ( m_defaultOutputLayerIdc );   
     1644#if H_MV_HLS_8_SYN_39_19
     1645  vps.setNumAddLayerSets            ( 0                             ); 
     1646  vps.setNumAddOlss                 ( numAddOuputLayerSets          );
     1647#else
     1648  vps.setNumAddLayerSets            ( numAddOuputLayerSets          );
     1649#endif
    15911650  vps.initTargetLayerIdLists();
    15921651
    … …  
    15951654    Int addOutLsIdx = olsIdx - m_vpsNumLayerSets;     
    15961655   
    1597     vps.setOutputLayerSetIdxMinus1( olsIdx, ( ( addOutLsIdx < 0 ) ?  olsIdx  : m_outputLayerSetIdx[ addOutLsIdx ] ) - 1 );
    1598 
    1599     std::vector<Int>& layerIdList    = m_layerIdsInSets[ vps.getLayerSetIdxForOutputLayerSet( olsIdx ) ];
    1600 
    1601     if (vps.getDefaultTargetOutputLayerIdc() == 2 || addOutLsIdx >= 0 )
     1656    vps.setLayerSetIdxForOlsMinus1( olsIdx, ( ( addOutLsIdx < 0 ) ?  olsIdx  : m_outputLayerSetIdx[ addOutLsIdx ] ) - 1 );
     1657
     1658    std::vector<Int>& layerIdList    = m_layerIdsInSets[ vps.olsIdxToLsIdx( olsIdx ) ];
     1659
     1660    if (vps.getDefaultOutputLayerIdc() == 2 || addOutLsIdx >= 0 )
    16021661    {
    16031662      for ( Int i = 0; i < layerIdList.size(); i++)
    … …  
    16371696      vps.setProfileLevelTierIdx( olsIdx, m_profileLevelTierIdx[ olsIdx ] );
    16381697    }
    1639 
     1698#if H_MV_HLS_7_VPS_P0300_27
     1699    if ( vps.getNumOutputLayersInOutputLayerSet( olsIdx ) == 1 &&
     1700        vps.getNumDirectRefLayers( vps.getOlsHighestOutputLayerId( olsIdx ) ) )
     1701    {   
     1702      vps.setAltOutputLayerFlag( olsIdx , m_altOutputLayerFlag[ olsIdx ]);
     1703    }
     1704    else
     1705    {
     1706      vps.setAltOutputLayerFlag( olsIdx , false );
     1707      if ( m_altOutputLayerFlag[ olsIdx ] )
     1708      {
     1709        printf( "\nWarning: Ignoring AltOutputLayerFlag for output layer set %d, since more than one output layer or no dependent layers.\n", olsIdx );           
     1710      }
     1711    }
     1712#else
    16401713    vps.setAltOutputLayerFlag( olsIdx , false);     
    1641   }
    1642 
     1714#endif
     1715  }
    16431716}
    16441717
Note: See TracChangeset for help on using the changeset viewer.