Skip to content
Snippets Groups Projects
Commit 7fa050f8 authored by Xiang Li's avatar Xiang Li
Browse files

Merge branch 'fix_vps_allocation' into 'master'

StreamMergeApp: fix VPS allocation issue

See merge request !2525
parents c8cd9508 afd14200
No related branches found
No related tags found
No related merge requests found
......@@ -544,12 +544,12 @@ uint32_t StreamMergeApp::mergeStreams()
// Prep other values.
layer.bs = new InputByteStream(*(layer.fp));
VPS vps;
vps.setMaxLayers((uint32_t) layers->size());
vps.setLayerId(layer.id, layer.id); // Layer ID is rewritten here.
layer.vpsIdMapping.insert({ vps.getVPSId(), 0 });
vps.setVPSId(0);
layer.psManager.storeVPS(&vps, std::vector<uint8_t>()); // Create VPS with default values (VTM slice header parser needs this)
VPS* vps = new VPS;
vps->setMaxLayers((uint32_t) layers->size());
vps->setLayerId(layer.id, layer.id); // Layer ID is rewritten here.
layer.vpsIdMapping.insert({ vps->getVPSId(), 0 });
vps->setVPSId(0);
layer.psManager.storeVPS(vps, std::vector<uint8_t>()); // Create VPS with default values (VTM slice header parser needs this)
}
// Loop over layers until every one is entirely read.
......
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