Skip to content
Snippets Groups Projects
Commit 1ff70b67 authored by Karl Sharman's avatar Karl Sharman
Browse files

Removed 'b' prefix from boolean variable names.

parent c035bb56
No related branches found
No related tags found
No related merge requests found
......@@ -740,7 +740,7 @@ Void TAppDecTop::xOutputAnnotatedRegions(TComPic* pcPic)
for(auto srcIt=seiAnnotatedRegions.m_annotatedLabels.begin(); srcIt!=seiAnnotatedRegions.m_annotatedLabels.end(); srcIt++)
{
const UInt labIdx = srcIt->first;
if (srcIt->second.bLabelValid)
if (srcIt->second.labelValid)
{
m_arLabels[labIdx] = srcIt->second.label;
}
......@@ -757,7 +757,7 @@ Void TAppDecTop::xOutputAnnotatedRegions(TComPic* pcPic)
UInt objIdx = srcIt->first;
const SEIAnnotatedRegions::AnnotatedRegionObject &src =srcIt->second;
if (src.bObjectCancelFlag)
if (src.objectCancelFlag)
{
m_arObjects.erase(objIdx);
}
......@@ -774,12 +774,12 @@ Void TAppDecTop::xOutputAnnotatedRegions(TComPic* pcPic)
{
SEIAnnotatedRegions::AnnotatedRegionObject &dst=destIt->second;
if (seiAnnotatedRegions.m_hdr.m_objectLabelPresentFlag && src.bObjectLabelValid)
if (seiAnnotatedRegions.m_hdr.m_objectLabelPresentFlag && src.objectLabelValid)
{
dst.bObjectLabelValid=true;
dst.objectLabelValid=true;
dst.objLabelIdx = src.objLabelIdx;
}
if (src.bBoundingBoxValid)
if (src.boundingBoxValid)
{
dst.boundingBoxTop = src.boundingBoxTop ;
dst.boundingBoxLeft = src.boundingBoxLeft ;
......@@ -787,7 +787,7 @@ Void TAppDecTop::xOutputAnnotatedRegions(TComPic* pcPic)
dst.boundingBoxHeight = src.boundingBoxHeight;
if (seiAnnotatedRegions.m_hdr.m_partialObjectFlagPresentFlag)
{
dst.bPartialObjectFlag = src.bPartialObjectFlag;
dst.partialObjectFlag = src.partialObjectFlag;
}
if (seiAnnotatedRegions.m_hdr.m_objectConfidenceInfoPresentFlag)
{
......@@ -818,14 +818,14 @@ Void TAppDecTop::xOutputAnnotatedRegions(TComPic* pcPic)
fprintf(fp_persist, "Object Left = %d\n", it->second.boundingBoxLeft);
fprintf(fp_persist, "Object Width = %d\n", it->second.boundingBoxWidth);
fprintf(fp_persist, "Object Height = %d\n", it->second.boundingBoxHeight);
if (it->second.bObjectLabelValid)
if (it->second.objectLabelValid)
{
auto labelIt=m_arLabels.find(it->second.objLabelIdx);
fprintf(fp_persist, "Object Label = %s\n", labelIt!=m_arLabels.end() ? (labelIt->second.c_str()) : "<UNKNOWN>");
}
if (m_arHeader.m_partialObjectFlagPresentFlag)
{
fprintf(fp_persist, "Object Partial = %d\n", it->second.bPartialObjectFlag?1:0);
fprintf(fp_persist, "Object Partial = %d\n", it->second.partialObjectFlag?1:0);
}
if (m_arHeader.m_objectConfidenceInfoPresentFlag)
{
......
......@@ -865,28 +865,28 @@ public:
struct AnnotatedRegionObject
{
AnnotatedRegionObject() :
bObjectCancelFlag(false),
bObjectLabelValid(false),
bBoundingBoxValid(false)
objectCancelFlag(false),
objectLabelValid(false),
boundingBoxValid(false)
{ }
Bool bObjectCancelFlag;
Bool objectCancelFlag;
Bool bObjectLabelValid;
Bool objectLabelValid;
UInt objLabelIdx; // only valid if bObjectLabelValid
Bool bBoundingBoxValid;
Bool boundingBoxValid;
UInt boundingBoxTop; // only valid if bBoundingBoxValid
UInt boundingBoxLeft;
UInt boundingBoxWidth;
UInt boundingBoxHeight;
Bool bPartialObjectFlag; // only valid if bPartialObjectFlagValid
Bool partialObjectFlag; // only valid if bPartialObjectFlagValid
UInt objectConfidence;
};
struct AnnotatedRegionLabel
{
AnnotatedRegionLabel() : bLabelValid(false) { }
Bool bLabelValid;
AnnotatedRegionLabel() : labelValid(false) { }
Bool labelValid;
std::string label; // only valid if bLabelValid
};
......
......@@ -1689,8 +1689,8 @@ Void SEIReader::xParseSEIAnnotatedRegions(SEIAnnotatedRegions& sei, UInt payload
SEIAnnotatedRegions::AnnotatedRegionLabel &ar = it->second;
sei_read_uvlc(pDecodedMessageOutputStream, val, "ar_label_idx[]"); it->first = val;
assert(val<256);
sei_read_flag(pDecodedMessageOutputStream, val, "ar_label_cancel_flag"); ar.bLabelValid = !val;
if (ar.bLabelValid)
sei_read_flag(pDecodedMessageOutputStream, val, "ar_label_cancel_flag"); ar.labelValid = !val;
if (ar.labelValid)
{
ar.label.clear();
// byte alignment
......@@ -1721,23 +1721,23 @@ Void SEIReader::xParseSEIAnnotatedRegions(SEIAnnotatedRegions& sei, UInt payload
sei_read_uvlc(pDecodedMessageOutputStream, val, "ar_object_idx"); it->first=val;
assert(val<256);
SEIAnnotatedRegions::AnnotatedRegionObject &ar = it->second;
sei_read_flag(pDecodedMessageOutputStream, val, "ar_object_cancel_flag"); ar.bObjectCancelFlag = val;
ar.bObjectLabelValid=false;
ar.bBoundingBoxValid=false;
sei_read_flag(pDecodedMessageOutputStream, val, "ar_object_cancel_flag"); ar.objectCancelFlag = val;
ar.objectLabelValid=false;
ar.boundingBoxValid=false;
if (!ar.bObjectCancelFlag)
if (!ar.objectCancelFlag)
{
if (sei.m_hdr.m_objectLabelPresentFlag)
{
sei_read_flag(pDecodedMessageOutputStream, val, "ar_object_label_update_flag"); ar.bObjectLabelValid = val;
if (ar.bObjectLabelValid)
sei_read_flag(pDecodedMessageOutputStream, val, "ar_object_label_update_flag"); ar.objectLabelValid = val;
if (ar.objectLabelValid)
{
sei_read_uvlc(pDecodedMessageOutputStream, val, "ar_object_label_idx"); ar.objLabelIdx = val;
assert(val<256);
}
}
sei_read_flag(pDecodedMessageOutputStream, val, "ar_bounding_box_update_flag"); ar.bBoundingBoxValid = val;
if (ar.bBoundingBoxValid)
sei_read_flag(pDecodedMessageOutputStream, val, "ar_bounding_box_update_flag"); ar.boundingBoxValid = val;
if (ar.boundingBoxValid)
{
sei_read_code(pDecodedMessageOutputStream, 16, val, "ar_bounding_box_top"); ar.boundingBoxTop = val;
sei_read_code(pDecodedMessageOutputStream, 16, val, "ar_bounding_box_left"); ar.boundingBoxLeft = val;
......@@ -1745,7 +1745,7 @@ Void SEIReader::xParseSEIAnnotatedRegions(SEIAnnotatedRegions& sei, UInt payload
sei_read_code(pDecodedMessageOutputStream, 16, val, "ar_bounding_box_height"); ar.boundingBoxHeight = val;
if (sei.m_hdr.m_partialObjectFlagPresentFlag)
{
sei_read_flag(pDecodedMessageOutputStream, val, "ar_partial_object_flag"); ar.bPartialObjectFlag = val;
sei_read_flag(pDecodedMessageOutputStream, val, "ar_partial_object_flag"); ar.partialObjectFlag = val;
}
if (sei.m_hdr.m_objectConfidenceInfoPresentFlag)
{
......
......@@ -1375,8 +1375,8 @@ Void SEIEncoder::readAnnotatedRegionSEI(std::istream &fic, SEIAnnotatedRegions *
readTokenValueAndValidate(it->first, failed, fic, "SEIArLabelIdc[c]", UInt(0), UInt(255));
bool cancelFlag;
readTokenValueAndValidate(cancelFlag, failed, fic, "SEIArLabelCancelFlag[c]");
ar.bLabelValid=!cancelFlag;
if (ar.bLabelValid)
ar.labelValid=!cancelFlag;
if (ar.labelValid)
{
readTokenValue(ar.label, failed, fic, "SEIArLabel[c]");
}
......@@ -1389,20 +1389,20 @@ Void SEIEncoder::readAnnotatedRegionSEI(std::istream &fic, SEIAnnotatedRegions *
{
SEIAnnotatedRegions::AnnotatedRegionObject &ar = it->second;
readTokenValueAndValidate(it->first, failed, fic, "SEIArObjIdx[c]", UInt(0), UInt(255));
readTokenValueAndValidate(ar.bObjectCancelFlag, failed, fic, "SEIArObjCancelFlag[c]");
ar.bObjectLabelValid=false;
ar.bBoundingBoxValid=false;
if (!ar.bObjectCancelFlag)
readTokenValueAndValidate(ar.objectCancelFlag, failed, fic, "SEIArObjCancelFlag[c]");
ar.objectLabelValid=false;
ar.boundingBoxValid=false;
if (!ar.objectCancelFlag)
{
if (seiAnnoRegion->m_hdr.m_objectLabelPresentFlag)
{
readTokenValueAndValidate(ar.bObjectLabelValid, failed, fic, "SEIArObjLabelUpdateFlag[c]");
if (ar.bObjectLabelValid)
readTokenValueAndValidate(ar.objectLabelValid, failed, fic, "SEIArObjLabelUpdateFlag[c]");
if (ar.objectLabelValid)
{
readTokenValueAndValidate<UInt>(ar.objLabelIdx, failed, fic, "SEIArObjectLabelIdc[c]", UInt(0), UInt(255));
}
readTokenValueAndValidate(ar.bBoundingBoxValid, failed, fic, "SEIArBoundBoxUpdateFlag[c]");
if (ar.bBoundingBoxValid)
readTokenValueAndValidate(ar.boundingBoxValid, failed, fic, "SEIArBoundBoxUpdateFlag[c]");
if (ar.boundingBoxValid)
{
readTokenValueAndValidate<UInt>(ar.boundingBoxTop, failed, fic, "SEIArObjTop[c]", UInt(0), UInt(0x7fffffff));
readTokenValueAndValidate<UInt>(ar.boundingBoxLeft, failed, fic, "SEIArObjLeft[c]", UInt(0), UInt(0x7fffffff));
......@@ -1410,7 +1410,7 @@ Void SEIEncoder::readAnnotatedRegionSEI(std::istream &fic, SEIAnnotatedRegions *
readTokenValueAndValidate<UInt>(ar.boundingBoxHeight, failed, fic, "SEIArObjHeight[c]", UInt(0), UInt(0x7fffffff));
if (seiAnnoRegion->m_hdr.m_partialObjectFlagPresentFlag)
{
readTokenValueAndValidate(ar.bPartialObjectFlag, failed, fic, "SEIArObjPartUpdateFlag[c]");
readTokenValueAndValidate(ar.partialObjectFlag, failed, fic, "SEIArObjPartUpdateFlag[c]");
}
if (seiAnnoRegion->m_hdr.m_objectConfidenceInfoPresentFlag)
{
......
......@@ -1413,8 +1413,8 @@ Void SEIWriter::xWriteSEIAnnotatedRegions(const SEIAnnotatedRegions &sei, const
assert(it->first < 256);
WRITE_UVLC(it->first, "ar_label_idx[]");
const SEIAnnotatedRegions::AnnotatedRegionLabel &ar=it->second;
WRITE_FLAG(!ar.bLabelValid, "ar_label_cancel_flag");
if (ar.bLabelValid)
WRITE_FLAG(!ar.labelValid, "ar_label_cancel_flag");
if (ar.labelValid)
{
xWriteByteAlign();
assert(ar.label.size()<256);
......@@ -1432,20 +1432,20 @@ Void SEIWriter::xWriteSEIAnnotatedRegions(const SEIAnnotatedRegions &sei, const
{
const SEIAnnotatedRegions::AnnotatedRegionObject &ar = it->second;
WRITE_UVLC(it->first, "ar_object_idx");
WRITE_FLAG(ar.bObjectCancelFlag, "ar_object_cancel_flag");
if (!ar.bObjectCancelFlag)
WRITE_FLAG(ar.objectCancelFlag, "ar_object_cancel_flag");
if (!ar.objectCancelFlag)
{
if (sei.m_hdr.m_objectLabelPresentFlag)
{
WRITE_FLAG(ar.bObjectLabelValid, "ar_object_label_update_flag");
if (ar.bObjectLabelValid)
WRITE_FLAG(ar.objectLabelValid, "ar_object_label_update_flag");
if (ar.objectLabelValid)
{
assert(ar.objLabelIdx<256);
WRITE_UVLC(ar.objLabelIdx, "ar_object_label_idx");
}
}
WRITE_FLAG(ar.bBoundingBoxValid, "ar_object_bounding_box_update_flag");
if (ar.bBoundingBoxValid)
WRITE_FLAG(ar.boundingBoxValid, "ar_object_bounding_box_update_flag");
if (ar.boundingBoxValid)
{
WRITE_CODE(ar.boundingBoxTop, 16, "ar_bounding_box_top");
WRITE_CODE(ar.boundingBoxLeft, 16, "ar_bounding_box_left");
......@@ -1453,7 +1453,7 @@ Void SEIWriter::xWriteSEIAnnotatedRegions(const SEIAnnotatedRegions &sei, const
WRITE_CODE(ar.boundingBoxHeight,16, "ar_bounding_box_height");
if (sei.m_hdr.m_partialObjectFlagPresentFlag)
{
WRITE_UVLC(ar.bPartialObjectFlag, "ar_partial_object_flag");
WRITE_UVLC(ar.partialObjectFlag, "ar_partial_object_flag");
}
if (sei.m_hdr.m_objectConfidenceInfoPresentFlag)
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment