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

Renamed SRT input and output to SubRip to prevent confusion with TSSRT

Browse source
This commit is contained in:
Thulinma 2023-03-23 13:50:13 +01:00
parent 9d295cd9af
commit 9cd08e3a77
6 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -483,7 +483,7 @@ makeInput(Folder folder)#LTS
makeInput(Playlist playlist)#LTS makeInput(Playlist playlist)#LTS
makeInput(Balancer balancer)#LTS makeInput(Balancer balancer)#LTS
makeInput(RTSP rtsp)#LTS makeInput(RTSP rtsp)#LTS
makeInput(SRT srt)#LTS makeInput(SubRip srt)#LTS
makeInput(SDP sdp) makeInput(SDP sdp)
if(SRT_LIB) if(SRT_LIB)
@ -559,7 +559,7 @@ makeOutput(AAC aac http)
makeOutput(MP3 mp3 http) makeOutput(MP3 mp3 http)
makeOutput(H264 h264 http) makeOutput(H264 h264 http)
makeOutput(HDS hds http) makeOutput(HDS hds http)
makeOutput(SRT srt http) makeOutput(SubRip srt http)
makeOutput(JSON json http) makeOutput(JSON json http)
option(WITH_JPG "Build JPG thumbnailer output support") option(WITH_JPG "Build JPG thumbnailer output support")
if (WITH_JPG) if (WITH_JPG)

8
src/controller/controller.cpp
View file

@ -545,6 +545,14 @@ int main_loop(int argc, char **argv){
continue; continue;
} }
if ((*it)["connector"].asStringRef() == "SRT"){
edit = true;
JSON::Value newSubRip = *it;
newSubRip["connector"] = "SubRip";
newVal.append(newSubRip);
continue;
}
if ((*it)["connector"].asStringRef() == "CMAF"){foundCMAF = true;} if ((*it)["connector"].asStringRef() == "CMAF"){foundCMAF = true;}
newVal.append(*it); newVal.append(*it);
} }

4
src/input/input_srt.cpp
View file

@ -4,9 +4,9 @@ namespace Mist{
InputSrt::InputSrt(Util::Config *cfg) : Input(cfg){ InputSrt::InputSrt(Util::Config *cfg) : Input(cfg){
vtt = false; vtt = false;
capa["name"] = "SRT"; capa["name"] = "SubRip";
capa["decs"] = capa["decs"] =
"This input allows streaming of SRT and WebVTT subtitle files as Video on Demand."; "This input allows streaming of SubRip (SRT and WebVTT) subtitle files as Video on Demand.";
capa["source_match"].append("/*.srt"); capa["source_match"].append("/*.srt");
capa["source_match"].append("/*.vtt"); capa["source_match"].append("/*.vtt");
capa["priority"] = 9; capa["priority"] = 9;

2
src/input/meson.build
View file

@ -14,7 +14,7 @@ inputs = [
{'name' : 'Playlist', 'format' : 'playlist'}, {'name' : 'Playlist', 'format' : 'playlist'},
{'name' : 'Balancer', 'format' : 'balancer'}, {'name' : 'Balancer', 'format' : 'balancer'},
{'name' : 'RTSP', 'format' : 'rtsp'}, {'name' : 'RTSP', 'format' : 'rtsp'},
{'name' : 'SRT', 'format' : 'srt'}, {'name' : 'SubRip', 'format' : 'srt'},
{'name' : 'SDP', 'format' : 'sdp'}, {'name' : 'SDP', 'format' : 'sdp'},
{'name' : 'AAC', 'format' : 'aac'}, {'name' : 'AAC', 'format' : 'aac'},
{'name' : 'FLAC', 'format' : 'flac'}, {'name' : 'FLAC', 'format' : 'flac'},

2
src/output/meson.build
View file

@ -10,7 +10,7 @@ outputs = [
{'name' : 'MP3', 'format' : 'mp3', 'extra': ['http']}, {'name' : 'MP3', 'format' : 'mp3', 'extra': ['http']},
{'name' : 'H264', 'format' : 'h264', 'extra': ['http']}, {'name' : 'H264', 'format' : 'h264', 'extra': ['http']},
{'name' : 'HDS', 'format' : 'hds', 'extra': ['http']}, {'name' : 'HDS', 'format' : 'hds', 'extra': ['http']},
{'name' : 'SRT', 'format' : 'srt', 'extra': ['http']}, {'name' : 'SubRip', 'format' : 'srt', 'extra': ['http']},
{'name' : 'JSON', 'format' : 'json', 'extra': ['http']}, {'name' : 'JSON', 'format' : 'json', 'extra': ['http']},
{'name' : 'TS', 'format' : 'ts', 'extra': ['ts']}, {'name' : 'TS', 'format' : 'ts', 'extra': ['ts']},
{'name' : 'HTTPTS', 'format' : 'httpts', 'extra': ['http', 'ts']}, {'name' : 'HTTPTS', 'format' : 'httpts', 'extra': ['http', 'ts']},

4
src/output/output_srt.cpp
View file

@ -10,8 +10,8 @@ namespace Mist{
void OutSRT::init(Util::Config *cfg){ void OutSRT::init(Util::Config *cfg){
HTTPOutput::init(cfg); HTTPOutput::init(cfg);
capa["name"] = "SRT"; capa["name"] = "SubRip";
capa["friendly"] = "SubRip/WebVTT over HTTP"; capa["friendly"] = "SubRip (SRT/WebVTT) over HTTP";
capa["desc"] = "Pseudostreaming in SubRip Text (SRT) and WebVTT formats over HTTP"; capa["desc"] = "Pseudostreaming in SubRip Text (SRT) and WebVTT formats over HTTP";
capa["url_match"].append("/$.srt"); capa["url_match"].append("/$.srt");
capa["url_match"].append("/$.vtt"); capa["url_match"].append("/$.vtt");