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

Add track adding to FLV output

Browse source
This commit is contained in:
Thulinma 2016-08-30 22:33:15 +02:00
parent 104b7849e0
commit 151da6383a
1 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/output/output_progressive_flv.cpp
View file

@ -77,6 +77,32 @@ namespace Mist {
} }
void OutProgressiveFLV::sendNext(){ void OutProgressiveFLV::sendNext(){
//If there are now more selectable tracks, select the new track and do a seek to the current timestamp
if (myMeta.live && selectedTracks.size() < 2){
static unsigned long long lastMeta = 0;
if (Util::epoch() > lastMeta + 5){
lastMeta = Util::epoch();
updateMeta();
if (myMeta.tracks.size() > 1){
size_t prevTrackCount = selectedTracks.size();
selectDefaultTracks();
if (selectedTracks.size() > prevTrackCount){
INFO_MSG("Picked up new track - selecting it and resetting state.");
for (std::set<long unsigned int>::iterator it = selectedTracks.begin(); it != selectedTracks.end(); it++){
if (myMeta.tracks[*it].type == "video" && tag.DTSCVideoInit(myMeta.tracks[*it])){
myConn.SendNow(tag.data, tag.len);
}
if (myMeta.tracks[*it].type == "audio" && tag.DTSCAudioInit(myMeta.tracks[*it])){
myConn.SendNow(tag.data, tag.len);
}
}
initialSeek();
return;
}
}
}
}
tag.DTSCLoader(thisPacket, myMeta.tracks[thisPacket.getTrackId()]); tag.DTSCLoader(thisPacket, myMeta.tracks[thisPacket.getTrackId()]);
myConn.SendNow(tag.data, tag.len); myConn.SendNow(tag.data, tag.len);
if (config->getBool("keyframeonly")){ if (config->getBool("keyframeonly")){