From 2644ed2250818d76d45729950257bd7f8398c669 Mon Sep 17 00:00:00 2001
From: Frank Bossen <fbossen@gmail.com>
Date: Wed, 7 Feb 2024 18:02:12 -0500
Subject: [PATCH] Rename m_cbrConstraintFlag
---
source/App/BitstreamExtractorApp/BitstreamExtractorApp.cpp | 2 +-
source/Lib/CommonLib/SEI.cpp | 2 +-
source/Lib/CommonLib/SEI.h | 4 ++--
source/Lib/DecoderLib/SEIread.cpp | 3 ++-
source/Lib/EncoderLib/SEIwrite.cpp | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/source/App/BitstreamExtractorApp/BitstreamExtractorApp.cpp b/source/App/BitstreamExtractorApp/BitstreamExtractorApp.cpp
index 1f056cda2..b0ef7c261 100644
--- a/source/App/BitstreamExtractorApp/BitstreamExtractorApp.cpp
+++ b/source/App/BitstreamExtractorApp/BitstreamExtractorApp.cpp
@@ -147,7 +147,7 @@ bool BitstreamExtractorApp::xCheckSEIFiller(SEIMessages SEIs, int targetSubPicId
if (sei->payloadType() == SEI::PayloadType::SUBPICTURE_LEVEL_INFO)
{
SEISubpictureLevelInfo* seiSLI = (SEISubpictureLevelInfo*) sei;
- if (!seiSLI->m_cbrConstraintFlag)
+ if (!seiSLI->cbrConstraint)
{
rmAllFillerInSubpicExt = true;
}
diff --git a/source/Lib/CommonLib/SEI.cpp b/source/Lib/CommonLib/SEI.cpp
index c577e4986..c58302b59 100644
--- a/source/Lib/CommonLib/SEI.cpp
+++ b/source/Lib/CommonLib/SEI.cpp
@@ -919,7 +919,7 @@ SEIContentColourVolume::SEIContentColourVolume(const SEIContentColourVolume& sei
SEISubpictureLevelInfo::SEISubpictureLevelInfo(const SEISubpictureLevelInfo& sei)
{
- m_cbrConstraintFlag = sei.m_cbrConstraintFlag;
+ cbrConstraint = sei.cbrConstraint;
m_sliSublayerInfoPresentFlag = sei.m_sliSublayerInfoPresentFlag;
data = sei.data;
}
diff --git a/source/Lib/CommonLib/SEI.h b/source/Lib/CommonLib/SEI.h
index c2f0cca01..5527fca3d 100644
--- a/source/Lib/CommonLib/SEI.h
+++ b/source/Lib/CommonLib/SEI.h
@@ -1064,11 +1064,11 @@ class SEISubpictureLevelInfo : public SEI
{
public:
PayloadType payloadType() const { return PayloadType::SUBPICTURE_LEVEL_INFO; }
- SEISubpictureLevelInfo() : m_cbrConstraintFlag(false), m_sliSublayerInfoPresentFlag(false) {}
+ SEISubpictureLevelInfo() : cbrConstraint(false), m_sliSublayerInfoPresentFlag(false) {}
SEISubpictureLevelInfo(const SEISubpictureLevelInfo& sei);
virtual ~SEISubpictureLevelInfo() {}
- bool m_cbrConstraintFlag;
+ bool cbrConstraint = false;
bool m_sliSublayerInfoPresentFlag;
int& nonSubpicLayerFraction(int i, int k) { return data[k][i].nonSubpicLayersFraction; }
diff --git a/source/Lib/DecoderLib/SEIread.cpp b/source/Lib/DecoderLib/SEIread.cpp
index ba9e2aa2a..cf3a5059c 100644
--- a/source/Lib/DecoderLib/SEIread.cpp
+++ b/source/Lib/DecoderLib/SEIread.cpp
@@ -2721,7 +2721,8 @@ void SEIReader::xParseSEISubpictureLevelInfo(SEISubpictureLevelInfo& sei, uint32
sei_read_code(pDecodedMessageOutputStream, 3, val, "sli_num_ref_levels_minus1");
const uint32_t numRefLevels = val + 1;
- sei_read_flag( pDecodedMessageOutputStream, val, "sli_cbr_constraint_flag" ); sei.m_cbrConstraintFlag = val;
+ sei_read_flag(pDecodedMessageOutputStream, val, "sli_cbr_constraint_flag");
+ sei.cbrConstraint = val != 0;
sei_read_flag(pDecodedMessageOutputStream, val, "sli_explicit_fraction_present_flag");
const bool explicitFractionPresentFlag = val != 0;
diff --git a/source/Lib/EncoderLib/SEIwrite.cpp b/source/Lib/EncoderLib/SEIwrite.cpp
index 070bbb9e6..fde95adfd 100644
--- a/source/Lib/EncoderLib/SEIwrite.cpp
+++ b/source/Lib/EncoderLib/SEIwrite.cpp
@@ -1331,7 +1331,7 @@ void SEIWriter::xWriteSEISubpictureLevelInfo(const SEISubpictureLevelInfo& sei)
{
CHECK(sei.numRefLevels() < 1, "SEISubpictureLevelInfo: numRefLevels must be greater than zero");
xWriteCode(sei.numRefLevels() - 1, 3, "sli_num_ref_levels_minus1");
- xWriteFlag( sei.m_cbrConstraintFlag, "sli_cbr_constraint_flag");
+ xWriteFlag(sei.cbrConstraint ? 1 : 0, "sli_cbr_constraint_flag");
xWriteFlag(sei.explicitFractionPresentFlag(), "sli_explicit_fraction_present_flag");
if (sei.explicitFractionPresentFlag())
{
--
GitLab