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

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	src/output/output_progressive_mp4.cpp
This commit is contained in:
Thulinma 2016-07-18 10:43:38 +02:00
commit 4bcfb5191a
9 changed files with 205 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/output/output_progressive_mp4.cpp
View file

@ -159,6 +159,7 @@ namespace Mist {
//Add the mandatory MDHD and HDLR boxes to the MDIA
MP4::MDHD mdhdBox(thisTrack.lastms - thisTrack.firstms);
mdhdBox.setLanguage(thisTrack.lang);
mdiaBox.setContent(mdhdBox, mdiaOffset++);
MP4::HDLR hdlrBox(thisTrack.type, thisTrack.getIdentifier());
mdiaBox.setContent(hdlrBox, mdiaOffset++);

4
src/output/output_srt.cpp
View file

@ -17,6 +17,7 @@ namespace Mist {
capa["url_handler"] = "http";
capa["url_type"] = "subtitle";
capa["codecs"][0u][0u].append("srt");
capa["codecs"][0u][0u].append("TTXT");
capa["methods"][0u]["handler"] = "http";
capa["methods"][0u]["type"] = "html5/text/plain";
capa["methods"][0u]["priority"] = 8ll;
@ -36,6 +37,9 @@ namespace Mist {
tmp.write(tmpBuf, tmpLen);
tmp << " --> ";
time += thisPacket.getInt("duration");
if (time == thisPacket.getTime()){
time += len * 100 + 1000;
}
tmpLen = sprintf(tmpBuf, "%.2llu:%.2llu:%.2llu,%.3llu", (time / 3600000), ((time % 3600000) / 60000), (((time % 3600000) % 60000) / 1000), time % 1000);
tmp.write(tmpBuf, tmpLen);
tmp << std::endl;

3
src/output/output_ts_base.cpp
View file

@ -40,7 +40,8 @@ namespace Mist {
packData.setDiscontinuity(true);
if (myMeta.tracks[thisPacket.getTrackId()].type == "video"){
if (thisPacket.getInt("keyframe")){
packData.setRandomAccess(1);
packData.setRandomAccess(true);
packData.setESPriority(true);
}
packData.setPCR(thisPacket.getTime() * 27000);
}