From 54eaad8b2bfa9fc67c7cc5ccf9ad46cf9f9206da Mon Sep 17 00:00:00 2001
From: Frank Bossen <fbossen@gmail.com>
Date: Wed, 7 Feb 2024 16:48:33 -0500
Subject: [PATCH] Fix class name
---
.../BitstreamExtractorApp.cpp | 2 +-
source/Lib/CommonLib/SEI.cpp | 2 +-
source/Lib/CommonLib/SEI.h | 21 +++++++++----------
source/Lib/DecoderLib/SEIread.cpp | 7 ++++---
source/Lib/DecoderLib/SEIread.h | 3 ++-
source/Lib/EncoderLib/EncGOP.cpp | 10 +++++----
source/Lib/EncoderLib/SEIEncoder.cpp | 2 +-
source/Lib/EncoderLib/SEIEncoder.h | 2 +-
source/Lib/EncoderLib/SEIwrite.cpp | 15 +++++++------
source/Lib/EncoderLib/SEIwrite.h | 2 +-
10 files changed, 36 insertions(+), 30 deletions(-)
diff --git a/source/App/BitstreamExtractorApp/BitstreamExtractorApp.cpp b/source/App/BitstreamExtractorApp/BitstreamExtractorApp.cpp
index 55ebc94d84..1f056cda29 100644
--- a/source/App/BitstreamExtractorApp/BitstreamExtractorApp.cpp
+++ b/source/App/BitstreamExtractorApp/BitstreamExtractorApp.cpp
@@ -146,7 +146,7 @@ bool BitstreamExtractorApp::xCheckSEIFiller(SEIMessages SEIs, int targetSubPicId
{
if (sei->payloadType() == SEI::PayloadType::SUBPICTURE_LEVEL_INFO)
{
- SEISubpicureLevelInfo *seiSLI = (SEISubpicureLevelInfo *)sei;
+ SEISubpictureLevelInfo* seiSLI = (SEISubpictureLevelInfo*) sei;
if (!seiSLI->m_cbrConstraintFlag)
{
rmAllFillerInSubpicExt = true;
diff --git a/source/Lib/CommonLib/SEI.cpp b/source/Lib/CommonLib/SEI.cpp
index 8c20008150..a4a7579063 100644
--- a/source/Lib/CommonLib/SEI.cpp
+++ b/source/Lib/CommonLib/SEI.cpp
@@ -917,7 +917,7 @@ SEIContentColourVolume::SEIContentColourVolume(const SEIContentColourVolume& sei
m_ccvAvgLuminanceValue = sei.m_ccvAvgLuminanceValue;
}
-SEISubpicureLevelInfo::SEISubpicureLevelInfo(const SEISubpicureLevelInfo& sei)
+SEISubpictureLevelInfo::SEISubpictureLevelInfo(const SEISubpictureLevelInfo& sei)
{
m_numRefLevels = sei.m_numRefLevels;
m_explicitFractionPresentFlag = sei.m_explicitFractionPresentFlag;
diff --git a/source/Lib/CommonLib/SEI.h b/source/Lib/CommonLib/SEI.h
index 22a46ca5b6..88a7fb601b 100644
--- a/source/Lib/CommonLib/SEI.h
+++ b/source/Lib/CommonLib/SEI.h
@@ -1060,21 +1060,20 @@ public:
#endif
-
-class SEISubpicureLevelInfo : public SEI
+class SEISubpictureLevelInfo : public SEI
{
public:
PayloadType payloadType() const { return PayloadType::SUBPICTURE_LEVEL_INFO; }
- SEISubpicureLevelInfo()
- : m_numRefLevels(0)
- , m_explicitFractionPresentFlag (false)
- , m_cbrConstraintFlag (false)
- , m_numSubpics(0)
- , m_sliMaxSublayers(1)
- , m_sliSublayerInfoPresentFlag(false)
+ SEISubpictureLevelInfo()
+ : m_numRefLevels(0)
+ , m_explicitFractionPresentFlag(false)
+ , m_cbrConstraintFlag(false)
+ , m_numSubpics(0)
+ , m_sliMaxSublayers(1)
+ , m_sliSublayerInfoPresentFlag(false)
{}
- SEISubpicureLevelInfo(const SEISubpicureLevelInfo& sei);
- virtual ~SEISubpicureLevelInfo() {}
+ SEISubpictureLevelInfo(const SEISubpictureLevelInfo& sei);
+ virtual ~SEISubpictureLevelInfo() {}
int m_numRefLevels;
bool m_explicitFractionPresentFlag;
diff --git a/source/Lib/DecoderLib/SEIread.cpp b/source/Lib/DecoderLib/SEIread.cpp
index f105f33770..56a1000a6d 100644
--- a/source/Lib/DecoderLib/SEIread.cpp
+++ b/source/Lib/DecoderLib/SEIread.cpp
@@ -445,8 +445,8 @@ bool SEIReader::xReadSEImessage(SEIMessages& seis, const NalUnitType nalUnitType
xParseSEIDepthRepresentationInfo((SEIDepthRepresentationInfo &) *sei, payloadSize, pDecodedMessageOutputStream);
break;
case SEI::PayloadType::SUBPICTURE_LEVEL_INFO:
- sei = new SEISubpicureLevelInfo;
- xParseSEISubpictureLevelInfo((SEISubpicureLevelInfo &) *sei, payloadSize, pDecodedMessageOutputStream);
+ sei = new SEISubpictureLevelInfo;
+ xParseSEISubpictureLevelInfo((SEISubpictureLevelInfo&) *sei, payloadSize, pDecodedMessageOutputStream);
break;
case SEI::PayloadType::SAMPLE_ASPECT_RATIO_INFO:
sei = new SEISampleAspectRatioInfo;
@@ -2713,7 +2713,8 @@ void SEIReader::xParseSEIDepthRepInfoElement(double& f,std::ostream *pDecodedMes
}
}
-void SEIReader::xParseSEISubpictureLevelInfo(SEISubpicureLevelInfo& sei, uint32_t payloadSize, std::ostream *pDecodedMessageOutputStream)
+void SEIReader::xParseSEISubpictureLevelInfo(SEISubpictureLevelInfo& sei, uint32_t payloadSize,
+ std::ostream* pDecodedMessageOutputStream)
{
output_sei_message_header(sei, pDecodedMessageOutputStream, payloadSize);
uint32_t val;
diff --git a/source/Lib/DecoderLib/SEIread.h b/source/Lib/DecoderLib/SEIread.h
index 37b83e4724..93fc8819da 100644
--- a/source/Lib/DecoderLib/SEIread.h
+++ b/source/Lib/DecoderLib/SEIread.h
@@ -101,7 +101,8 @@ protected:
void xParseSEIAlphaChannelInfo (SEIAlphaChannelInfo& sei, uint32_t payloadSize, std::ostream *pDecodedMessageOutputStream);
void xParseSEIDepthRepresentationInfo (SEIDepthRepresentationInfo& sei, uint32_t payloadSize, std::ostream *pDecodedMessageOutputStream);
void xParseSEIDepthRepInfoElement (double &f,std::ostream *pDecodedMessageOutputStream);
- void xParseSEISubpictureLevelInfo (SEISubpicureLevelInfo& sei, uint32_t payloadSize, std::ostream *pDecodedMessageOutputStream);
+ void xParseSEISubpictureLevelInfo(SEISubpictureLevelInfo& sei, uint32_t payloadSize,
+ std::ostream* pDecodedMessageOutputStream);
void xParseSEISampleAspectRatioInfo (SEISampleAspectRatioInfo& sei, uint32_t payloadSize, std::ostream *pDecodedMessageOutputStream);
void xParseSEIUserDataRegistered (SEIUserDataRegistered& sei, uint32_t payloadSize, std::ostream *pDecodedMessageOutputStream);
void xParseSEIFilmGrainCharacteristics (SEIFilmGrainCharacteristics& sei, uint32_t payloadSize, std::ostream *pDecodedMessageOutputStream);
diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp
index 329a62b52e..55c5fe5b22 100644
--- a/source/Lib/EncoderLib/EncGOP.cpp
+++ b/source/Lib/EncoderLib/EncGOP.cpp
@@ -773,7 +773,7 @@ void EncGOP::xCreateIRAPLeadingSEIMessages (SEIMessages& seiMessages, const SPS
}
if (m_pcCfg->getSubpicureLevelInfoSEICfg().m_enabled)
{
- SEISubpicureLevelInfo *seiSubpicureLevelInfo = new SEISubpicureLevelInfo;
+ SEISubpictureLevelInfo* seiSubpicureLevelInfo = new SEISubpictureLevelInfo;
m_seiEncoder.initSEISubpictureLevelInfo(seiSubpicureLevelInfo, sps);
seiMessages.push_back(seiSubpicureLevelInfo);
}
@@ -1519,8 +1519,9 @@ validateMinCrRequirements(const ProfileTierLevelFeatures &plt, std::size_t numBy
}
}
-static void
-validateMinCrRequirements(const ProfileTierLevelFeatures &plt, std::size_t numBytesInVclNalUnits, const Slice *pSlice, const EncCfg *pCfg, const SEISubpicureLevelInfo &seiSubpic, const int subPicIdx, const int layerId)
+static void validateMinCrRequirements(const ProfileTierLevelFeatures& plt, std::size_t numBytesInVclNalUnits,
+ const Slice* pSlice, const EncCfg* pCfg, const SEISubpictureLevelInfo& seiSubpic,
+ const int subPicIdx, const int layerId)
{
if (plt.getTierLevelFeatures() && plt.getProfileFeatures())
{
@@ -4329,7 +4330,8 @@ void EncGOP::compressGOP(int pocLast, int numPicRcvd, PicList &rcListPic, std::l
getSeisByType(leadingSeiMessages, SEI::PayloadType::SUBPICTURE_LEVEL_INFO);
if (!subPictureLevelInfoSEIs.empty())
{
- const SEISubpicureLevelInfo& seiSubpic = static_cast<const SEISubpicureLevelInfo&>(*subPictureLevelInfoSEIs.front());
+ const SEISubpictureLevelInfo& seiSubpic =
+ static_cast<const SEISubpictureLevelInfo&>(*subPictureLevelInfoSEIs.front());
validateMinCrRequirements(profileTierLevelFeatures, subPicStats[subpicIdx].numBytesInVclNalUnits, pcSlice, m_pcCfg, seiSubpic, subpicIdx, m_pcEncLib->getLayerId());
}
sumZeroWords += cabac_zero_word_padding(pcSlice, pcPic, subPicStats[subpicIdx].numBinsWritten, subPicStats[subpicIdx].numBytesInVclNalUnits, 0,
diff --git a/source/Lib/EncoderLib/SEIEncoder.cpp b/source/Lib/EncoderLib/SEIEncoder.cpp
index e4425bc8a3..6544c906ad 100644
--- a/source/Lib/EncoderLib/SEIEncoder.cpp
+++ b/source/Lib/EncoderLib/SEIEncoder.cpp
@@ -1281,7 +1281,7 @@ void SEIEncoder::initSEIColourTransformInfo(SEIColourTransformInfo* seiCTI)
seiCTI->m_log2NumberOfPointsPerLut = floorLog2(seiCTI->m_lut[0].numLutValues - 1);
}
-void SEIEncoder::initSEISubpictureLevelInfo(SEISubpicureLevelInfo *sei, const SPS *sps)
+void SEIEncoder::initSEISubpictureLevelInfo(SEISubpictureLevelInfo* sei, const SPS* sps)
{
const EncCfgParam::CfgSEISubpictureLevel &cfgSubPicLevel = m_pcCfg->getSubpicureLevelInfoSEICfg();
diff --git a/source/Lib/EncoderLib/SEIEncoder.h b/source/Lib/EncoderLib/SEIEncoder.h
index 3754c3974c..78b368228f 100644
--- a/source/Lib/EncoderLib/SEIEncoder.h
+++ b/source/Lib/EncoderLib/SEIEncoder.h
@@ -75,7 +75,7 @@ public:
void initSEIOmniViewport(SEIOmniViewport *sei);
void initSEIRegionWisePacking(SEIRegionWisePacking *sei);
void initSEIGcmp(SEIGeneralizedCubemapProjection *sei);
- void initSEISubpictureLevelInfo(SEISubpicureLevelInfo *sei, const SPS *sps);
+ void initSEISubpictureLevelInfo(SEISubpictureLevelInfo* sei, const SPS* sps);
void initSEISampleAspectRatioInfo(SEISampleAspectRatioInfo *sei);
void initSEIPhaseIndication(SEIPhaseIndication* sei, int ppsId);
void initSEIFilmGrainCharacteristics(SEIFilmGrainCharacteristics *sei);
diff --git a/source/Lib/EncoderLib/SEIwrite.cpp b/source/Lib/EncoderLib/SEIwrite.cpp
index 0eecf09c4c..e51670dc28 100644
--- a/source/Lib/EncoderLib/SEIwrite.cpp
+++ b/source/Lib/EncoderLib/SEIwrite.cpp
@@ -150,7 +150,7 @@ void SEIWriter::xWriteSEIpayloadData(OutputBitstream &bs, const SEI &sei, HRD &h
xWriteSEIColourTransformInfo(*static_cast<const SEIColourTransformInfo *>(&sei));
break;
case SEI::PayloadType::SUBPICTURE_LEVEL_INFO:
- xWriteSEISubpictureLevelInfo(*static_cast<const SEISubpicureLevelInfo *>(&sei));
+ xWriteSEISubpictureLevelInfo(*static_cast<const SEISubpictureLevelInfo*>(&sei));
break;
case SEI::PayloadType::SAMPLE_ASPECT_RATIO_INFO:
xWriteSEISampleAspectRatioInfo(*static_cast<const SEISampleAspectRatioInfo *>(&sei));
@@ -1327,13 +1327,15 @@ void SEIWriter::xWriteSEIDepthRepInfoElement( double f )
xWriteCode( x_mantissa, x_mantissa_len , "da_mantissa" );
};
-void SEIWriter::xWriteSEISubpictureLevelInfo(const SEISubpicureLevelInfo &sei)
+void SEIWriter::xWriteSEISubpictureLevelInfo(const SEISubpictureLevelInfo& sei)
{
- CHECK(sei.m_numRefLevels < 1, "SEISubpicureLevelInfo: numRefLevels must be greater than zero");
- CHECK(sei.m_numRefLevels != (int)sei.m_refLevelIdc.size(), "SEISubpicureLevelInfo: numRefLevels must be equal to the number of levels");
+ CHECK(sei.m_numRefLevels < 1, "SEISubpictureLevelInfo: numRefLevels must be greater than zero");
+ CHECK(sei.m_numRefLevels != (int) sei.m_refLevelIdc.size(),
+ "SEISubpictureLevelInfo: numRefLevels must be equal to the number of levels");
if (sei.m_explicitFractionPresentFlag)
{
- CHECK(sei.m_numRefLevels != (int)sei.m_refLevelFraction.size(), "SEISubpicureLevelInfo: numRefLevels must be equal to the number of fractions");
+ CHECK(sei.m_numRefLevels != (int) sei.m_refLevelFraction.size(),
+ "SEISubpictureLevelInfo: numRefLevels must be equal to the number of fractions");
}
xWriteCode( (uint32_t)sei.m_numRefLevels - 1, 3, "sli_num_ref_levels_minus1");
xWriteFlag( sei.m_cbrConstraintFlag, "sli_cbr_constraint_flag");
@@ -1357,7 +1359,8 @@ void SEIWriter::xWriteSEISubpictureLevelInfo(const SEISubpicureLevelInfo &sei)
xWriteCode((uint32_t)sei.m_refLevelIdc[i][k], 8, "sli_ref_level_idc[i][k]");
if (sei.m_explicitFractionPresentFlag)
{
- CHECK(sei.m_numSubpics != (int)sei.m_refLevelFraction[i].size(), "SEISubpicureLevelInfo: number of fractions differs from number of subpictures");
+ CHECK(sei.m_numSubpics != (int) sei.m_refLevelFraction[i].size(),
+ "SEISubpictureLevelInfo: number of fractions differs from number of subpictures");
for (int j = 0; j < sei.m_numSubpics; j++)
{
xWriteCode((uint32_t)sei.m_refLevelFraction[i][j][k], 8, "sli_ref_level_fraction_minus1[i][j][k]");
diff --git a/source/Lib/EncoderLib/SEIwrite.h b/source/Lib/EncoderLib/SEIwrite.h
index 8c1a02dfd2..946ae4b5f0 100644
--- a/source/Lib/EncoderLib/SEIwrite.h
+++ b/source/Lib/EncoderLib/SEIwrite.h
@@ -83,7 +83,7 @@ protected:
void xWriteSEIAlphaChannelInfo (const SEIAlphaChannelInfo& sei);
void xWriteSEIDepthRepresentationInfo (const SEIDepthRepresentationInfo& sei);
void xWriteSEIDepthRepInfoElement (double f);
- void xWriteSEISubpictureLevelInfo (const SEISubpicureLevelInfo &sei);
+ void xWriteSEISubpictureLevelInfo(const SEISubpictureLevelInfo& sei);
void xWriteSEISampleAspectRatioInfo (const SEISampleAspectRatioInfo &sei);
void xWriteSEIPhaseIndication (const SEIPhaseIndication&sei);
void xWriteSEIConstrainedRaslIndication (const SEIConstrainedRaslIndication &sei);
--
GitLab