external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 03:41:55 +00:00
Code Issues Releases Wiki Activity

m3u8 mount bug

Browse source
This commit is contained in:
tufang14 2015-04-25 14:59:12 +08:00
parent dbcd7d883b
commit b6d650cdb4
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -965,7 +965,7 @@ int SrsHttpServer::hls_update_m3u8(SrsRequest* r, string m3u8)
{ {
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
std::string mount = m3u8; std::string mount;
std::string sid = r->get_stream_url(); std::string sid = r->get_stream_url();
SrsHlsEntry* entry = NULL; SrsHlsEntry* entry = NULL;
@ -980,8 +980,17 @@ int SrsHttpServer::hls_update_m3u8(SrsRequest* r, string m3u8)
SrsHlsEntry* tmpl = thls[r->vhost]; SrsHlsEntry* tmpl = thls[r->vhost];
entry = new SrsHlsEntry(); entry = new SrsHlsEntry();
entry->mount = tmpl->mount; mount = tmpl->mount;
// 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"/", "/");
entry->mount = mount;
shls[sid] = entry; shls[sid] = entry;
if (entry->streams.find(mount) == entry->streams.end()) { if (entry->streams.find(mount) == entry->streams.end()) {
@ -997,6 +1006,8 @@ int SrsHttpServer::hls_update_m3u8(SrsRequest* r, string m3u8)
entry = shls[sid]; entry = shls[sid];
} }
mount = entry->mount;
// update the m3u8 stream. // update the m3u8 stream.
SrsHlsM3u8Stream* hms = dynamic_cast<SrsHlsM3u8Stream*>(entry->streams[mount]); SrsHlsM3u8Stream* hms = dynamic_cast<SrsHlsM3u8Stream*>(entry->streams[mount]);
if (hms) { if (hms) {