diff --git a/doc/software-manual.pdf b/doc/software-manual.pdf
index 144c7bf5a8f79031e41cdbdc647405b5564dee5d..f5e228c5d51fc520377531994ea111853b0cb95b 100644
Binary files a/doc/software-manual.pdf and b/doc/software-manual.pdf differ
diff --git a/source/Lib/CommonLib/Mv.cpp b/source/Lib/CommonLib/Mv.cpp
index 528c3c4dde01fdc29266ad324a9587d6ceb36635..e4cc3ce31323eef8d13b0d79c55a3254a78c8975 100644
--- a/source/Lib/CommonLib/Mv.cpp
+++ b/source/Lib/CommonLib/Mv.cpp
@@ -62,16 +62,16 @@ void clipMvInPic ( Mv& rcMv, const struct Position& pos, const struct Size& size
return;
}
- int iMvShift = MV_FRACTIONAL_BITS_INTERNAL;
- int iOffset = 8;
- int iHorMax = (pps.getPicWidthInLumaSamples() + iOffset - (int)pos.x - 1) << iMvShift;
- int iHorMin = (-(int)sps.getMaxCUWidth() - iOffset - (int)pos.x + 1) << iMvShift;
+ int mvShift = MV_FRACTIONAL_BITS_INTERNAL;
+ int offset = 8;
+ int horMax = (pps.getPicWidthInLumaSamples() + offset - (int)pos.x - 1) << mvShift;
+ int horMin = (-(int)sps.getMaxCUWidth() - offset - (int)pos.x + 1) << mvShift;
- int iVerMax = (pps.getPicHeightInLumaSamples() + iOffset - (int)pos.y - 1) << iMvShift;
- int iVerMin = (-(int)sps.getMaxCUHeight() - iOffset - (int)pos.y + 1) << iMvShift;
+ int verMax = (pps.getPicHeightInLumaSamples() + offset - (int)pos.y - 1) << mvShift;
+ int verMin = (-(int)sps.getMaxCUHeight() - offset - (int)pos.y + 1) << mvShift;
- rcMv.setHor(std::min(iHorMax, std::max(iHorMin, rcMv.getHor())));
- rcMv.setVer(std::min(iVerMax, std::max(iVerMin, rcMv.getVer())));
+ rcMv.setHor(std::min(horMax, std::max(horMin, rcMv.getHor())));
+ rcMv.setVer(std::min(verMax, std::max(verMin, rcMv.getVer())));
}
void clipMvInSubpic ( Mv& rcMv, const struct Position& pos, const struct Size& size, const class SPS& sps, const class PPS& pps )
@@ -82,24 +82,24 @@ void clipMvInSubpic ( Mv& rcMv, const struct Position& pos, const struct Size& s
return;
}
- int iMvShift = MV_FRACTIONAL_BITS_INTERNAL;
- int iOffset = 8;
- int iHorMax = (pps.getPicWidthInLumaSamples() + iOffset - (int)pos.x - 1) << iMvShift;
- int iHorMin = (-(int)sps.getMaxCUWidth() - iOffset - (int)pos.x + 1) << iMvShift;
+ int mvShift = MV_FRACTIONAL_BITS_INTERNAL;
+ int offset = 8;
+ int horMax = (pps.getPicWidthInLumaSamples() + offset - (int)pos.x - 1) << mvShift;
+ int horMin = (-(int)sps.getMaxCUWidth() - offset - (int)pos.x + 1) << mvShift;
- int iVerMax = (pps.getPicHeightInLumaSamples() + iOffset - (int)pos.y - 1) << iMvShift;
- int iVerMin = (-(int)sps.getMaxCUHeight() - iOffset - (int)pos.y + 1) << iMvShift;
+ int verMax = (pps.getPicHeightInLumaSamples() + offset - (int)pos.y - 1) << mvShift;
+ int verMin = (-(int)sps.getMaxCUHeight() - offset - (int)pos.y + 1) << mvShift;
const SubPic& curSubPic = pps.getSubPicFromPos(pos);
if (curSubPic.getTreatedAsPicFlag())
{
- iHorMax = ((curSubPic.getSubPicRight() + 1) + iOffset - (int)pos.x - 1) << iMvShift;
- iHorMin = (-(int)sps.getMaxCUWidth() - iOffset - ((int)pos.x - curSubPic.getSubPicLeft()) + 1) << iMvShift;
+ horMax = ((curSubPic.getSubPicRight() + 1) + offset - (int)pos.x - 1) << mvShift;
+ horMin = (-(int)sps.getMaxCUWidth() - offset - ((int)pos.x - curSubPic.getSubPicLeft()) + 1) << mvShift;
- iVerMax = ((curSubPic.getSubPicBottom() + 1) + iOffset - (int)pos.y - 1) << iMvShift;
- iVerMin = (-(int)sps.getMaxCUHeight() - iOffset - ((int)pos.y - curSubPic.getSubPicTop()) + 1) << iMvShift;
+ verMax = ((curSubPic.getSubPicBottom() + 1) + offset - (int)pos.y - 1) << mvShift;
+ verMin = (-(int)sps.getMaxCUHeight() - offset - ((int)pos.y - curSubPic.getSubPicTop()) + 1) << mvShift;
}
- rcMv.setHor(std::min(iHorMax, std::max(iHorMin, rcMv.getHor())));
- rcMv.setVer(std::min(iVerMax, std::max(iVerMin, rcMv.getVer())));
+ rcMv.setHor(std::min(horMax, std::max(horMin, rcMv.getHor())));
+ rcMv.setVer(std::min(verMax, std::max(verMin, rcMv.getVer())));
}
#else
void clipMv( Mv& rcMv, const Position& pos, const struct Size& size, const SPS& sps, const PPS& pps )
diff --git a/source/Lib/CommonLib/UnitTools.cpp b/source/Lib/CommonLib/UnitTools.cpp
index 757701db6325a2ec99827aeb296d9d26c7d8f624..5379edb373f7c411ad2be33771931d705b4e3fa9 100644
--- a/source/Lib/CommonLib/UnitTools.cpp
+++ b/source/Lib/CommonLib/UnitTools.cpp
@@ -142,17 +142,17 @@ void CU::checkConformanceILRP(Slice *slice)
//constraint 1: The picture referred to by each active entry in RefPicList[ 0 ] or RefPicList[ 1 ] has the same subpicture layout as the current picture
bool isAllRefSameSubpicLayout = true;
- for (int iNumRef = 0; iNumRef < numRefList; iNumRef++) // loop over l0 and l1
+ for (int refList = 0; refList < numRefList; refList++) // loop over l0 and l1
{
- RefPicList eRefPicList = (iNumRef ? REF_PIC_LIST_1 : REF_PIC_LIST_0);
- for (int iRefIdx = 0; iRefIdx < slice->getNumRefIdx(eRefPicList); iRefIdx++)
+ RefPicList eRefPicList = (refList ? REF_PIC_LIST_1 : REF_PIC_LIST_0);
+ for (int refIdx = 0; refIdx < slice->getNumRefIdx(eRefPicList); refIdx++)
{
- const Picture* refPic = slice->getRefPic(eRefPicList, iRefIdx)->unscaledPic;
+ const Picture* refPic = slice->getRefPic(eRefPicList, refIdx)->unscaledPic;
if (refPic->cs->pps->getNumSubPics() != slice->getPic()->cs->pps->getNumSubPics())
{
isAllRefSameSubpicLayout = false;
- iNumRef = numRefList;
+ refList = numRefList;
break;
}
else
@@ -165,8 +165,8 @@ void CU::checkConformanceILRP(Slice *slice)
|| refPic->cs->pps->getSubPic(i).getSubPicCtuTopLeftY() != slice->getPic()->cs->pps->getSubPic(i).getSubPicCtuTopLeftY())
{
isAllRefSameSubpicLayout = false;
- iRefIdx = slice->getNumRefIdx(eRefPicList);
- iNumRef = numRefList;
+ refIdx = slice->getNumRefIdx(eRefPicList);
+ refList = numRefList;
break;
}
}
@@ -177,12 +177,12 @@ void CU::checkConformanceILRP(Slice *slice)
//constraint 2: The picture referred to by each active entry in RefPicList[ 0 ] or RefPicList[ 1 ] is an ILRP for which the value of sps_num_subpics_minus1 is equal to 0
if (!isAllRefSameSubpicLayout)
{
- for (int iNumRef = 0; iNumRef < numRefList; iNumRef++) // loop over l0 and l1
+ for (int refList = 0; refList < numRefList; refList++) // loop over l0 and l1
{
- RefPicList eRefPicList = (iNumRef ? REF_PIC_LIST_1 : REF_PIC_LIST_0);
- for (int iRefIdx = 0; iRefIdx < slice->getNumRefIdx(eRefPicList); iRefIdx++)
+ RefPicList eRefPicList = (refList ? REF_PIC_LIST_1 : REF_PIC_LIST_0);
+ for (int refIdx = 0; refIdx < slice->getNumRefIdx(eRefPicList); refIdx++)
{
- const Picture* refPic = slice->getRefPic(eRefPicList, iRefIdx)->unscaledPic;
+ const Picture* refPic = slice->getRefPic(eRefPicList, refIdx)->unscaledPic;
CHECK(!(refPic->layerId != slice->getPic()->layerId && refPic->cs->pps->getNumSubPics() == 1), "The inter-layer reference shall contain a single subpicture or have same subpicture layout with the current picture");
}
}