Commit e6802485 authored by Taoran Lu's avatar Taoran Lu
Browse files

address comments

parent 5a706517
......@@ -772,7 +772,7 @@ Bool TAppEncCfg::parseCfg( Int argc, TChar* argv[] )
UInt cfg_fviSEIFisheyeNumActiveAreasMinus1=0;
#endif
#if SHUTTER_INTERVAL_SEI_MESSAGE
SMultiValueInput<UInt> cfg_siiSEISubLayerNumUnitsInSI (0, 4294967295, 0, 7);
SMultiValueInput<UInt> cfg_siiSEISubLayerNumUnitsInSI (0, MAX_UINT, 0, 7);
#endif
Int warnUnknowParameter = 0;
po::Options opts;
......@@ -2065,8 +2065,8 @@ Bool TAppEncCfg::parseCfg( Int argc, TChar* argv[] )
#if SHUTTER_INTERVAL_SEI_MESSAGE
if (m_siiSEIEnabled)
{
assert(m_siiSEINumUnitsInShutterInterval >= 0 && m_siiSEINumUnitsInShutterInterval <= 4294967295);
assert(m_siiSEITimeScale >= 0 && m_siiSEITimeScale <= 4294967295);
assert(m_siiSEINumUnitsInShutterInterval >= 0 && m_siiSEINumUnitsInShutterInterval <= MAX_UINT);
assert(m_siiSEITimeScale >= 0 && m_siiSEITimeScale <= MAX_UINT);
assert(m_siiSEIMaxSubLayersMinus1 >=0 && m_siiSEIMaxSubLayersMinus1 <= 6);
if (!m_siiSEIFixedSIwithinCVS)
{
......@@ -2074,7 +2074,7 @@ Bool TAppEncCfg::parseCfg( Int argc, TChar* argv[] )
for (Int i = 0; i <= m_siiSEIMaxSubLayersMinus1; i++)
{
m_siiSEISubLayerNumUnitsInSI[i] = cfg_siiSEISubLayerNumUnitsInSI.values[i];
assert(m_siiSEISubLayerNumUnitsInSI[i] >= 0 && m_siiSEISubLayerNumUnitsInSI[i] <= 4294967295);
assert(m_siiSEISubLayerNumUnitsInSI[i] >= 0 && m_siiSEISubLayerNumUnitsInSI[i] <= MAX_UINT);
}
}
}
......
......@@ -457,7 +457,7 @@ Void TAppEncTop::xInitLibCfg()
m_cTEncTop.setFilmGrainCharactersticsSEISepColourDescPresent (m_fgcSEISepColourDescPresentFlag);
m_cTEncTop.setFilmGrainCharactersticsSEIBlendingModeID ((UChar)m_fgcSEIBlendingModeID);
m_cTEncTop.setFilmGrainCharactersticsSEILog2ScaleFactor ((UChar)m_fgcSEILog2ScaleFactor);
for (int i = 0; i < MAX_NUM_COMPONENT; i++) {
for (Int i = 0; i < MAX_NUM_COMPONENT; i++) {
m_cTEncTop.setFGCSEICompModelPresent (m_fgcSEICompModelPresent[i], i);
}
// content light level
......
......@@ -1589,7 +1589,7 @@ Void SEIReader::xParseSEIShutterInterval(SEIShutterIntervalInfo& sei, UInt paylo
sei_read_code(pDecodedMessageOutputStream, 32, val, "sii_num_units_in_shutter_interval"); sei.m_siiNumUnitsInShutterInterval = val;
sei_read_code(pDecodedMessageOutputStream, 32, val, "sii_time_scale"); sei.m_siiTimeScale = val;
sei_read_code(pDecodedMessageOutputStream, 3, val, "sii_max_sub_layers_minus1 "); sei.m_siiMaxSubLayersMinus1 = val;
sei_read_flag(pDecodedMessageOutputStream, val, "fixed_shutter_interval_within_cvs_flag"); sei.m_siiFixedSIwithinCVS = val;
sei_read_flag(pDecodedMessageOutputStream, val, "fixed_shutter_interval_within_clvs_flag"); sei.m_siiFixedSIwithinCVS = val;
if (!sei.m_siiFixedSIwithinCVS)
{
sei.m_siiSubLayerNumUnitsInSI.resize(sei.m_siiMaxSubLayersMinus1 + 1);
......
......@@ -1151,7 +1151,7 @@ Void SEIWriter::xWriteSEIShutterInterval(const SEIShutterIntervalInfo &sei)
WRITE_CODE(sei.m_siiNumUnitsInShutterInterval, 32, "sii_num_units_in_shutter_interval");
WRITE_CODE(sei.m_siiTimeScale, 32, "sii_time_scale");
WRITE_CODE(sei.m_siiMaxSubLayersMinus1, 3, "sii_max_sub_layers_minus1");
WRITE_FLAG(sei.m_siiFixedSIwithinCVS, "fixed_shutter_interval_within_cvs_flag");
WRITE_FLAG(sei.m_siiFixedSIwithinCVS, "fixed_shutter_interval_within_clvs_flag");
if (!sei.m_siiFixedSIwithinCVS)
{
for (UInt i = 0; i <= sei.m_siiMaxSubLayersMinus1; i++)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment