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

Various tweaks and fixes from Erik.

Browse source
This commit is contained in:
Thulinma 2014-06-19 16:51:02 +02:00
parent 81d56bc04b
commit 80b905965e
3 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/input/input.cpp
View file

@ -346,6 +346,7 @@ namespace Mist {
break; break;
} }
} }
DEBUG_MSG(DLVL_DEVEL, "Done buffering page %d for track %d", pageNum, track);
return true; return true;
} }

5
src/output/output_hss.cpp
View file

@ -75,7 +75,6 @@ namespace Mist {
void OutHSS::sendNext() { void OutHSS::sendNext() {
if (currentPacket.getTime() >= playUntil) { if (currentPacket.getTime() >= playUntil) {
DEBUG_MSG(DLVL_HIGH, "(%d) Done sending fragment %d:%d", getpid(), myTrackStor, myKeyStor);
stop(); stop();
wantRequest = true; wantRequest = true;
HTTP_S.Chunkify("", 0, myConn); HTTP_S.Chunkify("", 0, myConn);
@ -163,10 +162,8 @@ namespace Mist {
return; return;
} }
} }
DEBUG_MSG(DLVL_HIGH, "(%d) Seeking to time %lld on track %d", getpid(), seekTime, tid);
seek(seekTime); seek(seekTime);
playUntil = (*(keyTimes[tid].upper_bound(seekTime))); playUntil = (*(keyTimes[tid].upper_bound(seekTime)));
DEBUG_MSG(DLVL_HIGH, "Set playUntil to %lld", playUntil);
myTrackStor = tid; myTrackStor = tid;
myKeyStor = seekTime; myKeyStor = seekTime;
keysToSend = 1; keysToSend = 1;
@ -299,7 +296,6 @@ namespace Mist {
HTTP_S.Chunkify("mdat", 4, myConn); HTTP_S.Chunkify("mdat", 4, myConn);
sentHeader = true; sentHeader = true;
HTTP_R.Clean(); HTTP_R.Clean();
DEBUG_MSG(DLVL_HIGH, "(%d) Sent full header", getpid());
} }
@ -451,7 +447,6 @@ namespace Mist {
void OutHSS::onRequest() { void OutHSS::onRequest() {
sentHeader = false; sentHeader = false;
while (HTTP_R.Read(myConn)) { while (HTTP_R.Read(myConn)) {
DEBUG_MSG(DLVL_DEVEL, "(%d) Received request %s", getpid(), HTTP_R.getUrl().c_str());
initialize(); initialize();
if (HTTP_R.url.find("Manifest") != std::string::npos) { if (HTTP_R.url.find("Manifest") != std::string::npos) {
//Manifest, direct reply //Manifest, direct reply

9
src/output/output_rtmp.cpp
View file

@ -76,11 +76,7 @@ namespace Mist {
if (track.codec == "H264"){ if (track.codec == "H264"){
dheader_len += 4; dheader_len += 4;
dataheader[0] = 7; dataheader[0] = 7;
if (currentPacket.getFlag("nalu")){ dataheader[1] = 1;
dataheader[1] = 1;
}else{
dataheader[1] = 2;
}
if (currentPacket.getInt("offset") > 0){ if (currentPacket.getInt("offset") > 0){
long long offset = currentPacket.getInt("offset"); long long offset = currentPacket.getInt("offset");
dataheader[2] = (offset >> 16) & 0xFF; dataheader[2] = (offset >> 16) & 0xFF;
@ -93,8 +89,7 @@ namespace Mist {
} }
if (currentPacket.getFlag("keyframe")){ if (currentPacket.getFlag("keyframe")){
dataheader[0] |= 0x10; dataheader[0] |= 0x10;
} }else{
if (currentPacket.getFlag("interframe")){
dataheader[0] |= 0x20; dataheader[0] |= 0x20;
} }
if (currentPacket.getFlag("disposableframe")){ if (currentPacket.getFlag("disposableframe")){