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

Merge branch 'master' of projectlivestream.com:pls

Browse source
This commit is contained in:
Erik Zandvliet 2011-02-16 23:27:50 +01:00
commit a4d0f5a74a
2 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Connector_HTTP/main.cpp
View file

@ -50,20 +50,22 @@ int FlvToFragNum( FLV_Pack * tag ) {
std::string BuildManifest( std::string MetaData, std::string MovieId, int CurrentMediaTime ) {
Interface * temp = new Interface;
std::string Result="<manifest>\n";
Result += " <mimeType>video/mp4</mimeType>\n";
Result += " <streamType>live</streamType>\n";
Result += " <deliveryType>streaming</deliveryType>\n";
Result += " <bootstrapInfo profile=\"named\" id=\"bootstrap1\">\n";
Result += base64_encode(temp->GenerateLiveBootstrap(CurrentMediaTime));
Result += " </bootstrapInfo>\n";
Result += " <media streamId=\"1\" bootstrapInfoId=\"bootstrap1\" url=\"";
std::string Result="<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<manifest xmlns=\"http://ns.adobe.com/f4m/1.0\">\n";
Result += "<id>";
Result += MovieId;
Result += "/\">";
Result += " <metadata>\n";
Result += "</id>\n<mimeType>video/mp4</mimeType>\n";
Result += "<streamType>live</streamType>\n";
Result += "<deliveryType>streaming</deliveryType>\n";
Result += "<bootstrapInfo profile=\"named\" id=\"bootstrap1\">";
Result += base64_encode(temp->GenerateLiveBootstrap(CurrentMediaTime));
Result += "</bootstrapInfo>\n";
Result += "<media streamId=\"1\" bootstrapInfoId=\"bootstrap1\" url=\"";
Result += MovieId;
Result += "/\">\n";
Result += "<metadata>";
Result += base64_encode(MetaData);
Result += " </metadata>\n";
Result += " </media>\n";
Result += "</metadata>\n";
Result += "</media>\n";
Result += "</manifest>\n";
delete temp;
return Result;

4
Connector_RTMP/chunkstream.cpp
View file

@ -11,8 +11,8 @@ unsigned int getNowMS(){
}
unsigned int chunk_rec_max = 128;
unsigned int chunk_snd_max = 128;
unsigned int chunk_rec_max = 102400;
unsigned int chunk_snd_max = 102400;
unsigned int rec_window_size = 0xFA00;
unsigned int snd_window_size = 1024*500;
unsigned int rec_window_at = 0;