hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Type changes

Browse source
This commit is contained in:
Erik Zandvliet 2017-08-16 10:59:10 +02:00
parent c19732a6ae
commit dd9e68e4db
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/output/output_progressive_mp4.cpp
View file

@ -583,7 +583,7 @@ namespace Mist {
//sort all parts here //sort all parts here
std::set <keyPart> trunOrder; std::set <keyPart> trunOrder;
//set with trackID, relative data offset, time and size //set with trackID, relative data offset, time and size
for (std::map<long unsigned int, fragSet>::iterator it = currentPartSet.begin(); it != currentPartSet.end(); it++) { for (std::map<size_t, fragSet>::iterator it = currentPartSet.begin(); it != currentPartSet.end(); it++) {
uint64_t timeStamp = it->second.firstTime; uint64_t timeStamp = it->second.firstTime;
DTSC::Track & thisTrack = myMeta.tracks[it->first]; DTSC::Track & thisTrack = myMeta.tracks[it->first];
for (uint32_t i = it->second.firstPart; i <= it->second.lastPart; i++) { for (uint32_t i = it->second.firstPart; i <= it->second.lastPart; i++) {
@ -617,7 +617,7 @@ namespace Mist {
//It doesn't care about the order or track IDs in the header. //It doesn't care about the order or track IDs in the header.
//But - the first TRAF must be a video TRAF, if video is present. //But - the first TRAF must be a video TRAF, if video is present.
std::deque<std::map<long unsigned int, fragSet>::iterator> sortedTracks; std::deque<std::map<long unsigned int, fragSet>::iterator> sortedTracks;
for (std::map<long unsigned int, fragSet>::iterator it = currentPartSet.begin(); it != currentPartSet.end(); it++) { for (std::map<size_t, fragSet>::iterator it = currentPartSet.begin(); it != currentPartSet.end(); it++) {
if (myMeta.tracks[it->first].type == "video"){ if (myMeta.tracks[it->first].type == "video"){
sortedTracks.push_front(it); sortedTracks.push_front(it);
}else{ }else{
@ -933,7 +933,7 @@ namespace Mist {
sendFragmentHeader(); sendFragmentHeader();
partListSent = 0; partListSent = 0;
partListLength = 0; partListLength = 0;
for (std::map<long unsigned int, fragSet>::iterator it = currentPartSet.begin(); it != currentPartSet.end(); it++) { for (std::map<size_t, fragSet>::iterator it = currentPartSet.begin(); it != currentPartSet.end(); it++) {
partListLength += it->second.lastPart - it->second.firstPart + 1; partListLength += it->second.lastPart - it->second.firstPart + 1;
} }
} }