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

Improved selectDefaultTracks function to give feedback on selection changes.

Browse source
This commit is contained in:
Thulinma 2018-06-29 15:34:44 +02:00
parent 75501c54f7
commit d48967d549
6 changed files with 38 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/output/output.cpp
View file

@ -462,14 +462,21 @@ namespace Mist{
}
/*LTS-END*/
void Output::selectDefaultTracks(){
/// Automatically selects the tracks that are possible and/or wanted.
/// Returns true if the track selection changed in any way.
bool Output::selectDefaultTracks(){
if (!isInitialized){
initialize();
if (!isInitialized){return;}
if (!isInitialized){return false;}
}
//First, wipe the existing selections, if any.
//First, back up and wipe the existing selections, if any.
std::set<unsigned long> oldSel = selectedTracks;
selectedTracks.clear();
bool autoSeek = buffer.size();
uint64_t seekTarget = currentTime();
/*LTS-START*/
bool noSelAudio = false, noSelVideo = false, noSelSub = false;
//Then, select the tracks we've been asked to select.
@ -492,6 +499,11 @@ namespace Mist{
for (std::set<unsigned long>::iterator it = selectedTracks.begin(); it != selectedTracks.end(); it++){
if (!myMeta.tracks.count(*it)){
toRemove.insert(*it);
continue;
}
//autoSeeking and target not in bounds? Drop it too.
if (autoSeek && myMeta.tracks[*it].lastms < seekTarget - 6000){
toRemove.insert(*it);
}
}
//remove those from selectedtracks
@ -571,6 +583,7 @@ namespace Mist{
if (myMeta.live){
for (std::map<unsigned int, DTSC::Track>::reverse_iterator trit = myMeta.tracks.rbegin(); trit != myMeta.tracks.rend(); trit++){
if ((!byType && trit->second.codec == strRef.substr(shift)) || (byType && trit->second.type == strRef.substr(shift)) || strRef.substr(shift) == "*"){
if (autoSeek && trit->second.lastms < seekTarget - 6000){continue;}
/*LTS-START*/
if (noSelAudio && trit->second.type == "audio"){continue;}
if (noSelVideo && trit->second.type == "video"){continue;}
@ -584,6 +597,7 @@ namespace Mist{
}else{
for (std::map<unsigned int, DTSC::Track>::iterator trit = myMeta.tracks.begin(); trit != myMeta.tracks.end(); trit++){
if ((!byType && trit->second.codec == strRef.substr(shift)) || (byType && trit->second.type == strRef.substr(shift)) || strRef.substr(shift) == "*"){
if (autoSeek && trit->second.lastms < seekTarget - 6000){continue;}
/*LTS-START*/
if (noSelAudio && trit->second.type == "audio"){continue;}
if (noSelVideo && trit->second.type == "video"){continue;}
@ -618,6 +632,12 @@ namespace Mist{
if (!selectedTracks.size() && myMeta.tracks.size() && capa["codecs"][bestSoFar].size()){
WARN_MSG("No tracks selected (%u total) for stream %s!", myMeta.tracks.size(), streamName.c_str());
}
bool madeChange = (oldSel != selectedTracks);
if (autoSeek && madeChange){
INFO_MSG("Automatically seeking to position %llu to resume playback", seekTarget);
seek(seekTarget);
}
return madeChange;
}
/// Clears the buffer, sets parseData to false, and generally makes not very much happen at all.
@ -1280,6 +1300,7 @@ namespace Mist{
static int nonVideoCount = 0;
static unsigned int emptyCount = 0;
if (!buffer.size()){
/// \TODO Do we really need this? Seems error-prone.
if (isRecording() && myMeta.live){
selectDefaultTracks();
initialSeek();
@ -1293,7 +1314,7 @@ namespace Mist{
if (buffer.size() != selectedTracks.size()){
std::set<uint32_t> dropTracks;
if (buffer.size() < selectedTracks.size()){
//prepare to drop any selectedTrack without buffe entry
//prepare to drop any selectedTrack without buffer entry
for (std::set<unsigned long>::iterator it = selectedTracks.begin(); it != selectedTracks.end(); ++it){
bool found = false;
for (std::set<sortedPageInfo>::iterator bi = buffer.begin(); bi != buffer.end(); ++bi){

2
src/output/output.h
View file

@ -56,7 +56,7 @@ namespace Mist {
void setBlocking(bool blocking);
void updateMeta();
void selectTrack(const std::string &trackType, const std::string &trackVal); /*LTS*/
void selectDefaultTracks();
bool selectDefaultTracks();
bool connectToFile(std::string file);
static bool listenMode(){return true;}
uint32_t currTrackCount() const;

7
src/output/output_dtsc.cpp
View file

@ -121,12 +121,9 @@ namespace Mist {
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.");
if (selectDefaultTracks()){
INFO_MSG("Track selection changed - resending headers and continuing");
sentHeader = false;
seek(currentTime());
return;
}
}

6
src/output/output_json.cpp
View file

@ -28,6 +28,12 @@ namespace Mist {
}
void OutJSON::sendNext(){
if (keepReselecting){
//If we can select more tracks, do it and continue.
if (selectDefaultTracks()){
return;//After a seek, the current packet is invalid. Do nothing and return here.
}
}
JSON::Value jPack = thisPacket.toJSON();
if (dupcheck){
if (jPack.compareExcept(lastVal, nodup)){

7
src/output/output_progressive_flv.cpp
View file

@ -57,10 +57,8 @@ namespace Mist {
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.");
if (selectDefaultTracks()){
INFO_MSG("Track selection changed - resending headers and continuing");
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);
@ -69,7 +67,6 @@ namespace Mist {
myConn.SendNow(tag.data, tag.len);
}
}
initialSeek();
return;
}
}

7
src/output/output_rtmp.cpp
View file

@ -222,12 +222,9 @@ namespace Mist{
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.");
if (selectDefaultTracks()){
INFO_MSG("Track selection changed - resending headers and continuing");
sentHeader = false;
initialSeek();
return;
}
}