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

Some fixes to HLS output.

Browse source
This commit is contained in:
Thulinma 2015-02-18 18:53:53 +01:00
parent 44c0227064
commit 09c7881d10
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/output/output_hls.cpp
View file

@ -83,9 +83,7 @@ namespace Mist {
if ( !myMeta.live){ if ( !myMeta.live){
result << "#EXT-X-ENDLIST\r\n"; result << "#EXT-X-ENDLIST\r\n";
} }
#if DEBUG >= 8 DEBUG_MSG(DLVL_HIGH, "Sending this index: %s", result.str().c_str());
std::cerr << "Sending this index:" << std::endl << result.str() << std::endl;
#endif
return result.str(); return result.str();
} //liveIndex } //liveIndex
@ -139,6 +137,8 @@ namespace Mist {
PackData.UnitStart(1); PackData.UnitStart(1);
if (currentPacket.getInt("keyframe")){ if (currentPacket.getInt("keyframe")){
PackData.RandomAccess(1); PackData.RandomAccess(1);
}
if (myMeta.tracks[currentPacket.getTrackId()].type == "video"){
PackData.PCR(currentPacket.getTime() * 27000); PackData.PCR(currentPacket.getTime() * 27000);
} }
first = false; first = false;
@ -182,8 +182,6 @@ namespace Mist {
avccbox.setPayload(myMeta.tracks[currentPacket.getTrackId()].init); avccbox.setPayload(myMeta.tracks[currentPacket.getTrackId()].init);
haveAvcc = true; haveAvcc = true;
} }
bs = avccbox.asAnnexB();
fillPacket(first, bs.data(), bs.size(), VideoCounter);
} }
unsigned int i = 0; unsigned int i = 0;