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

Edits in HTTP Smooth Connector, Also fixed a bug in MistPlayer

Browse source
This commit is contained in:
Erik Zandvliet 2013-08-23 14:24:06 +02:00 • committed by Thulinma
parent 6ac0e1d25f
commit 333c74a2c4
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/buffer/player.cpp
View file

@ -243,7 +243,7 @@ int main(int argc, char** argv){
if (playing == -1 && playUntil == 0 && source.getJSON()["time"].asInt() > now - lastTime + 7500){
Util::sleep(source.getJSON()["time"].asInt() - (now - lastTime + 5000));
}
if ( playUntil && playUntil < source.getJSON()["time"].asInt()){
if ( playUntil && playUntil <= source.getJSON()["time"].asInt()){
playing = 0;
}
if (playing == 0){

8
src/connectors/conn_http_smooth.cpp
View file

@ -75,7 +75,7 @@ namespace Connector_HTTP {
"Name=\"audio\" "
"Chunks=\"" << allAudio.ObjBegin()->second["keys"].size() << "\" "
"Url=\"Q({bitrate})/A({start time})\">\n";
int index = 1;
int index = 0;
for (JSON::ObjIter oIt = allAudio.ObjBegin(); oIt != allAudio.ObjEnd(); oIt++){
Result << "<QualityLevel "
"Index=\"" << index << "\" "
@ -114,7 +114,7 @@ namespace Connector_HTTP {
"MaxHeight=\"" << maxHeight << "\" "
"DisplayWidth=\"" << maxWidth << "\" "
"DisplayHeight=\"" << maxHeight << "\">\n";
int index = 1;
int index = 0;
for (JSON::ObjIter oIt = allVideo.ObjBegin(); oIt != allVideo.ObjEnd(); oIt++){
//Add video qualities
Result << "<QualityLevel "
@ -400,7 +400,9 @@ namespace Connector_HTTP {
HTTP_S.SetHeader("Content-Type", "video/mp4");
HTTP_S.StartResponse(HTTP_R, conn);
HTTP_S.Chunkify(moof_box.asBox(), moof_box.boxedSize(), conn);
HTTP_S.Chunkify("\000\000\000\000mdat", 8, conn);
int size = htonl(keyObj["size"].asInt() + 8);
HTTP_S.Chunkify((char*)&size, 4, conn);
HTTP_S.Chunkify("mdat", 4, conn);
handlingRequest = true;
}else{
//We have a request for a Manifest, generate and send it.