external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

fix #322, fix http-flv stream bug, support multiple streams. 2.0.133.

Browse source
This commit is contained in:
winlin 2015-03-06 13:37:57 +08:00
parent 1277968d4a
commit f26e719800
4 changed files with 125 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

19
trunk/src/app/srs_app_http_conn.hpp
View file

@ -252,8 +252,10 @@ private:
*/
struct SrsLiveEntry
{
std::string vhost;
// for template, the mount contains variables.
// for concrete stream, the mount is url to access.
std::string mount;
SrsLiveStream* stream;
SrsStreamCache* cache;
@ -297,7 +299,8 @@ public:
*/
struct SrsHlsEntry
{
std::string vhost;
// for template, the mount contains variables.
// for concrete stream, the mount is url to access.
std::string mount;
// key: the m3u8/ts file path.
@ -315,10 +318,14 @@ class SrsHttpServer : public ISrsReloadHandler
{
public:
SrsHttpServeMux mux;
// the flv live streaming template.
std::map<std::string, SrsLiveEntry*> flvs;
// the hls live streaming template.
std::map<std::string, SrsHlsEntry*> hls;
// the flv live streaming template, to create streams.
std::map<std::string, SrsLiveEntry*> tflvs;
// the flv live streaming streams, crote by template.
std::map<std::string, SrsLiveEntry*> sflvs;
// the hls live streaming template, to create streams.
std::map<std::string, SrsHlsEntry*> thls;
// the hls live streaming streams, crote by template.
std::map<std::string, SrsHlsEntry*> shls;
public:
SrsHttpServer();
virtual ~SrsHttpServer();