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

Merge branch '2.0release' into develop

Browse source
This commit is contained in:
winlin 2015-04-29 15:44:53 +08:00
commit 5559fb9842
2 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
trunk/scripts/git.commit.sh
View file

@ -41,7 +41,8 @@ function remote_check()
fi fi
ok_msg "remote $remote ok, url is $url" ok_msg "remote $remote ok, url is $url"
} }
remote_check origin git@github.com:winlinvip/simple-rtmp-server.git remote_check origin git@github.com:simple-rtmp-server/srs.git
remote_check srs.winlin git@github.com:winlinvip/simple-rtmp-server.git
remote_check srs.csdn git@code.csdn.net:winlinvip/srs-csdn.git remote_check srs.csdn git@code.csdn.net:winlinvip/srs-csdn.git
remote_check srs.oschina git@git.oschina.net:winlinvip/srs.oschina.git remote_check srs.oschina git@git.oschina.net:winlinvip/srs.oschina.git
remote_check srs.gitlab git@gitlab.com:winlinvip/srs-gitlab.git remote_check srs.gitlab git@gitlab.com:winlinvip/srs-gitlab.git
@ -63,11 +64,13 @@ function sync_push()
} }
sync_push --all origin sync_push --all origin
sync_push --all srs.winlin
sync_push --all srs.csdn sync_push --all srs.csdn
sync_push --all srs.oschina sync_push --all srs.oschina
sync_push --all srs.gitlab sync_push --all srs.gitlab
ok_msg "push refs ok" ok_msg "push refs ok"
sync_push --tags srs.winlin
sync_push --tags srs.csdn sync_push --tags srs.csdn
sync_push --tags srs.oschina sync_push --tags srs.oschina
sync_push --tags srs.gitlab sync_push --tags srs.gitlab

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) {