Changeset 1413 in 3DVCSoftware for trunk/source/Lib/TLibEncoder/SEIEncoder.cpp


Ignore:
Timestamp:
11 Jul 2018, 15:19:49 (6 years ago)
Author:
tech
Message:

Merged HTM-16.2-dev@1412

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibEncoder/SEIEncoder.cpp

    r1405 r1413  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2016, ITU/ISO/IEC
     6 * Copyright (c) 2010-2017, ITU/ISO/IEC
    77 * All rights reserved.
    88 *
     
    346346  if(pps->getTilesEnabledFlag())
    347347  {
     348#if MCTS_ENC_CHECK
     349    if (m_pcCfg->getTMCTSSEITileConstraint())
     350    {
     351      sei->m_mc_all_tiles_exact_sample_value_match_flag = true;
     352      sei->m_each_tile_one_tile_set_flag = true;
     353      sei->m_limited_tile_set_display_flag = false;
     354      sei->m_max_mcs_tier_level_idc_present_flag = false;
     355      sei->setNumberOfTileSets(0);
     356    }
     357    else
     358    {
     359#endif
    348360    sei->m_mc_all_tiles_exact_sample_value_match_flag = false;
    349361    sei->m_each_tile_one_tile_set_flag                = false;
     
    365377      sei->tileSetData(i).m_mcts_tier_level_idc_present_flag = false;
    366378    }
     379#if MCTS_ENC_CHECK
     380    }
     381#endif
    367382  }
    368383  else
     
    651666  }
    652667}
    653 #if U0033_ALTERNATIVE_TRANSFER_CHARACTERISTICS_SEI
    654668Void SEIEncoder::initSEIAlternativeTransferCharacteristics(SEIAlternativeTransferCharacteristics *seiAltTransCharacteristics)
    655669{
     
    659673  seiAltTransCharacteristics->m_preferredTransferCharacteristics = m_pcCfg->getSEIPreferredTransferCharacteristics();
    660674}
    661 #endif
     675
     676Void SEIEncoder::initSEIGreenMetadataInfo(SEIGreenMetadataInfo *seiGreenMetadataInfo, UInt u)
     677{
     678    assert (m_isInitialized);
     679    assert (seiGreenMetadataInfo!=NULL);
     680
     681    seiGreenMetadataInfo->m_greenMetadataType = m_pcCfg->getSEIGreenMetadataType();
     682    seiGreenMetadataInfo->m_xsdMetricType = m_pcCfg->getSEIXSDMetricType();
     683    seiGreenMetadataInfo->m_xsdMetricValue = u;
     684}
     685
    662686
    663687#if NH_MV
Note: See TracChangeset for help on using the changeset viewer.