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

for #293, mount http flv stream when publish.

Browse source
This commit is contained in:
winlin 2015-01-18 18:50:15 +08:00
parent 2698e6dbae
commit faaa9187f2
2 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

34
trunk/src/app/srs_app_http_conn.cpp
View file

@ -136,12 +136,15 @@ int SrsVodStream::serve_flv_stream(ISrsGoHttpResponseWriter* w, SrsHttpMessage*
return ret;
}
SrsLiveStream::SrsLiveStream()
SrsLiveStream::SrsLiveStream(SrsSource* s, SrsRequest* r)
{
source = s;
req = r->copy();
}
SrsLiveStream::~SrsLiveStream()
{
srs_freep(req);
}
int SrsLiveStream::serve_http(ISrsGoHttpResponseWriter* w, SrsHttpMessage* r)
@ -182,27 +185,33 @@ int SrsHttpServer::mount(SrsSource* s, SrsRequest* r)
{
int ret = ERROR_SUCCESS;
if (flvs.empty()) {
srs_info("ignore mount, no flv stream configed.");
return ret;
}
if (flvs.find(r->vhost) == flvs.end()) {
srs_info("ignore mount flv stream for disabled");
return ret;
}
std::string mount = flvs[r->vhost];
// replace the vhost variable
mount = srs_string_replace(mount, "[vhost]", r->vhost);
mount = srs_string_replace(mount, "[app]", r->app);
mount = srs_string_replace(mount, "[stream]", r->stream);
// remove the default vhost mount
mount = srs_string_replace(mount, SRS_CONSTS_RTMP_DEFAULT_VHOST"/", "");
// mount the http flv stream.
if ((ret = mux.handle(mount, new SrsLiveStream(s, r))) != ERROR_SUCCESS) {
srs_error("http: mount flv stream for vhost=%s failed. ret=%d", r->vhost.c_str(), ret);
return ret;
}
srs_trace("http: mount flv stream for vhost=%s, mount=%s", r->vhost.c_str(), mount.c_str());
// TODO: FIXME: implements it.
return ret;
}
void SrsHttpServer::unmount(SrsSource* s, SrsRequest* r)
{
if (flvs.empty()) {
srs_info("ignore unmount, no flv stream configed.");
return;
}
if (flvs.find(r->vhost) == flvs.end()) {
srs_info("ignore unmount flv stream for disabled");
return;
@ -269,6 +278,7 @@ int SrsHttpServer::mount_static_file()
default_root_exists = true;
srs_warn("http: root mount to %s", dir.c_str());
}
srs_trace("http: vhost=%s mount to %s", vhost.c_str(), mount.c_str());
}
if (!default_root_exists) {

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

@ -65,8 +65,11 @@ protected:
*/
class SrsLiveStream : public ISrsGoHttpHandler
{
private:
SrsRequest* req;
SrsSource* source;
public:
SrsLiveStream();
SrsLiveStream(SrsSource* s, SrsRequest* r);
virtual ~SrsLiveStream();
public:
virtual int serve_http(ISrsGoHttpResponseWriter* w, SrsHttpMessage* r);