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

Various HTTP Dynamic Streaming fixes.

Browse source
This commit is contained in:
Thulinma 2014-04-30 11:39:47 +02:00
parent 10ce807f6f
commit cfbc882641
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/output/output.cpp
View file

@ -54,12 +54,14 @@ namespace Mist {
} }
void Output::updateMeta(){ void Output::updateMeta(){
unsigned int i = 0;
//read metadata from page to myMeta variable //read metadata from page to myMeta variable
if (streamIndex.mapped){
JSON::Value jsonMeta; JSON::Value jsonMeta;
unsigned int i = 0;
JSON::fromDTMI((const unsigned char*)streamIndex.mapped + 8, streamIndex.len - 8, i, jsonMeta); JSON::fromDTMI((const unsigned char*)streamIndex.mapped + 8, streamIndex.len - 8, i, jsonMeta);
myMeta = DTSC::Meta(jsonMeta); myMeta = DTSC::Meta(jsonMeta);
} }
}
/// Called when stream initialization has failed. /// Called when stream initialization has failed.
/// The standard implementation will set isInitialized to false and close the client connection, /// The standard implementation will set isInitialized to false and close the client connection,

1
src/output/output_hds.cpp
View file

@ -162,6 +162,7 @@ namespace Mist {
if (HTTP_R.url.find(".abst") != std::string::npos){ if (HTTP_R.url.find(".abst") != std::string::npos){
myConn.setHost(HTTP_R.GetHeader("X-Origin")); myConn.setHost(HTTP_R.GetHeader("X-Origin"));
streamName = HTTP_R.GetHeader("X-Stream"); streamName = HTTP_R.GetHeader("X-Stream");
initialize();
std::string streamID = HTTP_R.url.substr(streamName.size() + 10); std::string streamID = HTTP_R.url.substr(streamName.size() + 10);
streamID = streamID.substr(0, streamID.find(".abst")); streamID = streamID.substr(0, streamID.find(".abst"));
HTTP_S.Clean(); HTTP_S.Clean();