From df86672cce0b6911da060c5f084571ceda4d5e04 Mon Sep 17 00:00:00 2001
From: Frank Bossen <fbossen@gmail.com>
Date: Sun, 6 Nov 2022 22:54:10 -0500
Subject: [PATCH] Use bool type and constants for boolean fields
---
source/App/DecoderApp/DecApp.cpp | 36 +++++++++++++++--------------
source/App/DecoderApp/DecApp.h | 8 +++----
source/App/EncoderApp/EncAppCfg.cpp | 8 +++----
3 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/source/App/DecoderApp/DecApp.cpp b/source/App/DecoderApp/DecApp.cpp
index 651ae23b9..562fdee74 100644
--- a/source/App/DecoderApp/DecApp.cpp
+++ b/source/App/DecoderApp/DecApp.cpp
@@ -562,16 +562,16 @@ uint32_t DecApp::decode()
if (!m_shutterIntervalPostFileName.empty())
{
- int32_t hasValidSII = 1;
- SEIShutterIntervalInfo *curSIIInfo = NULL;
+ bool hasValidSII = true;
+ SEIShutterIntervalInfo *curSIIInfo = nullptr;
if ((pcPic->getPictureType() == NAL_UNIT_CODED_SLICE_IDR_W_RADL ||
pcPic->getPictureType() == NAL_UNIT_CODED_SLICE_IDR_N_LP) && m_newCLVS[nalu.m_nuhLayerId])
{
- IdrSiiInfo_s curSII;
+ IdrSiiInfo curSII;
curSII.m_picPoc = pcPic->getPOC();
- curSII.m_isValidSii = 0;
- curSII.m_siiInfo.m_siiEnabled = 0;
+ curSII.m_isValidSii = false;
+ curSII.m_siiInfo.m_siiEnabled = false;
curSII.m_siiInfo.m_siiNumUnitsInShutterInterval = 0;
curSII.m_siiInfo.m_siiTimeScale = 0;
curSII.m_siiInfo.m_siiMaxSubLayersMinus1 = 0;
@@ -580,7 +580,7 @@ uint32_t DecApp::decode()
if (shutterIntervalInfo.size() > 0)
{
SEIShutterIntervalInfo *seiShutterIntervalInfo = (SEIShutterIntervalInfo*) *(shutterIntervalInfo.begin());
- curSII.m_isValidSii = 1;
+ curSII.m_isValidSii = true;
curSII.m_siiInfo.m_siiEnabled = seiShutterIntervalInfo->m_siiEnabled;
curSII.m_siiInfo.m_siiNumUnitsInShutterInterval = seiShutterIntervalInfo->m_siiNumUnitsInShutterInterval;
@@ -589,18 +589,20 @@ uint32_t DecApp::decode()
curSII.m_siiInfo.m_siiFixedSIwithinCLVS = seiShutterIntervalInfo->m_siiFixedSIwithinCLVS;
curSII.m_siiInfo.m_siiSubLayerNumUnitsInSI.clear();
for (int i = 0; i < seiShutterIntervalInfo->m_siiSubLayerNumUnitsInSI.size(); i++)
+ {
curSII.m_siiInfo.m_siiSubLayerNumUnitsInSI.push_back(seiShutterIntervalInfo->m_siiSubLayerNumUnitsInSI[i]);
+ }
uint32_t tmpInfo = (uint32_t)(m_activeSiiInfo.size() + 1);
- m_activeSiiInfo.insert(pair<uint32_t, IdrSiiInfo_s>(tmpInfo, curSII));
+ m_activeSiiInfo.insert(pair<uint32_t, IdrSiiInfo>(tmpInfo, curSII));
curSIIInfo = seiShutterIntervalInfo;
}
else
{
- curSII.m_isValidSii = 0;
- hasValidSII = 0;
+ curSII.m_isValidSii = false;
+ hasValidSII = false;
uint32_t tmpInfo = (uint32_t)(m_activeSiiInfo.size() + 1);
- m_activeSiiInfo.insert(pair<uint32_t, IdrSiiInfo_s>(tmpInfo, curSII));
+ m_activeSiiInfo.insert(pair<uint32_t, IdrSiiInfo>(tmpInfo, curSII));
}
}
else
@@ -611,7 +613,7 @@ uint32_t DecApp::decode()
}
else
{
- uint8_t isLast = 1;
+ bool isLast = true;
for (int i = 1; i < m_activeSiiInfo.size() + 1; i++)
{
if (pcPic->getPOC() <= m_activeSiiInfo.at(i).m_picPoc)
@@ -622,9 +624,9 @@ uint32_t DecApp::decode()
}
else
{
- hasValidSII = 0;
+ hasValidSII = false;
}
- isLast = 0;
+ isLast = false;
break;
}
}
@@ -645,15 +647,15 @@ uint32_t DecApp::decode()
uint32_t numUnitsHFR = curSIIInfo->m_siiSubLayerNumUnitsInSI[siiMaxSubLayersMinus1];
int blending_ratio = (numUnitsLFR / numUnitsHFR);
- bool checkEqualValuesOfSFR = 1;
- bool checkSubLayerSI = 0;
+ bool checkEqualValuesOfSFR = true;
+ bool checkSubLayerSI = false;
int i;
//supports only the case of SFR = HFR / 2
if (curSIIInfo->m_siiSubLayerNumUnitsInSI[siiMaxSubLayersMinus1] <
curSIIInfo->m_siiSubLayerNumUnitsInSI[siiMaxSubLayersMinus1 - 1])
{
- checkSubLayerSI = 1;
+ checkSubLayerSI = true;
}
else
{
@@ -664,7 +666,7 @@ uint32_t DecApp::decode()
{
if (curSIIInfo->m_siiSubLayerNumUnitsInSI[0] != curSIIInfo->m_siiSubLayerNumUnitsInSI[i])
{
- checkEqualValuesOfSFR = 0;
+ checkEqualValuesOfSFR = false;
}
}
if (!checkEqualValuesOfSFR)
diff --git a/source/App/DecoderApp/DecApp.h b/source/App/DecoderApp/DecApp.h
index 50d153123..bf87a7e1a 100644
--- a/source/App/DecoderApp/DecApp.h
+++ b/source/App/DecoderApp/DecApp.h
@@ -69,14 +69,14 @@ private:
VideoIOYuv m_cTVideoIOYuvSIIPostFile; ///< post-filtered YUV class
int m_SII_BlendingRatio;
- typedef struct
+ struct IdrSiiInfo
{
SEIShutterIntervalInfo m_siiInfo;
uint32_t m_picPoc;
- uint8_t m_isValidSii;
- }IdrSiiInfo_s;
+ bool m_isValidSii;
+ };
- std::map<uint32_t, IdrSiiInfo_s> m_activeSiiInfo;
+ std::map<uint32_t, IdrSiiInfo> m_activeSiiInfo;
#endif
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index 034ea9600..6364b65c1 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -3176,8 +3176,8 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
m_ShutterFilterEnable = true;
double fpsHFR = (double)m_iFrameRate;
int32_t i;
- bool checkEqualValuesOfSFR = 1;
- bool checkSubLayerSI = 0;
+ bool checkEqualValuesOfSFR = true;
+ bool checkSubLayerSI = false;
double shutterAngleFactor = (fpsHFR * ((double)(m_siiSEISubLayerNumUnitsInSI[siiMaxSubLayersMinus1])))/((double)m_siiSEITimeScale);
@@ -3197,14 +3197,14 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
// supports only the case of SFR = HFR / 2
if (m_siiSEISubLayerNumUnitsInSI[siiMaxSubLayersMinus1] < m_siiSEISubLayerNumUnitsInSI[siiMaxSubLayersMinus1 - 1])
{
- checkSubLayerSI = 1;
+ checkSubLayerSI = true;
}
// check shutter interval for all sublayer remains same for LFR pictures
for (i = 1; i < siiMaxSubLayersMinus1; i++)
{
if (m_siiSEISubLayerNumUnitsInSI[0] != m_siiSEISubLayerNumUnitsInSI[i])
{
- checkEqualValuesOfSFR = 0;
+ checkEqualValuesOfSFR = false;
}
}
if (checkSubLayerSI && checkEqualValuesOfSFR)
--
GitLab