Skip to content
Snippets Groups Projects
Commit 1663259c authored by Christian Bartnik's avatar Christian Bartnik
Browse files

applied MR comment changed variable type

parent d63caf0c
No related branches found
No related tags found
1 merge request!2413Fixes in SubpicMergeApp for NumSubPics and SubPicId setters
...@@ -498,9 +498,9 @@ void SubpicMergeApp::generateMergedStreamVPSes(std::vector<VPS*> &vpsList) ...@@ -498,9 +498,9 @@ void SubpicMergeApp::generateMergedStreamVPSes(std::vector<VPS*> &vpsList)
/** /**
- Return subpicture ID length in bits - Return subpicture ID length in bits
*/ */
int SubpicMergeApp::computeSubPicIdLen(int numSubpics) uint32_t SubpicMergeApp::computeSubPicIdLen(uint32_t numSubpics)
{ {
int subPicIdLen = 1; uint32_t subPicIdLen = 1;
while ((1 << subPicIdLen) < numSubpics) while ((1 << subPicIdLen) < numSubpics)
{ {
...@@ -515,7 +515,7 @@ int SubpicMergeApp::computeSubPicIdLen(int numSubpics) ...@@ -515,7 +515,7 @@ int SubpicMergeApp::computeSubPicIdLen(int numSubpics)
*/ */
void SubpicMergeApp::generateMergedStreamSPSes(std::vector<SPS*> &spsList) void SubpicMergeApp::generateMergedStreamSPSes(std::vector<SPS*> &spsList)
{ {
int numSubPics = (int)m_subpics->size(); uint32_t numSubPics = (uint32_t)m_subpics->size();
for (auto &subpic : *m_subpics) for (auto &subpic : *m_subpics)
{ {
...@@ -535,7 +535,7 @@ void SubpicMergeApp::generateMergedStreamSPSes(std::vector<SPS*> &spsList) ...@@ -535,7 +535,7 @@ void SubpicMergeApp::generateMergedStreamSPSes(std::vector<SPS*> &spsList)
sps.setMaxPicHeightInLumaSamples(m_picHeight); sps.setMaxPicHeightInLumaSamples(m_picHeight);
sps.setSubPicInfoPresentFlag(true); sps.setSubPicInfoPresentFlag(true);
sps.setNumSubPics((uint32_t)numSubPics); sps.setNumSubPics(numSubPics);
sps.setSubPicIdLen(computeSubPicIdLen(numSubPics + 1)); sps.setSubPicIdLen(computeSubPicIdLen(numSubPics + 1));
sps.setSubPicIdMappingExplicitlySignalledFlag(true); sps.setSubPicIdMappingExplicitlySignalledFlag(true);
sps.setSubPicIdMappingPresentFlag(true); sps.setSubPicIdMappingPresentFlag(true);
......
...@@ -100,7 +100,7 @@ private: ...@@ -100,7 +100,7 @@ private:
void decodeNalu(Subpicture &subpic, InputNALUnit &nalu, SEI *&decodePictureHashSei); void decodeNalu(Subpicture &subpic, InputNALUnit &nalu, SEI *&decodePictureHashSei);
void parseSubpic(Subpicture &subpic, bool &morePictures); void parseSubpic(Subpicture &subpic, bool &morePictures);
void generateMergedStreamVPSes(std::vector<VPS*> &vpsList); void generateMergedStreamVPSes(std::vector<VPS*> &vpsList);
int computeSubPicIdLen(int numSubpics); uint32_t computeSubPicIdLen(uint32_t numSubpics);
void generateMergedStreamSPSes(std::vector<SPS*> &spsList); void generateMergedStreamSPSes(std::vector<SPS*> &spsList);
void getTileDimensions(std::vector<int> &tileWidths, std::vector<int> &tileHeights); void getTileDimensions(std::vector<int> &tileWidths, std::vector<int> &tileHeights);
void generateMergedStreamPPSes(ParameterSetManager &psManager, std::vector<PPS*> &ppsList); void generateMergedStreamPPSes(ParameterSetManager &psManager, std::vector<PPS*> &ppsList);
......
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