diff --git a/source/App/Parcat/parcat.cpp b/source/App/Parcat/parcat.cpp
index 2a219c1da7486e8240c6a01e7b4bd45d360b0845..0e805e73df89b1b4e914fccd031e6337afa24a71 100644
--- a/source/App/Parcat/parcat.cpp
+++ b/source/App/Parcat/parcat.cpp
@@ -183,27 +183,27 @@ const char * NALU_TYPE[] =
"NAL_UNIT_UNSPECIFIED_31"
};
-int calc_poc(int iPOClsb, int prevTid0POC, int getBitsForPOC, int nalu_type)
+int calcPoc(int pocLsb, int prevTid0POC, int getBitsForPOC, int nalu_type)
{
- int iPrevPOC = prevTid0POC;
- int iMaxPOClsb = 1<< getBitsForPOC;
- int iPrevPOClsb = iPrevPOC & (iMaxPOClsb - 1);
- int iPrevPOCmsb = iPrevPOC-iPrevPOClsb;
- int iPOCmsb;
- if( ( iPOClsb < iPrevPOClsb ) && ( ( iPrevPOClsb - iPOClsb ) >= ( iMaxPOClsb / 2 ) ) )
+ int prevPoc = prevTid0POC;
+ int maxPocLsb = 1 << getBitsForPOC;
+ int prevPocLsb = prevPoc & (maxPocLsb - 1);
+ int prevPocMsb = prevPoc - prevPocLsb;
+ int pocMsb;
+ if ((pocLsb < prevPocLsb) && ((prevPocLsb - pocLsb) >= (maxPocLsb / 2)))
{
- iPOCmsb = iPrevPOCmsb + iMaxPOClsb;
+ pocMsb = prevPocMsb + maxPocLsb;
}
- else if( (iPOClsb > iPrevPOClsb ) && ( (iPOClsb - iPrevPOClsb ) > ( iMaxPOClsb / 2 ) ) )
+ else if ((pocLsb > prevPocLsb) && ((pocLsb - prevPocLsb) > (maxPocLsb / 2)))
{
- iPOCmsb = iPrevPOCmsb - iMaxPOClsb;
+ pocMsb = prevPocMsb - maxPocLsb;
}
else
{
- iPOCmsb = iPrevPOCmsb;
+ pocMsb = prevPocMsb;
}
- return iPOCmsb + iPOClsb;
+ return pocMsb + pocLsb;
}
std::vector<uint8_t> filter_segment(const std::vector<uint8_t> & v, int idx, int * poc_base, int * last_idr_poc)
@@ -220,7 +220,7 @@ std::vector<uint8_t> filter_segment(const std::vector<uint8_t> & v, int idx, int
std::vector<uint8_t> out;
out.reserve(v.size());
- int bits_for_poc = 8;
+ int bitsForPoc = 8;
bool skip_next_sei = false;
bool change_poc = false;
bool first_idr_slice_after_ph_nal = false;
@@ -244,8 +244,8 @@ std::vector<uint8_t> filter_segment(const std::vector<uint8_t> & v, int idx, int
printf ("NALU Type: %d (%s)\n", nalu_type, NALU_TYPE[nalu_type]);
#endif
int poc = -1;
- int poc_lsb = -1;
- int new_poc = -1;
+ int pocLsb = -1;
+ int newPoc = -1;
HLSyntaxReader HLSReader;
static ParameterSetManager parameterSetManager;
@@ -279,7 +279,7 @@ std::vector<uint8_t> filter_segment(const std::vector<uint8_t> & v, int idx, int
if(nalu_type == NAL_UNIT_CODED_SLICE_IDR_W_RADL || nalu_type == NAL_UNIT_CODED_SLICE_IDR_N_LP)
{
poc = 0;
- new_poc = *poc_base + poc;
+ newPoc = *poc_base + poc;
if (first_idr_slice_after_ph_nal)
{
cnt[nalu_layerId]--;
@@ -305,26 +305,26 @@ std::vector<uint8_t> filter_segment(const std::vector<uint8_t> & v, int idx, int
int num_bits_up_to_poc_lsb = parcatHLSReader.getBitstream()->getNumBitsRead();
int offset = num_bits_up_to_poc_lsb;
- int byte_offset = offset / 8;
- int hi_bits = offset % 8;
- uint16_t data = (nalu[byte_offset] << 8) | nalu[byte_offset + 1];
- int low_bits = 16 - hi_bits - bits_for_poc;
- poc_lsb = (data >> low_bits) & 0xff;
- poc = poc_lsb; //calc_poc(poc_lsb, 0, bits_for_poc, nalu_type);
+ int byteOffset = offset / 8;
+ int hiBits = offset % 8;
+ uint16_t data = (nalu[byteOffset] << 8) | nalu[byteOffset + 1];
+ int lowBits = 16 - hiBits - bitsForPoc;
+ pocLsb = (data >> lowBits) & 0xff;
+ poc = pocLsb; // calcPoc(pocLsb, 0, bitsForPoc, nalu_type);
- new_poc = poc + *poc_base;
+ newPoc = poc + *poc_base;
// int picOrderCntLSB = (pcSlice->getPOC()-pcSlice->getLastIDR()+(1<<pcSlice->getSPS()->getBitsForPOC())) & ((1<<pcSlice->getSPS()->getBitsForPOC())-1);
- unsigned picOrderCntLSB = (new_poc - *last_idr_poc + (1 << bits_for_poc)) & ((1 << bits_for_poc) - 1);
+ unsigned picOrderCntLSB = (newPoc - *last_idr_poc + (1 << bitsForPoc)) & ((1 << bitsForPoc) - 1);
- int low = data & ((1 << low_bits) - 1);
- int hi = data >> (16 - hi_bits);
- data = (hi << (16 - hi_bits)) | (picOrderCntLSB << low_bits) | low;
+ int low = data & ((1 << lowBits) - 1);
+ int hi = data >> (16 - hiBits);
+ data = (hi << (16 - hiBits)) | (picOrderCntLSB << lowBits) | low;
- nalu[byte_offset] = data >> 8;
- nalu[byte_offset + 1] = data & 0xff;
+ nalu[byteOffset] = data >> 8;
+ nalu[byteOffset + 1] = data & 0xff;
#if ENABLE_TRACING
- std::cout << "Changed poc " << poc << " to " << new_poc << std::endl;
+ std::cout << "Changed poc " << poc << " to " << newPoc << std::endl;
#endif
++cnt[nalu_layerId];
change_poc = false;
diff --git a/source/Lib/DecoderLib/DecLib.cpp b/source/Lib/DecoderLib/DecLib.cpp
index 4b8236ad84eb2042a3d075bd23304afd90a02973..aa5fa42964db77d349ffa820e68cd1dcd585b07c 100644
--- a/source/Lib/DecoderLib/DecLib.cpp
+++ b/source/Lib/DecoderLib/DecLib.cpp
@@ -2965,8 +2965,8 @@ bool DecLib::xDecodeSlice(InputNALUnit &nalu, int &iSkipFrame, int iPOCLastDispl
//Reset POC MSB when CRA or GDR has NoOutputBeforeRecoveryFlag equal to 1
if (!pps->getMixedNaluTypesInPicFlag() && (m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA || m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_GDR) && m_lastNoOutputBeforeRecoveryFlag[nalu.m_nuhLayerId])
{
- int iMaxPOClsb = 1 << sps->getBitsForPOC();
- m_apcSlicePilot->setPOC( m_apcSlicePilot->getPOC() & (iMaxPOClsb - 1) );
+ int maxPocLsb = 1 << sps->getBitsForPOC();
+ m_apcSlicePilot->setPOC(m_apcSlicePilot->getPOC() & (maxPocLsb - 1));
m_lastPOCNoOutputPriorPics = m_apcSlicePilot->getPOC();
xUpdatePreviousTid0POC(m_apcSlicePilot);
}
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index 64310f4764328dc3042016714546ab49a818c8ce..fef992a750142d2c9c1451d6342dfaf1281c77e8 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -294,27 +294,29 @@ HLSyntaxReader::~HLSyntaxReader()
// Public member functions
// ====================================================================================================================
-void HLSyntaxReader::copyRefPicList(SPS* sps, ReferencePictureList* source_rpl, ReferencePictureList* dest_rp)
+void HLSyntaxReader::copyRefPicList(SPS* sps, ReferencePictureList* sourceRpl, ReferencePictureList* destRpl)
{
- dest_rp->setNumberOfShorttermPictures(source_rpl->getNumberOfShorttermPictures());
+ destRpl->setNumberOfShorttermPictures(sourceRpl->getNumberOfShorttermPictures());
- dest_rp->setNumberOfInterLayerPictures( sps->getInterLayerPresentFlag() ? source_rpl->getNumberOfInterLayerPictures() : 0 );
+ destRpl->setNumberOfInterLayerPictures(sps->getInterLayerPresentFlag() ? sourceRpl->getNumberOfInterLayerPictures()
+ : 0);
if( sps->getLongTermRefsPresent() )
{
- dest_rp->setLtrpInSliceHeaderFlag(source_rpl->getLtrpInSliceHeaderFlag());
- dest_rp->setNumberOfLongtermPictures( source_rpl->getNumberOfLongtermPictures() );
+ destRpl->setLtrpInSliceHeaderFlag(sourceRpl->getLtrpInSliceHeaderFlag());
+ destRpl->setNumberOfLongtermPictures(sourceRpl->getNumberOfLongtermPictures());
}
else
{
- dest_rp->setNumberOfLongtermPictures(0);
+ destRpl->setNumberOfLongtermPictures(0);
}
- uint32_t numRefPic = dest_rp->getNumRefEntries();
+ uint32_t numRefPic = destRpl->getNumRefEntries();
for( int ii = 0; ii < numRefPic; ii++ )
{
- dest_rp->setRefPicIdentifier( ii, source_rpl->getRefPicIdentifier( ii ), source_rpl->isRefPicLongterm( ii ), source_rpl->isInterLayerRefPic( ii ), source_rpl->getInterLayerRefPicIdx( ii ) );
+ destRpl->setRefPicIdentifier(ii, sourceRpl->getRefPicIdentifier(ii), sourceRpl->isRefPicLongterm(ii),
+ sourceRpl->isInterLayerRefPic(ii), sourceRpl->getInterLayerRefPicIdx(ii));
}
}
@@ -1114,9 +1116,10 @@ void HLSyntaxReader::parseVUI(VUI* pcVUI, SPS *pcSPS)
#if ENABLE_TRACING
DTRACE( g_trace_ctx, D_HEADER, "----------- vui_parameters -----------\n");
#endif
- unsigned vuiPayloadSize = pcSPS->getVuiPayloadSize();
- InputBitstream *bs = getBitstream();
- setBitstream(bs->extractSubstream(vuiPayloadSize * 8));
+ const uint32_t vuiPayloadSize = pcSPS->getVuiPayloadSize();
+ InputBitstream* spsBitstream = getBitstream();
+ InputBitstream* vuiBitstream = spsBitstream->extractSubstream(vuiPayloadSize * 8);
+ setBitstream(vuiBitstream);
uint32_t symbol;
@@ -1202,8 +1205,8 @@ void HLSyntaxReader::parseVUI(VUI* pcVUI, SPS *pcSPS)
payloadBitsRem--;
}
}
- delete getBitstream();
- setBitstream(bs);
+ setBitstream(spsBitstream);
+ delete vuiBitstream;
}
void HLSyntaxReader::parseGeneralHrdParameters(GeneralHrdParams *hrd)
@@ -1391,7 +1394,7 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
}
else
{
- pcSPS->setResChangeInClvsEnabledFlag(0);
+ pcSPS->setResChangeInClvsEnabledFlag(false);
}
if (pcSPS->getProfileTierLevel()->getConstraintInfo()->getNoResChangeInClvsConstraintFlag())
@@ -2088,7 +2091,7 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
}
else if((pcSPS->getMaxTLayers()-1) == 0)
{
- pcSPS->setSubLayerParametersPresentFlag(0);
+ pcSPS->setSubLayerParametersPresentFlag(false);
}
uint32_t firstSubLayer = pcSPS->getSubLayerParametersPresentFlag() ? 0 : (pcSPS->getMaxTLayers() - 1);
@@ -2622,10 +2625,10 @@ void HLSyntaxReader::parsePictureHeader( PicHeader* picHeader, ParameterSetManag
xReadUvlc(uiCode, "ph_pic_parameter_set_id");
picHeader->setPPSId(uiCode);
pps = parameterSetManager->getPPS(picHeader->getPPSId());
- CHECK(pps == 0, "Invalid PPS");
+ CHECK(pps == nullptr, "Invalid PPS");
picHeader->setSPSId(pps->getSPSId());
sps = parameterSetManager->getSPS(picHeader->getSPSId());
- CHECK(sps == 0, "Invalid SPS");
+ CHECK(sps == nullptr, "Invalid SPS");
xReadCode(sps->getBitsForPOC(), uiCode, "ph_pic_order_cnt_lsb");
picHeader->setPocLsb(uiCode);
if( picHeader->getGdrPicFlag() )
@@ -3344,8 +3347,6 @@ void HLSyntaxReader::parsePictureHeader( PicHeader* picHeader, ParameterSetManag
picHeader->setSaoEnabledFlag(ChannelType::CHROMA, false);
}
-
-
// deblocking filter controls
if (pps->getDeblockingFilterControlPresentFlag())
{
@@ -3547,28 +3548,38 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, PicHeader* picHeader, Par
parsePictureHeader(picHeader, parameterSetManager, false);
picHeader->setValid();
}
- CHECK(picHeader==0, "Invalid Picture Header");
+ CHECK(picHeader == nullptr, "Invalid Picture Header");
CHECK(picHeader->isValid()==false, "Invalid Picture Header");
checkAlfNaluTidAndPicTid(pcSlice, picHeader, parameterSetManager);
pps = parameterSetManager->getPPS( picHeader->getPPSId() );
//!KS: need to add error handling code here, if PPS is not available
- CHECK(pps==0, "Invalid PPS");
+ CHECK(pps == nullptr, "Invalid PPS");
sps = parameterSetManager->getSPS(pps->getSPSId());
//!KS: need to add error handling code here, if SPS is not available
- CHECK(sps==0, "Invalid SPS");
+ CHECK(sps == nullptr, "Invalid SPS");
if (sps->getProfileTierLevel()->getConstraintInfo()->getPicHeaderInSliceHeaderConstraintFlag())
{
CHECK(pcSlice->getPictureHeaderInSliceHeader() == false, "PH shall be present in SH, when pic_header_in_slice_header_constraint_flag is equal to 1");
}
- CHECK(pcSlice->getPictureHeaderInSliceHeader() && pps->getRplInfoInPhFlag() == 1, "When sh_picture_header_in_slice_header_flag is equal to 1, rpl_info_in_ph_flag shall be equal to 0");
- CHECK(pcSlice->getPictureHeaderInSliceHeader() && pps->getDbfInfoInPhFlag() == 1, "When sh_picture_header_in_slice_header_flag is equal to 1, dbf_info_in_ph_flag shall be equal to 0");
- CHECK(pcSlice->getPictureHeaderInSliceHeader() && pps->getSaoInfoInPhFlag() == 1, "When sh_picture_header_in_slice_header_flag is equal to 1, sao_info_in_ph_flag shall be equal to 0");
- CHECK(pcSlice->getPictureHeaderInSliceHeader() && pps->getAlfInfoInPhFlag() == 1, "When sh_picture_header_in_slice_header_flag is equal to 1, alf_info_in_ph_flag shall be equal to 0");
- CHECK(pcSlice->getPictureHeaderInSliceHeader() && pps->getWpInfoInPhFlag() == 1, "When sh_picture_header_in_slice_header_flag is equal to 1, wp_info_in_ph_flag shall be equal to 0");
- CHECK(pcSlice->getPictureHeaderInSliceHeader() && pps->getQpDeltaInfoInPhFlag() == 1, "When sh_picture_header_in_slice_header_flag is equal to 1, qp_delta_info_in_ph_flag shall be equal to 0");
- CHECK(pcSlice->getPictureHeaderInSliceHeader() && sps->getSubPicInfoPresentFlag() == 1, "When sps_subpic_info_present_flag is equal to 1, the value of sh_picture_header_in_slice_header_flag shall be equal to 0");
- CHECK(sps->getSubPicInfoPresentFlag() == 1 && sps->getVirtualBoundariesEnabledFlag() == 1 && sps->getVirtualBoundariesPresentFlag() == 0,
- "when sps_subpic_info_present_flag is equal to 1 and sps_virtual_boundaries_enabled_flag is equal to 1, sps_virtual_boundaries_present_flag shall be equal 1");
+ CHECK(pcSlice->getPictureHeaderInSliceHeader() && pps->getRplInfoInPhFlag(),
+ "When sh_picture_header_in_slice_header_flag is equal to 1, rpl_info_in_ph_flag shall be equal to 0");
+ CHECK(pcSlice->getPictureHeaderInSliceHeader() && pps->getDbfInfoInPhFlag(),
+ "When sh_picture_header_in_slice_header_flag is equal to 1, dbf_info_in_ph_flag shall be equal to 0");
+ CHECK(pcSlice->getPictureHeaderInSliceHeader() && pps->getSaoInfoInPhFlag(),
+ "When sh_picture_header_in_slice_header_flag is equal to 1, sao_info_in_ph_flag shall be equal to 0");
+ CHECK(pcSlice->getPictureHeaderInSliceHeader() && pps->getAlfInfoInPhFlag(),
+ "When sh_picture_header_in_slice_header_flag is equal to 1, alf_info_in_ph_flag shall be equal to 0");
+ CHECK(pcSlice->getPictureHeaderInSliceHeader() && pps->getWpInfoInPhFlag(),
+ "When sh_picture_header_in_slice_header_flag is equal to 1, wp_info_in_ph_flag shall be equal to 0");
+ CHECK(pcSlice->getPictureHeaderInSliceHeader() && pps->getQpDeltaInfoInPhFlag(),
+ "When sh_picture_header_in_slice_header_flag is equal to 1, qp_delta_info_in_ph_flag shall be equal to 0");
+ CHECK(pcSlice->getPictureHeaderInSliceHeader() && sps->getSubPicInfoPresentFlag(),
+ "When sps_subpic_info_present_flag is equal to 1, the value of sh_picture_header_in_slice_header_flag shall be "
+ "equal to 0");
+ CHECK(sps->getSubPicInfoPresentFlag() && sps->getVirtualBoundariesEnabledFlag()
+ && sps->getVirtualBoundariesPresentFlag() == 0,
+ "when sps_subpic_info_present_flag is equal to 1 and sps_virtual_boundaries_enabled_flag is equal to 1, "
+ "sps_virtual_boundaries_present_flag shall be equal 1");
const ChromaFormat chFmt = sps->getChromaFormatIdc();
const uint32_t numValidComp = getNumberValidComponents(chFmt);
@@ -3576,46 +3587,46 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, PicHeader* picHeader, Par
// picture order count
uiCode = picHeader->getPocLsb();
- int iPOClsb = uiCode;
- int iMaxPOClsb = 1 << sps->getBitsForPOC();
- int iPOCmsb;
+ int pocLsb = uiCode;
+ int maxPocLsb = 1 << sps->getBitsForPOC();
+ int pocMsb;
if (pcSlice->getIdrPicFlag())
{
if (picHeader->getPocMsbPresentFlag())
{
- iPOCmsb = picHeader->getPocMsbVal()*iMaxPOClsb;
+ pocMsb = picHeader->getPocMsbVal() * maxPocLsb;
}
else
{
- iPOCmsb = 0;
+ pocMsb = 0;
}
- pcSlice->setPOC(iPOCmsb + iPOClsb);
+ pcSlice->setPOC(pocMsb + pocLsb);
}
else
{
- int iPrevPOC = prevTid0POC;
- int iPrevPOClsb = iPrevPOC & (iMaxPOClsb - 1);
- int iPrevPOCmsb = iPrevPOC - iPrevPOClsb;
+ int prevPoc = prevTid0POC;
+ int prevPocLsb = prevPoc & (maxPocLsb - 1);
+ int prevPocMsb = prevPoc - prevPocLsb;
if (picHeader->getPocMsbPresentFlag())
{
- iPOCmsb = picHeader->getPocMsbVal()*iMaxPOClsb;
+ pocMsb = picHeader->getPocMsbVal() * maxPocLsb;
}
else
{
- if ((iPOClsb < iPrevPOClsb) && ((iPrevPOClsb - iPOClsb) >= (iMaxPOClsb / 2)))
+ if ((pocLsb < prevPocLsb) && ((prevPocLsb - pocLsb) >= (maxPocLsb / 2)))
{
- iPOCmsb = iPrevPOCmsb + iMaxPOClsb;
+ pocMsb = prevPocMsb + maxPocLsb;
}
- else if ((iPOClsb > iPrevPOClsb) && ((iPOClsb - iPrevPOClsb) > (iMaxPOClsb / 2)))
+ else if ((pocLsb > prevPocLsb) && ((pocLsb - prevPocLsb) > (maxPocLsb / 2)))
{
- iPOCmsb = iPrevPOCmsb - iMaxPOClsb;
+ pocMsb = prevPocMsb - maxPocLsb;
}
else
{
- iPOCmsb = iPrevPOCmsb;
+ pocMsb = prevPocMsb;
}
}
- pcSlice->setPOC(iPOCmsb + iPOClsb);
+ pcSlice->setPOC(pocMsb + pocLsb);
}
if (sps->getSubPicInfoPresentFlag())
@@ -3843,9 +3854,9 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, PicHeader* picHeader, Par
else if (pcSlice->getIdrPicFlag() && !(sps->getIDRRefParamListPresent()))
{
ReferencePictureList *rpl0 = pcSlice->getRpl(REF_PIC_LIST_0);
- (*rpl0) = ReferencePictureList();
+ *rpl0 = ReferencePictureList();
ReferencePictureList *rpl1 = pcSlice->getRpl(REF_PIC_LIST_1);
- (*rpl1) = ReferencePictureList();
+ *rpl1 = ReferencePictureList();
}
else
{
@@ -4337,7 +4348,7 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, PicHeader* picHeader, Par
pcSlice->setTSResidualCodingDisabledFlag( false );
}
- if ((!pcSlice->getTSResidualCodingDisabledFlag()) && sps->getSpsRangeExtension().getTSRCRicePresentFlag())
+ if (!pcSlice->getTSResidualCodingDisabledFlag() && sps->getSpsRangeExtension().getTSRCRicePresentFlag())
{
xReadCode(3, uiCode, "sh_ts_residual_coding_rice_idx_minus1");
pcSlice->setTsrcIndex(uiCode);
@@ -4429,7 +4440,6 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, PicHeader* picHeader, Par
pcSlice->addSubstreamSize(entryPointOffset [ idx ] );
}
}
- return;
}
void HLSyntaxReader::getSlicePoc(Slice* pcSlice, PicHeader* picHeader, ParameterSetManager *parameterSetManager, const int prevTid0POC)
@@ -4440,14 +4450,14 @@ void HLSyntaxReader::getSlicePoc(Slice* pcSlice, PicHeader* picHeader, Parameter
PPS *pps = nullptr;
SPS *sps = nullptr;
- CHECK(picHeader==0, "Invalid Picture Header");
+ CHECK(picHeader == nullptr, "Invalid Picture Header");
CHECK(picHeader->isValid()==false, "Invalid Picture Header");
pps = parameterSetManager->getPPS( picHeader->getPPSId() );
//!KS: need to add error handling code here, if PPS is not available
- CHECK(pps==0, "Invalid PPS");
+ CHECK(pps == nullptr, "Invalid PPS");
sps = parameterSetManager->getSPS(pps->getSPSId());
//!KS: need to add error handling code here, if SPS is not available
- CHECK(sps==0, "Invalid SPS");
+ CHECK(sps == nullptr, "Invalid SPS");
DTRACE_UPDATE( g_trace_ctx, std::make_pair( "final", 0 ) );
@@ -4707,18 +4717,16 @@ void HLSyntaxReader::parseProfileTierLevel(ProfileTierLevel *ptl, bool profileTi
}
}
-
-
-void HLSyntaxReader::parseTerminatingBit( uint32_t& ruiBit )
+void HLSyntaxReader::parseTerminatingBit(uint32_t& bit)
{
- ruiBit = false;
- int iBitsLeft = m_pcBitstream->getNumBitsLeft();
- if(iBitsLeft <= 8)
+ bit = false;
+ int bitsLeft = m_pcBitstream->getNumBitsLeft();
+ if (bitsLeft <= 8)
{
- uint32_t uiPeekValue = m_pcBitstream->peekBits(iBitsLeft);
- if (uiPeekValue == (1<<(iBitsLeft-1)))
+ uint32_t peekValue = m_pcBitstream->peekBits(bitsLeft);
+ if (peekValue == (1 << (bitsLeft - 1)))
{
- ruiBit = true;
+ bit = true;
}
}
}
@@ -4743,9 +4751,6 @@ void HLSyntaxReader::parseRemainingBytes( bool noTrailingBytesExpected )
}
}
-
-
-
// ====================================================================================================================
// Protected member functions
// ====================================================================================================================
@@ -5094,8 +5099,6 @@ void HLSyntaxReader::parseScalingList(ScalingList *scalingList, bool aps_chromaP
scalingList->processRefMatrix(scalingListId, scalingList->getRefMatrixId(scalingListId));
}
}
-
- return;
}
/** decode DPCM
diff --git a/source/Lib/DecoderLib/VLCReader.h b/source/Lib/DecoderLib/VLCReader.h
index 21c7daf2df6e26dbaefc7568acc12adaa9a5444a..c5c78763138efc5faf86446212849c70d11702b4 100644
--- a/source/Lib/DecoderLib/VLCReader.h
+++ b/source/Lib/DecoderLib/VLCReader.h
@@ -103,7 +103,7 @@ public:
virtual ~HLSyntaxReader();
protected:
- void copyRefPicList(SPS* pcSPS, ReferencePictureList* source_rpl, ReferencePictureList* dest_rpl);
+ void copyRefPicList(SPS* pcSPS, ReferencePictureList* sourceRpl, ReferencePictureList* dest_rpl);
void parseRefPicList(SPS* pcSPS, ReferencePictureList* rpl, int rplIdx);
public:
@@ -126,7 +126,7 @@ public:
void checkAlfNaluTidAndPicTid(Slice* pcSlice, PicHeader* picHeader, ParameterSetManager *parameterSetManager);
void parseSliceHeader ( Slice* pcSlice, PicHeader* picHeader, ParameterSetManager *parameterSetManager, const int prevTid0POC, const int prevPicPOC );
void getSlicePoc ( Slice* pcSlice, PicHeader* picHeader, ParameterSetManager *parameterSetManager, const int prevTid0POC );
- void parseTerminatingBit ( uint32_t& ruiBit );
+ void parseTerminatingBit(uint32_t& bit);
void parseRemainingBytes ( bool noTrailingBytesExpected );
void parsePredWeightTable( Slice* pcSlice, const SPS *sps );